@gooddollar/goodprotocol 2.0.2 → 2.0.3

package/contracts/fuseFaucet/FuseFaucetV2.sol

@@ -18,7 +18,7 @@ contract FuseFaucetV2 is Initializable {
 	);
 
 	uint256 public perDayRoughLimit;
-	uint256 public toppingAmount;
+	uint256 public gasTopping;
 	uint256 public gasRefund;
 	uint256 public startTime;
 	uint256 public currentDay;
@@ -55,7 +55,7 @@ contract FuseFaucetV2 is Initializable {
 	) public initializer {
 		if (relayer != address(0)) relayer = _relayer;
 		gasPrice = _gasPrice;
-		setToppingAmount(gweiTopping * gasPrice); //0.6M gwei
+		setGasTopping(gweiTopping);
 		maxDailyToppings = 3;
 		startTime = block.timestamp;
 		nameService = _ns;
@@ -64,16 +64,35 @@ contract FuseFaucetV2 is Initializable {
 		maxDailyNewWallets = 5000;
 	}
 
+	modifier upgrader(uint32 _newversion) {
+		require(version == _newversion - 1, "wrong upgrade version");
+		version++;
+		_;
+	}
+
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
 
-	function upgrade(address _relayer, address _owner) public {
-		require(version == 0, "already upgraded");
-		version++;
+	function upgrade(
+		address _relayer,
+		address _owner,
+		NameService _ns
+	) public upgrader(1) {
 		owner = _owner;
 		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
 		relayer = _relayer;
+		upgrade2(_ns);
+	}
+
+	function upgrade2(NameService _ns) public upgrader(2) {
+		nameService = _ns;
+		upgrade3();
+	}
+
+	function upgrade3() public upgrader(3) {
+		gasTopping = gasTopping / gasPrice;
+		perDayRoughLimit = gasTopping * 2;
 	}
 
 	modifier reimburseGas() {
@@ -142,7 +161,7 @@ contract FuseFaucetV2 is Initializable {
 		}
 
 		require(
-			weekTotal < perDayRoughLimit * maxPerWeekMultiplier,
+			weekTotal < perDayRoughLimit * gasPrice * maxPerWeekMultiplier,
 			"User wallet has been topped too many times this week"
 		);
 		_;
@@ -155,7 +174,7 @@ contract FuseFaucetV2 is Initializable {
 	}
 
 	function canTop(address _user) external view returns (bool) {
-		if (toppingAmount < address(_user).balance) return false;
+		if (getToppingAmount() < address(_user).balance) return false;
 
 		address whitelistedRoot = getIdentity().getWhitelistedRoot(_user);
 		_user = whitelistedRoot == address(0) ? _user : whitelistedRoot;
@@ -182,7 +201,7 @@ contract FuseFaucetV2 is Initializable {
 		for (uint256 i = 0; i <= dayOfWeek; i++) {
 			weekTotal += lastWeekToppings[uint256(i)];
 		}
-		can = can && weekTotal < perDayRoughLimit * maxPerWeekMultiplier;
+		can = can && weekTotal < perDayRoughLimit * gasPrice * maxPerWeekMultiplier;
 		return can;
 	}
 
@@ -208,8 +227,8 @@ contract FuseFaucetV2 is Initializable {
 			? _wallet
 			: payable(whitelistedRoot);
 
-		require(toppingAmount > address(_wallet).balance);
-		uint256 toTop = toppingAmount - address(_wallet).balance;
+		require(getToppingAmount() > address(_wallet).balance);
+		uint256 toTop = getToppingAmount() - address(_wallet).balance;
 
 		uint256 dayOfWeek = currentDay % 7;
 
@@ -245,9 +264,13 @@ contract FuseFaucetV2 is Initializable {
 		return true;
 	}
 
-	function setToppingAmount(uint256 _amount) public onlyOwner {
-		toppingAmount = _amount;
-		perDayRoughLimit = 2 * toppingAmount;
+	function getToppingAmount() public view returns (uint256) {
+		return gasTopping * gasPrice;
+	}
+
+	function setGasTopping(uint256 _gasUnits) public onlyOwner {
+		gasTopping = _gasUnits;
+		perDayRoughLimit = 2 * gasTopping;
 	}
 
 	function setGasPrice(uint64 _price) external onlyOwner {

package/contracts/identity/IdentityV2.sol

@@ -238,8 +238,9 @@ contract IdentityV2 is
 		onlyRole(IDENTITY_ADMIN_ROLE)
 		whenNotPaused
 	{
-		if (address(oldIdentity) != address(0))
-			oldIdentity.removeBlacklisted(account);
+		if (
+			address(oldIdentity) != address(0) && oldIdentity.isBlacklisted(account)
+		) oldIdentity.removeBlacklisted(account);
 
 		identities[account].status = 0;
 		emit BlacklistRemoved(account);
@@ -270,7 +271,9 @@ contract IdentityV2 is
 		onlyRole(IDENTITY_ADMIN_ROLE)
 		whenNotPaused
 	{
-		if (address(oldIdentity) != address(0)) {
+		if (
+			address(oldIdentity) != address(0) && oldIdentity.isDAOContract(account)
+		) {
 			oldIdentity.removeContract(account);
 		}
 		_removeWhitelisted(account);
@@ -355,7 +358,9 @@ contract IdentityV2 is
 			emit WhitelistedRemoved(account);
 		}
 
-		if (address(oldIdentity) != address(0)) {
+		if (
+			address(oldIdentity) != address(0) && oldIdentity.isWhitelisted(account)
+		) {
 			oldIdentity.removeWhitelisted(account);
 		}
 	}

package/contracts/ubi/UBIScheme.sol

@@ -156,7 +156,7 @@ contract UBIScheme is DAOUpgradeableContract {
 		maxInactiveDays = _maxInactiveDays;
 		firstClaimPool = _firstClaimPool;
 		shouldWithdrawFromDAO = false;
-		cycleLength = 90; //90 days
+		cycleLength = 30; //30 days
 		iterationGasLimit = 185000; //token transfer cost under superfluid
 		periodStart = (block.timestamp / (1 days)) * 1 days + 12 hours; //set start time to GMT noon
 		startOfCycle = periodStart;

package/contracts/utils/AdminWalletFuse.sol

@@ -37,6 +37,8 @@ contract AdminWalletFuse is
 	uint64 public maxDailyNewWallets;
 	uint64 public day;
 
+	uint32 public version;
+
 	event AdminsAdded(address payable[] indexed admins);
 	event AdminsRemoved(address[] indexed admins);
 	event WalletTopped(address indexed user, uint256 amount);
@@ -68,6 +70,12 @@ contract AdminWalletFuse is
 		}
 	}
 
+	function upgrade(NameService _ns) public {
+		require(version == 0, "already upgraded");
+		version++;
+		nameService = _ns;
+	}
+
 	function getIdentity() public view returns (IIdentityV2) {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}

package/contracts/utils/GoodDollarMintBurnWrapper.sol

@@ -199,7 +199,7 @@ contract GoodDollarMintBurnWrapper is
 		setDAO(_nameService);
 		require(_admin != address(0), "zero admin address");
 		token = address(nativeToken());
-		updateFrequency = 90 days;
+		updateFrequency = 7 days;
 		_setupRole(DEFAULT_ADMIN_ROLE, avatar);
 		_setupRole(DEFAULT_ADMIN_ROLE, _admin);
 	}
@@ -625,22 +625,4 @@ contract GoodDollarMintBurnWrapper is
 			minterSupply[minter].lastDayReset = currentDay;
 		}
 	}
-
-	function upgradeSuperGoodDollar() external onlyRole(DEFAULT_ADMIN_ROLE) {
-		address _newns = 0x0F5dB7a64A6a64052693676CA898EC7F7A94FF4e;
-		_revokeRole(DEFAULT_ADMIN_ROLE, avatar); //old avatar
-		setDAO(INameService(_newns)); //changes avatar + nativeToken
-		token = address(nativeToken());
-		_setupRole(DEFAULT_ADMIN_ROLE, avatar); //new avatar
-		updateFrequency = 3 days;
-		_setMinterCaps(
-			0xf27Ee99622C3C9b264583dACB2cCE056e194494f,
-			0,
-			0,
-			0,
-			0,
-			300 * 1e6 * 1e18, //300M
-			5000 //50%
-		);
-	}
 }

package/hardhat.config.ts

@@ -17,21 +17,15 @@ import { airdrop } from "./scripts/governance/airdropCalculationSorted";
 import { airdrop as repAirdropRecover } from "./scripts/governance/airdropCalculationRecover";
 import { airdrop as goodCheckpoint } from "./scripts/governance/goodCheckpointSorted";
 
-import {
-  airdrop as gdxAirdrop,
-  airdropRecover as gdxAirdropRecover
-} from "./scripts/gdx/gdxAirdropCalculation";
+import { airdrop as gdxAirdrop, airdropRecover as gdxAirdropRecover } from "./scripts/gdx/gdxAirdropCalculation";
 import { sumStakersGdRewards } from "./scripts/staking/stakersGdRewardsCalculation";
 import { verify } from "./scripts/verify";
 import { ethers } from "ethers";
 import { fstat, readFileSync, writeFileSync } from "fs";
 config();
 
-const mnemonic =
-  process.env.MNEMONIC ||
-  "test test test test test test test test test test test junk";
-const deployerPrivateKey =
-  process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
+const mnemonic = process.env.MNEMONIC || "test test test test test test test test test test test junk";
+const deployerPrivateKey = process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
 const infura_api = process.env.INFURA_API;
 const alchemy_key = process.env.ALCHEMY_KEY;
 const etherscan_key = process.env.ETHERSCAN_KEY;
@@ -79,9 +73,7 @@ const hhconfig: HardhatUserConfig = {
 
   networks: {
     hardhat: {
-      chainId: process.env.FORK_CHAIN_ID
-        ? Number(process.env.FORK_CHAIN_ID)
-        : 4447,
+      chainId: process.env.FORK_CHAIN_ID ? Number(process.env.FORK_CHAIN_ID) : 4447,
       allowUnlimitedContractSize: true,
       accounts: {
         accountsBalance: "10000000000000000000000000"
@@ -194,28 +186,28 @@ const hhconfig: HardhatUserConfig = {
       accounts: [deployerPrivateKey],
       url: "https://forno.celo.org",
       gas: 8000000,
-      gasPrice: 500000000,
+      gasPrice: 5000000000,
       chainId: 42220
     },
     celo: {
-      accounts: [deployerPrivateKey],
+      accounts: { mnemonic },
       url: "https://forno.celo.org",
       gas: 3000000,
-      gasPrice: 500000000,
+      gasPrice: 5000000000,
       chainId: 42220
     },
     "staging-celo": {
       accounts: { mnemonic },
       url: "https://forno.celo.org",
       gas: 3000000,
-      gasPrice: 150000000,
+      gasPrice: 5000000000,
       chainId: 42220
     },
     "development-celo": {
       accounts: { mnemonic },
       url: "https://forno.celo.org",
       gas: 3000000,
-      gasPrice: 150000000,
+      gasPrice: 5000000000,
       chainId: 42220
     },
     gnosis: {
@@ -240,10 +232,7 @@ task("repAirdrop", "Calculates airdrop data and merkle tree")
     const actions = airdrop(hre.ethers, ethplorer_key, etherscan_key);
     switch (taskArgs.action) {
       case "calculate":
-        return actions.collectAirdropData(
-          taskArgs.fusesnapshotblock,
-          taskArgs.ethsnapshotblock
-        );
+        return actions.collectAirdropData(taskArgs.fusesnapshotblock, taskArgs.ethsnapshotblock);
       case "tree":
         return actions.buildMerkleTree();
       case "proof":
@@ -253,10 +242,7 @@ task("repAirdrop", "Calculates airdrop data and merkle tree")
     }
   });
 
-task(
-  "repAirdropRecover",
-  "Calculates airdrop data and merkle tree after critical bug"
-)
+task("repAirdropRecover", "Calculates airdrop data and merkle tree after critical bug")
   .addParam("action", "calculate/tree/proof")
   .addOptionalPositionalParam("address", "proof for address")
   .setAction(async (taskArgs, hre) => {
@@ -305,10 +291,7 @@ task("gdxAirdropRecover", "Calculates new airdrop data for recovery")
     }
   });
 
-task(
-  "goodCheckpoint",
-  "Calculates good checkpoint data and merkle tree for GOOD sync"
-)
+task("goodCheckpoint", "Calculates good checkpoint data and merkle tree for GOOD sync")
   .addParam("action", "calculate/tree/proof")
   .addOptionalPositionalParam("address", "proof for address")
   .setAction(async (taskArgs, hre) => {
@@ -325,17 +308,12 @@ task(
     }
   });
 
-task("verifyjson", "verify contracts on etherscan").setAction(
-  async (taskArgs, hre) => {
-    return verify(hre);
-  }
-);
+task("verifyjson", "verify contracts on etherscan").setAction(async (taskArgs, hre) => {
+  return verify(hre);
+});
 export default hhconfig;
 
-task(
-  "sumStakersGdRewards",
-  "Sums the GoodDollar reward for each staker"
-).setAction(async (taskArgs, hre) => {
+task("sumStakersGdRewards", "Sums the GoodDollar reward for each staker").setAction(async (taskArgs, hre) => {
   const actions = sumStakersGdRewards(hre.ethers);
   return actions.getStakersGdRewards();
 });
@@ -348,10 +326,7 @@ task("cleanflat", "Cleans multiple SPDX and Pragma from flattened file")
     });
 
     // Remove every line started with "// SPDX-License-Identifier:"
-    flattened = flattened.replace(
-      /SPDX-License-Identifier:/gm,
-      "License-Identifier:"
-    );
+    flattened = flattened.replace(/SPDX-License-Identifier:/gm, "License-Identifier:");
 
     flattened = `// SPDX-License-Identifier: MIXED\n\n${flattened}`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "GoodDollar Protocol",
   "scripts": {
     "prepack": "npm run minimize",

package/releases/deploy-settings.json

@@ -252,7 +252,7 @@
   },
   "development-celo": {
     "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
-    "gasPrice": 150000000,
+    "gasPrice": 5e9,
     "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
     "governance": {
       "claimersGOODMonthly": "1000000000000000000000000",
@@ -261,7 +261,7 @@
   },
   "staging-celo": {
     "guardiansSafe": "0xdF3e980a175904a26A7BA627048a789Ae6A141cD",
-    "gasPrice": 150000000,
+    "gasPrice": 5e9,
     "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
     "governance": {
       "claimersGOODMonthly": "1000000000000000000000000",
@@ -275,7 +275,7 @@
       "proposalVotingPeriod": 241920,
       "guardian": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E"
     },
-    "gasPrice": 150000000,
+    "gasPrice": 5e9,
     "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
     "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
   }

package/releases/deployment.json

@@ -409,6 +409,7 @@
         "DistributionHelper": "0xAcadA0C9795fdBb6921AE96c4D7Db2F8B8c52Fd0"
     },
     "production": {
+        "ProxyFactory": "0xDa85fceD9Bd193526b7667F2AD1fD4A0F900d3A7",
         "NameService": "0xec6dcE387B1616a0c44fF2E4fA9E90E53Cf14eb0",
         "GReputation": "0x603B8C0F110E037b51A381CBCacAbb8d6c6E4543",
         "CompoundVotingMachine": "0x57Ee6Ceff51CB30Ecb1245934a882c500Fbec1e9",
@@ -425,7 +426,7 @@
         "Invites": "0xCa2F09c3ccFD7aD5cB9276918Bd1868f2b922ea0",
         "AdminWallet": "0x9A34822112BC73BDc941C62dCc311Ca905Aef2a3",
         "AdminWalletOld": "0x9F75dAcB77419b87f568d417eBc84346e134144E",
-        "Identity": "0xFa8d865A962ca8456dF331D78806152d3aC5B84F",
+        "Identity": "0x2F9C28de9e6d44b71B91b8BA337A5D82e308E7BE",
         "GoodDollar": "0x495d133B938596C9984d462F007B676bDc57eCEC",
         "Controller": "0xBcE053b99e22158f8B62f4DBFbEdE1f936b2D4e4",
         "Avatar": "0xf96dADc6D71113F6500e97590760C924dA1eF70e",
@@ -433,7 +434,10 @@
         "ProxyAdmin": "0x57179b2A8eB019157b0C3E761cdB26c82C982a3B",
         "FuseFaucet": "0x01ab5966C1d742Ae0CFF7f14cC0F4D85156e83d9",
         "FuseStaking": "0xA199F0C353E25AdF022378B0c208D600f39a6505",
-        "GuardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9"
+        "GuardiansSafe": "0x5878123fe880881f1Ecc92D5fd31e5D3F5Fba2e9",
+        "IdentityOld": "0xFa8d865A962ca8456dF331D78806152d3aC5B84F",
+        "MultichainRouter": "0x735aBE48e8782948a37C7765ECb76b98CdE97B0F",
+        "GoodDollarMintBurnWrapper": "0x031b2B7C7854dd8EE9C4A644D7e54aD17F56e3cB"
     },
     "pre-production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
@@ -466,7 +470,11 @@
         "GoodDollarMintBurnWrapper": "0x5566b6E4962BA83e05a426Ad89031ec18e9CadD3",
         "GuardiansSafeOld": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
         "GuardiansSafe": "0xa2521e8F5A990903fdD8Afa6570C52526e7E0D5E",
-        "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f"
+        "MultichainRouter": "0xf27Ee99622C3C9b264583dACB2cCE056e194494f",
+        "AdminWallet": "0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022",
+        "Faucet": "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84",
+        "Invites": "0x36829D1Cda92FFF5782d5d48991620664FC857d3",
+        "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"

package/scripts/multichain-deploy/2_helpers-deploy.ts

@@ -5,7 +5,8 @@
 import { network, ethers, upgrades, run } from "hardhat";
 import { Contract } from "ethers";
 import { defaultsDeep } from "lodash";
-import { deployDeterministic, verifyProductionSigner } from "./helpers";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
+import { deployDeterministic, verifyProductionSigner, verifyContract } from "./helpers";
 import releaser from "../releaser";
 import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
@@ -13,9 +14,7 @@ import { TransactionResponse } from "@ethersproject/providers";
 
 const { name } = network;
 
-const printDeploy = async (
-  c: Contract | TransactionResponse
-): Promise<Contract | TransactionResponse> => {
+const printDeploy = async (c: Contract | TransactionResponse): Promise<Contract | TransactionResponse> => {
   if (c instanceof Contract) {
     await c.deployed();
     console.log("deployed to: ", c.address);
@@ -28,11 +27,7 @@ const printDeploy = async (
 };
 
 export const deployHelpers = async () => {
-  let protocolSettings = defaultsDeep(
-    {},
-    ProtocolSettings[network.name],
-    ProtocolSettings["default"]
-  );
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
 
   let release: { [key: string]: any } = dao[network.name];
 
@@ -48,104 +43,105 @@ export const deployHelpers = async () => {
     network,
     root: root.address,
     schemeMock: schemeMock.address,
-    balance: await ethers.provider
-      .getBalance(root.address)
-      .then(_ => _.toString())
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
   });
 
   const walletAdmins = [];
   for (let i = 0; i < protocolSettings.walletAdminsCount; i++) {
-    const wallet = ethers.Wallet.fromMnemonic(
-      process.env.ADMIN_WALLET_MNEMONIC,
-      `m/44'/60'/0'/0/${i}`
-    );
+    const wallet = ethers.Wallet.fromMnemonic(process.env.ADMIN_WALLET_MNEMONIC, `m/44'/60'/0'/0/${i}`);
     walletAdmins.push(wallet.address);
   }
 
-  console.log("deploying adminwallet", { walletAdmins });
+  console.log("deploying adminwallet", { walletAdmins, gasprice: protocolSettings.gasPrice });
   const AdminWallet = (await deployDeterministic(
     {
       //   address payable[] memory _admins,
+      // NameService _ns,
       // address _owner,
-      // IIdentityV2 _identity
+      // uint256 _gasPrice
       name: "AdminWallet",
       salt: "AdminWallet",
       isUpgradeable: true
     },
     [walletAdmins, release.NameService, root.address, protocolSettings.gasPrice]
   ).then(printDeploy)) as Contract;
+  // const AdminWallet = await ethers.getContractAt("AdminWallet", release.AdminWallet);
 
-  console.log("giving AdminWallet identity_admin permissions");
   const gd = await ethers.getContractAt("IGoodDollar", release.GoodDollar);
 
   const decimals = await gd.decimals();
 
-  const identity = await ethers.getContractAt("IdentityV2", release.Identity);
-  await identity.grantRole(
-    ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")),
-    AdminWallet.address
-  );
+  const Faucet = await deployDeterministic({ name: "Faucet", salt: "Faucet", isUpgradeable: true }, [
+    release.NameService,
+    protocolSettings.gasPrice,
+    AdminWallet.address,
+    root.address
+  ]);
+  // const Faucet = await ethers.getContractAt("Faucet", release.Faucet);
 
-  const Faucet = await deployDeterministic(
-    { name: "Faucet", salt: "Faucet", isUpgradeable: true },
-    [
-      release.NameService,
-      protocolSettings.gasPrice,
-      AdminWallet.address,
-      root.address
-    ]
-  );
+  const Invites = await deployDeterministic({ name: "InvitesV2", salt: "InvitesV2", isUpgradeable: true }, [
+    release.NameService,
+    ethers.BigNumber.from(100).mul(ethers.BigNumber.from("10").pow(decimals)),
+    root.address
+  ]);
 
-  const Invites = await deployDeterministic(
-    { name: "InvitesV2", salt: "InvitesV2", isUpgradeable: true },
-    [
-      release.NameService,
-      ethers.BigNumber.from(100).mul(ethers.BigNumber.from("10").pow(decimals)),
-      root.address
-    ]
-  );
+  // const Invites = await ethers.getContractAt("AdminWallet", release.Invites);
 
-  const adminWalletOwner = await AdminWallet.hasRole(
-    ethers.constants.HashZero,
-    root.address
-  );
-  const faucetOwner = await Faucet.hasRole(
-    ethers.constants.HashZero,
-    root.address
+  const torelease = {
+    AdminWallet: AdminWallet.address,
+    Faucet: Faucet.address,
+    Invites: Invites.address
+  };
+  await releaser(torelease, network.name, "deployment", false);
+
+  const adminWalletOwner = await AdminWallet.hasRole(ethers.constants.HashZero, root.address);
+  const faucetOwner = await Faucet.hasRole(ethers.constants.HashZero, root.address);
+
+  console.log("giving AdminWallet identity_admin permissions");
+  const identity = await ethers.getContractAt("IdentityV2", release.Identity);
+  await identity
+    .grantRole(ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")), AdminWallet.address)
+    .then(printDeploy);
+
+  const walletIsIdentityAdmin = await identity.hasRole(
+    ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")),
+    AdminWallet.address
   );
 
   console.log("topping adminwallet and faucet with 1 native token");
-  await root.sendTransaction({
-    to: AdminWallet.address,
-    value: ethers.constants.WeiPerEther
-  });
-  await root.sendTransaction({
-    to: Faucet.address,
-    value: ethers.constants.WeiPerEther
-  });
+  await root
+    .sendTransaction({
+      to: AdminWallet.address,
+      value: ethers.constants.WeiPerEther
+    })
+    .then(printDeploy);
+  await root
+    .sendTransaction({
+      to: Faucet.address,
+      value: ethers.constants.WeiPerEther
+    })
+    .then(printDeploy);
 
   if (!network.name.includes("production")) {
     console.log("minting G$s to invites on dev envs");
-    await gd.mint(
-      Invites.address,
-      ethers.BigNumber.from(1e6).mul(ethers.BigNumber.from("10").pow(decimals))
-    ); //1million GD
+    await gd.mint(Invites.address, ethers.BigNumber.from(1e6).mul(ethers.BigNumber.from("10").pow(decimals))); //1million GD
   }
 
   console.log({
+    walletIsIdentityAdmin,
     adminWalletOwner,
     faucetOwner
   });
 
-  release = {
-    AdminWallet: AdminWallet.address,
-    Faucet: Faucet.address,
-    Invites: Invites.address
-  };
-  await releaser(release, network.name, "deployment", false);
+  let impl = await getImplementationAddress(ethers.provider, AdminWallet.address);
+  await verifyContract(impl, "AdminWallet", network.name);
+  impl = await getImplementationAddress(ethers.provider, Faucet.address);
+  await verifyContract(impl, "Faucet", network.name);
+  impl = await getImplementationAddress(ethers.provider, Invites.address);
+  await verifyContract(impl, "InvitesV2", network.name);
 };
 
-export const main = async (networkName = name) => {
+export const main = async () => {
   await deployHelpers();
 };
-main();
+if (process.argv[1].includes("2_helpers-deploy")) main();