@gooddollar/goodprotocol 2.0.3-beta.0 → 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,6 +64,12 @@ 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"));
 	}
@@ -72,19 +78,21 @@ contract FuseFaucetV2 is Initializable {
 		address _relayer,
 		address _owner,
 		NameService _ns
-	) public {
-		require(version == 0, "already upgraded");
-		version++;
+	) public upgrader(1) {
 		owner = _owner;
 		if (maxDailyNewWallets == 0) maxDailyNewWallets = 5000;
 		relayer = _relayer;
 		upgrade2(_ns);
 	}
 
-	function upgrade2(NameService _ns) public {
-		require(version == 1, "already upgraded");
-		version++;
+	function upgrade2(NameService _ns) public upgrader(2) {
 		nameService = _ns;
+		upgrade3();
+	}
+
+	function upgrade3() public upgrader(3) {
+		gasTopping = gasTopping / gasPrice;
+		perDayRoughLimit = gasTopping * 2;
 	}
 
 	modifier reimburseGas() {
@@ -153,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"
 		);
 		_;
@@ -166,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;
@@ -193,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;
 	}
 
@@ -219,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;
 
@@ -256,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/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/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/package.json

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

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";
@@ -51,33 +52,32 @@ export const deployHelpers = async () => {
     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 Invites = await deployDeterministic({ name: "InvitesV2", salt: "InvitesV2", isUpgradeable: true }, [
     release.NameService,
@@ -85,18 +85,42 @@ export const deployHelpers = async () => {
     root.address
   ]);
 
+  // const Invites = await ethers.getContractAt("AdminWallet", release.Invites);
+
+  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");
@@ -104,16 +128,17 @@ export const deployHelpers = async () => {
   }
 
   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 () => {

package/scripts/multichain-deploy/4_ubi-deploy.ts

@@ -5,24 +5,23 @@
 import { network, ethers, upgrades, run } from "hardhat";
 import { Contract } from "ethers";
 import { defaultsDeep } from "lodash";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 import {
   deployDeterministic,
   executeViaGuardian,
   executeViaSafe,
+  verifyContract,
   verifyProductionSigner
 } from "./helpers";
 import releaser from "../releaser";
 import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
 import { TransactionResponse } from "@ethersproject/providers";
-import { InvitesV1__factory } from "../../types";
 import { keccak256, toUtf8Bytes } from "ethers/lib/utils";
 
 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);
@@ -35,16 +34,14 @@ const printDeploy = async (
 };
 
 export const deployHelpers = async () => {
-  let protocolSettings = defaultsDeep(
-    {},
-    ProtocolSettings[network.name],
-    ProtocolSettings["default"]
-  );
+  const viaGuardians = false;
+
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
   let release: { [key: string]: any } = dao[network.name];
 
   let [root, ...signers] = await ethers.getSigners();
   const isProduction = network.name.includes("production");
-  const viaGuardians = false;
+
   if (isProduction) verifyProductionSigner(root);
   //generic call permissions
   let schemeMock = root;
@@ -53,9 +50,7 @@ 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())
   });
 
   console.log("deploying ubi pool");
@@ -64,19 +59,14 @@ export const deployHelpers = async () => {
       name: "UBIScheme",
       isUpgradeable: true
     },
-    [
-      release.NameService,
-      ethers.constants.AddressZero,
-      protocolSettings.ubi.maxInactiveDays
-    ]
+    [release.NameService, ethers.constants.AddressZero, protocolSettings.ubi.maxInactiveDays]
   ).then(printDeploy)) as Contract;
 
   console.log("deploying claimers distribution");
 
