@gooddollar/goodprotocol 2.0.1 → 2.0.3-beta.0

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/f621ce0846003ae57dd0a551e1271f0b.json"
+  "buildInfo": "../../../build-info/c596283b236d8d45b0490efb6b114a0a.json"
 }

package/contracts/fuseFaucet/FuseFaucetV2.sol

@@ -68,12 +68,23 @@ contract FuseFaucetV2 is Initializable {
 		return IIdentityV2(nameService.getAddress("IDENTITY"));
 	}
 
-	function upgrade(address _relayer, address _owner) public {
+	function upgrade(
+		address _relayer,
+		address _owner,
+		NameService _ns
+	) public {
 		require(version == 0, "already upgraded");
 		version++;
 		owner = _owner;
 		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
 		relayer = _relayer;
+		upgrade2(_ns);
+	}
+
+	function upgrade2(NameService _ns) public {
+		require(version == 1, "already upgraded");
+		version++;
+		nameService = _ns;
 	}
 
 	modifier reimburseGas() {

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/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/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.1",
+  "version": "2.0.3-beta.0",
   "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

@@ -1,4 +1,74 @@
 {
+    "dapptest": {
+        "Avatar": "0xCafac3dD18aC6c6e92c921884f9E4176737C052c",
+        "Controller": "0x9f1ac54BEF0DD2f6f3462EA0fa94fC62300d3a8e",
+        "GoodDollar": "0x856e4424f806D16E8CBC702B3c0F2ede5468eae5",
+        "Identity": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
+        "FeeFormula": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707",
+        "BancorFormula": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+        "FirstClaimPool": "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6",
+        "OneTimePayments": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788",
+        "Invites": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82",
+        "FuseFaucet": "0x0B306BF915C4d645ff596e518fAf3F9669b97016",
+        "HomeBridge": "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f",
+        "ProxyFactory": "0xA9d0Fb5837f9c42c874e16da96094b14Af0e2784",
+        "NameService": "0x20d42a285797746FAa06067538E2194cbE8f0771",
+        "GReputation": "0xa9F1F9deBe4Ffb69D843e46234004Ca09d70E276",
+        "CompoundVotingMachine": "0x0facF584B8D88A6644564Cafd5294EBD6b5e693C",
+        "ClaimersDistribution": "0x4208449351d0DF5A03B957e0Ba55B792F1Da43e8",
+        "GovernanceStaking": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9",
+        "UBIScheme": "0x810f9f6CAA5da7d3F1D3A02461fdc5a8ee29EFf3",
+        "ProtocolUpgradeFuse": "0xf5059a5D33d5853360D16C683c16e67980206f36",
+        "network": "dapptest",
+        "networkId": 4447,
+        "DAI": "0x0000000000000000000000000000000000000000",
+        "cDAI": "0x0000000000000000000000000000000000000000",
+        "COMP": "0x0000000000000000000000000000000000000000",
+        "AdminWallet": "0x998abeb3E57409262aE5b751f60747921B33613E"
+    },
+    "dapptest-mainnet": {
+        "Avatar": "0x1007BDBA1BCc3C94e20d57768EF9fc0b1Cc2844b",
+        "Controller": "0x25bEE23e489b9ec351A3f974c3050D1be60900FE",
+        "GoodDollar": "0x55C9DCD6128e7d7e7e136d78e533C01F0cB2ef77",
+        "Identity": "0x1291Be112d480055DaFd8a610b7d1e203891C274",
+        "FeeFormula": "0xb7278A61aa25c888815aFC32Ad3cC52fF24fE575",
+        "BancorFormula": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D",
+        "Contribution": "0x162A433068F51e18b7d13932F27e66a3f99E6890",
+        "DAI": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
+        "COMP": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f",
+        "cDAI": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07",
+        "ETHUsdOracle": "0x5081a39b8A5f0E35a8D959395a630b68B74Dd30f",
+        "DAIEthOracle": "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe",
+        "DAIUsdOracle": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3",
+        "COMPUsdOracle": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650",
+        "USDCUsdOracle": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0",
+        "AAVEUsdOracle": "0xc351628EB244ec633d5f21fBD6621e1a683B1181",
+        "GasPriceOracle": "0xFD471836031dc5108809D173A067e8486B9047A3",
+        "ForeignBridge": "0x04C89607413713Ec9775E14b954286519d836FEf",
+        "ProxyFactory": "0x4C4a2f8c81640e47606d3fd77B353E87Ba015584",
+        "NameService": "0xe7C01F43AaF2061f72c7991980b227dB3882B91f",
+        "GReputation": "0x0c35E84F90DA3Bd61E39A7b631c5D449Bfb42cD0",
+        "CompoundVotingMachine": "0x15E6A330801AA79fb48F23B066F4ba55882FA57D",
+        "GoodMarketMaker": "0x01c2d8c5Bb0303473DA0504A5C61626689bD8176",
+        "GoodReserveCDai": "0x09f6c88Ff66547e7B5346e144F8bE3EDE88046B9",
+        "ExchangeHelper": "0x66BFa6316f2a6c89fc36143Bd729a768c6cF7028",
+        "GoodFundManager": "0xb69e1551889e83821aE13ce425F0B14f1d5C8EDd",
+        "StakersDistribution": "0x2f16D249b20E49a8B6be42f8328c4202805789a5",
+        "ProtocolUpgrade": "0x46b142DD1E924FAb83eCc3c08e4D46E82f005e0E",
+        "UniswapV2SwapHelper": "0xC9a43158891282A2B1475592D5719c001986Aaec",
+        "CompoundStakingFactory": "0x1c85638e118b37167e9298c2268758e058DdfDA0",
+        "AaveStakingFactory": "0x367761085BF3C12e5DA2Df99AC6E1a824612b8fb",
+        "StakingContracts": [
+            [
+                "0xC87F335Ec42BE3A3DF4E306CD9A929eD741919a0",
+                13888
+            ]
+        ],
+        "DonationsStaking": "0xe9aE5B6b526B813AcBBC587a4c7C2861BA75Daa6",
+        "network": "dapptest-mainnet",
+        "networkId": 4447,
+        "AdminWallet": "0x4631BCAbD6dF18D94796344963cB60d44a4136b6"
+    },
     "olddao": {
         "Reserve": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F",
         "GoodDollar": "0x32467b43BFa67273FC7dDda0999Ee9A12F2AaA08",

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

@@ -13,9 +13,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 +26,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,17 +42,12 @@ 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);
   }
 
@@ -81,38 +70,23 @@ export const deployHelpers = async () => {
   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 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 adminWalletOwner = await AdminWallet.hasRole(
-    ethers.constants.HashZero,
+  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 faucetOwner = await Faucet.hasRole(
-    ethers.constants.HashZero,
+  ]);
+
+  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 adminWalletOwner = await AdminWallet.hasRole(ethers.constants.HashZero, root.address);
+  const faucetOwner = await Faucet.hasRole(ethers.constants.HashZero, root.address);
 
   console.log("topping adminwallet and faucet with 1 native token");
   await root.sendTransaction({
@@ -126,10 +100,7 @@ export const deployHelpers = async () => {
 
   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({
@@ -145,7 +116,7 @@ export const deployHelpers = async () => {
   await releaser(release, network.name, "deployment", false);
 };
 
-export const main = async (networkName = name) => {
+export const main = async () => {
   await deployHelpers();
 };
-main();
+if (process.argv[1].includes("2_helpers-deploy")) main();

package/scripts/upgrades/celo-defi-ubi-deploy.ts

@@ -3,10 +3,15 @@
  * - upgrade Identity on Fuse to support whitelisting with chainid
  *
  * Step 2:
+ * - deploy 2_helpers on Celo
+ * - add 1000 celo to adminwallet and faucet
+ * - monitor adminwallet + faucet on defender
+ *
+ * Step 3:
  * - upgrade AdminWallet+Invites+Faucet on Fuse to support whitelisting chainid
  * - upgrade backend server to support whitelisting with chainid
  *
- * Step 3:
+ * Step 4:
  * 0. deploy 3_gdStaking, deploy 4_ubi
  * 1. guardians vote send X% to celo ubi pool
  * 2. guardians vote on celo set new GOOD distribution for gdstaking + claiming ubi
@@ -29,6 +34,7 @@ import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
 import { upgrade as identityUpgrade } from "./identity-upgrade";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { deployHelpers } from "../multichain-deploy/2_helpers-deploy";
 
 const { name: networkName } = network;
 const isProduction = networkName.includes("production");
@@ -40,6 +46,10 @@ const step1 = async () => {
 };
 
 const step2 = async () => {
+  await deployHelpers();
+};
+
+const step3 = async () => {
   let release: { [key: string]: any } = dao[networkName];
   let [root] = await ethers.getSigners();
 
@@ -67,7 +77,7 @@ const step2 = async () => {
   console.log("upgrade backend contracts abi + call whitelist with chainid....");
 };
 
-const step3 = async () => {
+const step4 = async () => {
   //   let [root, ...signers] = await ethers.getSigners();
 
   const isSafeSimulation = process.env.SAFE_SIMULATION === "true";
@@ -160,6 +170,9 @@ const main = async () => {
     case "3":
       await step3();
       break;
+    case "4":
+      await step4();
+      break;
   }
 };
 main().catch(e => console.error(e));

package/scripts/upgrades/identity-upgrade.ts

@@ -3,6 +3,7 @@
  * Upgrade Plan:
  * - deploy Identity
  * - give adminWallet admin permissions
+ * - give new identy admin permissions in old identity
  * - revoke deployer permissions
  * - replace pointers to old identity contract in:
  *    - GoodDollar token
@@ -10,9 +11,10 @@
  */
 
 import { network, ethers } from "hardhat";
-import { Contract, Signer } from "ethers";
+import { Contract } from "ethers";
 import { defaultsDeep } from "lodash";
 import { getImplementationAddress } from "@openzeppelin/upgrades-core";
+import OldIdentityABI from "@gooddollar/goodcontracts/build/contracts/Identity.min.json";
 
 import {
   deployDeterministic,
@@ -44,6 +46,7 @@ export const upgrade = async () => {
     balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
   });
 
+  let OldIdentity = await ethers.getContractAt(OldIdentityABI.abi, release.OldIdentity || release.Identity);
   // let Identity = await ethers.getContractAt("IdentityV2", release.Identity);
   // Identity = await ethers.getContractAt("IdentityV2", "0xb0cD4828Cc90C5BC28f4920Adf2Fd8F025003D7E");
   console.log("deploying new identity...");
@@ -65,6 +68,12 @@ export const upgrade = async () => {
 
   console.log("calling initDAO...");
   const tx = await (await Identity.initDAO(release.NameService)).wait();
+  await Identity.grantRole(
+    ethers.utils.keccak256(ethers.utils.toUtf8Bytes("identity_admin")),
+    release.AdminWallet
+  ).then(printDeploy);
+  await OldIdentity.addIdentityAdmin(Identity.address).then(printDeploy);
+
   const impl = await getImplementationAddress(ethers.provider, Identity.address);
   await verifyContract(impl, "IdentityV2", networkName);