Merge branch 'main' into whitelist-with-nonexisting-canonical-domain

packages/deployments/contracts/src/cli/init/config/mainnet/production.ts

@@ -12,7 +12,14 @@ export const MAINNET_PRODUCTION_INIT_CONFIG: InitConfig = {
     "1634886255", // ARBITRUM ONE
     "6450786", // BNB
     "6778479", // GNOSIS
-    "1836016741", // MODE
+    "1818848877", // LINEA
+    "1835365481", // METIS
+    "2053862243", // ZkSync-Era
+    "1887071085", // PolygonZk
+    "1650553709", // Base
+    "1635148152", // Avalanche
+    "1835101812", // Mantle
+    "1836016741", // Mode
   ],
   // NOTE: ENSURE LPTOKEN AND BRIDGETOKEN NAMES ARE GENERATED CORRECTLY BASED
   // ON THE NAME GIVEN IN EACH ASSET ENTRY
@@ -609,6 +616,167 @@ export const MAINNET_PRODUCTION_INIT_CONFIG: InitConfig = {
         },
       },
     },
+    {
+      name: "URUS",
+      canonical: {
+        domain: "11111",
+        address: "0x21d3a2faA153168C46Ac1428A84BdD859490505F",
+        decimals: 18,
+      },
+      representations: {
+        "6648936": {
+          local: "0x21d3a2faA153168C46Ac1428A84BdD859490505F",
+          adopted: "0x21d3a2faA153168C46Ac1428A84BdD859490505F",
+        },
+        "6450786": {
+          local: "0x21d3a2faA153168C46Ac1428A84BdD859490505F",
+          adopted: "0x21d3a2faA153168C46Ac1428A84BdD859490505F",
+        },
+      },
+    },
+    {
+      name: "xGrumpy Cat",
+      canonical: {
+        domain: "11111",
+        address: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        decimals: 18,
+      },
+      representations: {
+        // mainnet
+        "6648936": {
+          local: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+          adopted: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        },
+        // Optimsim
+        "1869640809": {
+          local: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+          adopted: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        },
+        // Polygon
+        "1886350457": {
+          local: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+          adopted: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        },
+        // Binance
+        "6450786": {
+          local: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+          adopted: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        },
+        // Arbitrum
+        "1634886255": {
+          local: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+          adopted: "0x3B350F202473932411772C8Cb76DB7975f42397E",
+        },
+      },
+    },
+    {
+      name: "FRACTION",
+      canonical: {
+        domain: "11111",
+        address: "0x4602e7CFE18d8b16ED13538603B00073F5c28bc8",
+        decimals: 18,
+      },
+      representations: {
+        // gnosis
+        "6778479": {
+          local: "0x4602e7CFE18d8b16ED13538603B00073F5c28bc8",
+          adopted: "0x4602e7CFE18d8b16ED13538603B00073F5c28bc8",
+        },
+        // optimism
+        "1869640809": {
+          local: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+          adopted: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+        },
+        // bnb
+        "6450786": {
+          local: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+          adopted: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+        },
+        // polygon
+        "1886350457": {
+          local: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+          adopted: "0xbD80CFA9d93A87D1bb895f810ea348E496611cD4",
+        },
+        // arbtirum-one
+        "1634886255": {
+          local: "0x2bF2ba13735160624a0fEaE98f6aC8F70885eA61",
+          adopted: "0x2bF2ba13735160624a0fEaE98f6aC8F70885eA61",
+        },
+      },
+    },
+    {
+      name: "xIXT",
+      canonical: {
+        domain: "11111",
+        address: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+        decimals: 18,
+      },
+      representations: {
+        "1886350457": {
+          local: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+          adopted: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+        },
+        "6648936": {
+          local: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+          adopted: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+        },
+        "1634886255": {
+          local: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+          adopted: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+        },
+        "6450786": {
+          local: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+          adopted: "0x8b04bf3358B88e3630aa64C1c76FF3B6C699C6a7",
+        },
+      },
+    },
+    {
+      name: "ZOOMER",
+      canonical: {
+        // Pseudo-canonical domain
+        domain: "11111",
+        address: "0x425F81E2fe53256B9a7AEA91949dA2210bd049bE",
+        decimals: 18,
+      },
+      representations: {
+        /// MAINNET
+        "6648936": {
+          local: "0x425F81E2fe53256B9a7AEA91949dA2210bd049bE",
+          adopted: "0x425F81E2fe53256B9a7AEA91949dA2210bd049bE",
+        },
+        /// POLYGON
+        "1886350457": {
+          local: "0xb2588731d8f6F854037936d6ffac4c13d0b6bd62",
+          adopted: "0xb2588731d8f6F854037936d6ffac4c13d0b6bd62",
+        },
+        /// ARBITRUM
+        "1634886255": {
+          local: "0xBB1B173cdFBe464caaaCeaB2a9c8C44229d62D14",
+          adopted: "0xBB1B173cdFBe464caaaCeaB2a9c8C44229d62D14",
+        },
+        // BINANCE
+      },
+    },
+    {
+      name: "xoLIT",
+      canonical: {
+        domain: "11111",
+        address: "0x24F21b1864d4747a5c99045c96dA11DBFDa378f7",
+        decimals: 18,
+      },
+      representations: {
+        /// ETHEREUM
+        "6648936": {
+          local: "0x24F21b1864d4747a5c99045c96dA11DBFDa378f7",
+          adopted: "0x24F21b1864d4747a5c99045c96dA11DBFDa378f7",
+        },
+        /// ARBITRUM
+        "1634886255": {
+          local: "0x24F21b1864d4747a5c99045c96dA11DBFDa378f7",
+          adopted: "0x24F21b1864d4747a5c99045c96dA11DBFDa378f7",
+        },
+      },
+    },
   ],
   agents: {
     relayerFeeVaults: {

packages/deployments/contracts/src/cli/init/config/testnet/production.ts

@@ -8,9 +8,11 @@ export const TESTNET_PRODUCTION_INIT_CONFIG: InitConfig = {
     // "1734439522", /// ARBITRUM-GOERLI
     "9991", /// MUMBAI
     "11111",
-    "2053862260", /// ZKSYNC-TEST
-    "1668247156", /// CONSENSYS-ZKEVM-TEST
-    "1887071092", /// POLYGON-ZKEVM-TEST
+    // "2053862260", /// ZKSYNC-TEST
+    // "1668247156", /// LINGEA-GOERLI
+    // "1887071092", /// POLYGON-ZKEVM-TEST
+    "1650553703", /// BASE-GOERLI
+    "2016506996", /// X1-TESTNET
   ],
   assets: [
     {

packages/deployments/contracts/src/cli/init/init.ts

@@ -205,7 +205,8 @@ export const sanitizeAndInit = async () => {
         throw new Error(`No relayer fee vault configured for ${domain}!`);
       }
       networks.push({
-        chain: chainId.toString(),
+        signerAddress: deployer.address.toLowerCase(),
+      chain: chainId.toString(),
         domain,
         rpc,
         deployments,
@@ -543,34 +544,7 @@ export const initProtocol = async (protocol: ProtocolStack, apply: boolean, stag
         for (const proposer of protocol.agents.proposers.allowlist) {
           console.log("\tVerifying agents are set as proposers.");
           for (const network of protocol.networks) {
-            const relayerProxyAddress = network.deployments.messaging.RelayerProxy.address;
-            await updateIfNeeded({
-              apply,
-              deployment: network.deployments.Connext,
-              desired: true,
-              read: { method: "approvedRelayers", args: [relayerProxyAddress] },
-              write: { method: "addRelayer", args: [relayerProxyAddress] },
-              chainData,
-            });
-
-            await updateIfNeeded({
-              apply,
-              deployment: network.deployments.messaging.RelayerProxy,
-              desired: getGelatoRelayerAddress,
-              read: { method: "gelatoRelayer" },
-              write: { method: "setGelatoRelayer", args: [getGelatoRelayerAddress] },
-              chainData,
-            });
-
-            const feeCollector = network.relayerFeeVault;
-            await updateIfNeeded({
-              apply,
-              deployment: network.deployments.messaging.RelayerProxy,
-              desired: feeCollector,
-              read: { method: "feeCollector" },
-              write: { method: "setFeeCollector", args: [feeCollector] },
-              chainData,
-            });
+            await whitelistProposerOnRootAndSpoke(proposer, network);
           }
 
           // TODO: Blacklist/remove proposers.