-  const ClaimersDistribution = (await deployDeterministic(
-    { name: "ClaimersDistribution", isUpgradeable: true },
-    [release.NameService]
-  ).then(printDeploy)) as Contract;
+  const ClaimersDistribution = (await deployDeterministic({ name: "ClaimersDistribution", isUpgradeable: true }, [
+    release.NameService
+  ]).then(printDeploy)) as Contract;
 
   console.log("setting nameservice addresses via guardian");
   const proposalContracts = [
@@ -93,10 +83,7 @@ export const deployHelpers = async () => {
     ethers.utils.defaultAbiCoder.encode(
       ["bytes32[]", "address[]"],
       [
-        [
-          keccak256(toUtf8Bytes("UBISCHEME")),
-          keccak256(toUtf8Bytes("GDAO_CLAIMERS"))
-        ],
+        [keccak256(toUtf8Bytes("UBISCHEME")), keccak256(toUtf8Bytes("GDAO_CLAIMERS"))],
         [UBIScheme.address, ClaimersDistribution.address]
       ]
     )
@@ -106,17 +93,14 @@ export const deployHelpers = async () => {
     console.log("minting G$s to pool on dev envs");
     const gd = await ethers.getContractAt("IGoodDollar", release.GoodDollar);
     const decimals = await gd.decimals();
-    await gd.mint(
-      UBIScheme.address,
-      ethers.BigNumber.from(1e6).mul(ethers.BigNumber.from("10").pow(decimals))
-    ); //1million GD
+    await gd.mint(UBIScheme.address, ethers.BigNumber.from(1e6).mul(ethers.BigNumber.from("10").pow(decimals))); //1million GD
   }
 
-  release = {
-    UBIScheme: UBIScheme.address,
-    ClaimersDistribution: ClaimersDistribution.address
-  };
-  await releaser(release, network.name, "deployment", false);
+  let impl = await getImplementationAddress(ethers.provider, UBIScheme.address);
+  await verifyContract(impl, "UBIScheme", network.name);
+
+  impl = await getImplementationAddress(ethers.provider, ClaimersDistribution.address);
+  await verifyContract(impl, "ClaimersDistribution", network.name);
 
   try {
     if (viaGuardians) {

package/scripts/multichain-deploy/helpers.ts

@@ -207,7 +207,7 @@ export const executeViaSafe = async (
       txServiceUrl = "https://safe-transaction-mainnet.safe.global";
       break;
     case 122:
-      txServiceUrl = "https://gateway.safe.fuse.io";
+      txServiceUrl = "https://transaction-fuse.safe.fuse.io";
       break;
     case 42220:
       txServiceUrl = "https://mainnet-tx-svc.celo-safe-prod.celo-networks-dev.org";
@@ -236,8 +236,8 @@ export const executeViaSafe = async (
     const contract = contracts[i];
 
     const sigHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(functionSigs[i])).slice(0, 10);
+    console.log("creating tx:", contracts[i], functionSigs[i], functionInputs[i]);
     const encoded = ethers.utils.solidityPack(["bytes4", "bytes"], [sigHash, functionInputs[i]]);
-    console.log("creating tx:", contracts[i], functionSigs[i], functionInputs[i], encoded);
     if (contract === ctrl.address) {
       const simulationResult =
         isSimulation === false &&

package/scripts/multichain-deploy/multichainWrapper-deploy.ts

@@ -1,7 +1,8 @@
 import { network, ethers, upgrades, run } from "hardhat";
 import { Contract } from "ethers";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
 
-import { deployDeterministic, printDeploy } from "./helpers";
+import { deployDeterministic, printDeploy, verifyContract } from "./helpers";
 import releaser from "../../scripts/releaser";
 import ProtocolSettings from "../../releases/deploy-settings.json";
 import dao from "../../releases/deployment.json";
@@ -20,9 +21,7 @@ export const deployWrapper = async (defaultAdmin = null) => {
     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())
   });
 
   console.log("MintBurnWrapper deploy params:", [
@@ -44,6 +43,10 @@ export const deployWrapper = async (defaultAdmin = null) => {
     GoodDollarMintBurnWrapper: Wrapper.address
   };
   await releaser(release, network.name, "deployment", false);
+
+  const impl = await getImplementationAddress(ethers.provider, Wrapper.address);
+  await verifyContract(impl, "GoodDollarMintBurnWrapper", network.name);
+
   return Wrapper;
 };
 

package/scripts/upgradeToV3/v3-fuse-multichain.ts

@@ -0,0 +1,117 @@
+/***
+ * This script will deploy a reserve upgrade and the DistributionHelper so that some of the expansion can be allocated
+ * for non-ubi purposes
+ * Upgrade process:
+ * mainnet:
+ * - deploy reserve
+ * - deploy distributionHelper
+ * - create proposal that:
+ *  - upgrades the reserve
+ *  - sets the distributionHelper at reserve with the agreed bps
+ *  - add to the distributionHelper the contracts addresses to receive part of the UBI
+ */
+
+import { network, ethers } from "hardhat";
+import { defaultsDeep } from "lodash";
+import {
+  deployDeterministic,
+  printDeploy,
+  executeViaGuardian,
+  executeViaSafe,
+  verifyProductionSigner
+} from "../multichain-deploy/helpers";
+import { deployWrapper } from "../multichain-deploy/multichainWrapper-deploy";
+
+import releaser from "../releaser";
+import ProtocolSettings from "../../releases/deploy-settings.json";
+import dao from "../../releases/deployment.json";
+import { BigNumber } from "ethers";
+const { name: networkName } = network;
+
+export const deployFuse = async () => {
+  const isProduction = networkName.includes("production");
+  let [root, ...signers] = await ethers.getSigners();
+
+  if (isProduction) verifyProductionSigner(root);
+
+  let executionMethod = "safe";
+
+  const networkKey = networkName === "localhost" ? "production-mainnet" : networkName;
+  let release: { [key: string]: any } = dao[networkKey];
+  let settings = defaultsDeep({}, ProtocolSettings[networkName], ProtocolSettings["default"]);
+
+  console.log("got signers:", {
+    networkName,
+    networkKey,
+    root: root.address,
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
+  });
+
+  const Wrapper = await deployWrapper();
+  // const Wrapper = await ethers.getContractAt("GoodDollarMintBurnWrapper", release.GoodDollarMintBurnWrapper);
+
+  const proposalContracts = [
+    release.NameService, //nameservice add Wrapper,MultiChainRouter
+    release.GoodDollar, // give mint rights to Wrapper
+    Wrapper.address //add multichainrouter as minter
+  ];
+
+  const proposalEthValues = proposalContracts.map(_ => 0);
+
+  const proposalFunctionSignatures = [
+    "setAddresses(bytes32[],address[])",
+    "addMinter(address)",
+    "addMinter(address,uint256,uint256,uint32,uint256,uint256,uint32,bool)"
+  ];
+
+  const proposalFunctionInputs = [
+    ethers.utils.defaultAbiCoder.encode(
+      ["bytes32[]", "address[]"],
+      [
+        [
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("MINTBURN_WRAPPER")),
+          ethers.utils.keccak256(ethers.utils.toUtf8Bytes("MULTICHAIN_ROUTER"))
+        ],
+        [Wrapper.address, release.MultichainRouter]
+      ]
+    ), //setAddresses(bytes32[],address[])"
+    ethers.utils.defaultAbiCoder.encode(["address"], [Wrapper.address]), //addMinter(address)
+    ethers.utils.defaultAbiCoder.encode(
+      ["address", "uint256", "uint256", "uint32", "uint256", "uint256", "uint32", "bool"],
+      [
+        release.MultichainRouter,
+        0,
+        0,
+        0,
+        0,
+        300 * 1e6 * 100, //300M G$ 2 decimals
+        1000, //10%
+        false
+      ]
+    ) //addMinter(address,uint256,uint256,uint32,uint256,uint256,uint32,bool)
+  ];
+
+  if (executionMethod === "safe") {
+    return executeViaSafe(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      networkName === "localhost" ? "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec" : release.GuardiansSafe,
+      "fuse"
+    );
+  } else {
+    return executeViaGuardian(
+      proposalContracts,
+      proposalEthValues,
+      proposalFunctionSignatures,
+      proposalFunctionInputs,
+      root
+    );
+  }
+};
+
+export const main = async () => {
+  await deployFuse().catch(console.log);
+};
+if (process.argv[1].includes("v3-fuse-multichain")) main();

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

@@ -7,7 +7,7 @@
  * - add 1000 celo to adminwallet and faucet
  * - monitor adminwallet + faucet on defender
  *
- * Step 3:
+ * Step 3: (once guardians sign Identity upgrade)
  * - upgrade AdminWallet+Invites+Faucet on Fuse to support whitelisting chainid
  * - upgrade backend server to support whitelisting with chainid
  *