SocketDotTech · arthcp · Nov 12, 2024 · Oct 17, 2024 · Oct 30, 2024 · Nov 5, 2024
diff --git a/.env.example b/.env.example
@@ -103,3 +103,7 @@ AVALANCHE_RPC=' '
 XLAYER_RPC=' '
 
 MANTA_PACIFIC_RPC=' '
+
+OPBNB_RPC=' '
+
+GEIST_RPC=' '
diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json
diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json
@@ -974,6 +974,26 @@
       ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"]
     ]
   ],
+  "204": [
+    [
+      "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF",
+      "SocketSimulator",
+      "contracts/mocks/fee-updater/SocketSimulator.sol",
+      [
+        204,
+        204,
+        "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3",
+        "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead",
+        "IMLI"
+      ]
+    ],
+    [
+      "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619",
+      "CapacitorFactory",
+      "contracts/CapacitorFactory.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10]
+    ]
+  ],
   "238": [
     [
       "0x2a1094b6585b32FE33929cDdF7Ee3F5a1c1E163A",
@@ -4246,6 +4266,26 @@
       ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34"]
     ]
   ],
+  "63157": [
+    [
+      "0x22891c72dE565d884Dfd762B8df7C4632888a93A",
+      "SocketSimulator",
+      "contracts/mocks/fee-updater/SocketSimulator.sol",
+      [
+        63157,
+        63157,
+        "0xFe9DCb3dAba382f46F2Ce69ddEb3b5Df86d96f04",
+        "0x941f0ef5258604Fe10C76AE3858984CE0452b5f2",
+        "IMLI"
+      ]
+    ],
+    [
+      "0x5C4186D343EeF952c9ED886E45F8243edf0A503F",
+      "CapacitorFactory",
+      "contracts/CapacitorFactory.sol",
+      ["0x44A44837894B5eDC2Bde64567FC62599b3b88F4C", 10]
+    ]
+  ],
   "80001": [
     [
       "0x1F0F1FC746fcd4d59b6dBDDFf67a88cde70dAeE5",

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -117,6 +117,8 @@ if (isProduction) {
     [HardhatChainName.ZKEVM]: getChainConfig(ChainSlug.ZKEVM),
     [HardhatChainName.AVALANCHE]: getChainConfig(ChainSlug.AVALANCHE),
     [HardhatChainName.MANTA_PACIFIC]: getChainConfig(ChainSlug.MANTA_PACIFIC),
+    [HardhatChainName.OPBNB]: getChainConfig(ChainSlug.OPBNB),
+    [HardhatChainName.GEIST]: getChainConfig(ChainSlug.GEIST),
   };
 }
 
@@ -167,6 +169,8 @@ const config: HardhatUserConfig = {
       zkevm: process.env.ZKEVM_API_KEY || "",
       avalanche: process.env.SNOWTRACE_API_KEY || "",
       manta_pacific: process.env.MANTA_PACIFIC_API_KEY || "none",
+      opbnb: process.env.OPBNB_API_KEY || "none",
+      geist: process.env.GEIST_API_KEY || "none",
     },
     customChains: [
       {
@@ -313,6 +317,22 @@ const config: HardhatUserConfig = {
           browserURL: "https://pacific-explorer.manta.network/",
         },
       },
+      {
+        network: "opbnb",
+        chainId: ChainId.OPBNB,
+        urls: {
+          apiURL: "https://api-opbnb.bscscan.com/api",
+          browserURL: "https://opbnb.bscscan.com/",
+        },
+      },
+      {
+        network: "geist",
+        chainId: ChainId.GEIST,
+        urls: {
+          apiURL: "https://geist-mainnet.explorer.alchemy.com/api",
+          browserURL: "https://geist-mainnet.explorer.alchemy.com/",
+        },
+      },
     ],
   },
   networks: {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@socket.tech/dl-core",
   "license": "UNLICENSED",
-  "version": "2.30.0",
+  "version": "2.32.0",
   "description": "Smart contracts for socket data layer.",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",

diff --git a/scripts/constants/overrides.ts b/scripts/constants/overrides.ts
@@ -90,7 +90,7 @@ export const chainOverrides: {
   },
   [ChainSlug.MANTLE]: {
     type: 1,
-    gasLimit: 100_000_000_000,
+    gasLimit: 10_000_000_000,
     gasPrice: 30_000_000,
   },
   [ChainSlug.NEOX_TESTNET]: {

diff --git a/scripts/deploy/deploy.ts b/scripts/deploy/deploy.ts
@@ -33,32 +33,47 @@ const main = async () => {
       value: chain,
     }));
 
-    const configResponse = await prompts([
+    const chainsResponse = await prompts([
       {
         name: "chains",
         type: "multiselect",
+        message: "Select chains to connect",
+        choices,
+      },
+      {
+        name: "siblings",
+        type: "multiselect",
         message: "Select sibling chains to connect",
         choices,
       },
     ]);
 
-    const chains = [...configResponse.chains];
+    const chains = chainsResponse.chains;
+    const siblings = chainsResponse.siblings;
+    const allChains = [...chains, ...siblings];
     let addresses: DeploymentAddresses = await deployForChains(
-      chains,
+      allChains,
       executionManagerVersion
     );
 
     if (chains.length === 0) {
       console.log("No siblings selected!");
       return;
     }
-    await configureRoles(addresses, chains, true, executionManagerVersion);
+    await configureRoles(
+      addresses,
+      chains,
+      siblings,
+      true,
+      executionManagerVersion
+    );
     addresses = await configureSwitchboards(
       addresses,
       chains,
+      siblings,
       executionManagerVersion
     );
-    await connectPlugs(addresses, chains);
+    await connectPlugs(addresses, chains, siblings);
   } catch (error) {
     console.log("Error:", error);
   }

diff --git a/scripts/deploy/scripts/configureRoles.ts b/scripts/deploy/scripts/configureRoles.ts
@@ -18,12 +18,13 @@ import {
 import { checkAndUpdateRoles } from "./roles";
 import { sleep } from "@socket.tech/dl-common";
 
-const sleepTime = 3000;
+const sleepTime = 10000;
 const newRoleStatus = true;
 
 export const configureRoles = async (
   addresses: DeploymentAddresses,
   chains: ChainSlug[],
+  siblings: ChainSlug[],
   sendTransaction: boolean,
   executionManagerVersion: CORE_CONTRACTS
 ) => {
@@ -60,7 +61,7 @@ export const configureRoles = async (
       ],
       contractName: executionManagerVersion,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },
@@ -90,7 +91,7 @@ export const configureRoles = async (
       ],
       contractName: CORE_CONTRACTS.TransmitManager,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },
@@ -111,7 +112,7 @@ export const configureRoles = async (
       ],
       contractName: CORE_CONTRACTS.Socket,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },
@@ -152,7 +153,7 @@ export const configureRoles = async (
 
       contractName: CORE_CONTRACTS.FastSwitchboard,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },
@@ -191,7 +192,7 @@ export const configureRoles = async (
       ],
       contractName: CORE_CONTRACTS.OptimisticSwitchboard,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },
@@ -227,7 +228,7 @@ export const configureRoles = async (
       ],
       contractName: CORE_CONTRACTS.NativeSwitchboard,
       filterChains: chains,
-      filterSiblingChains: chains,
+      filterSiblingChains: siblings,
       sendTransaction,
       newRoleStatus,
     },

diff --git a/scripts/deploy/scripts/configureSwitchboards.ts b/scripts/deploy/scripts/configureSwitchboards.ts
@@ -25,6 +25,7 @@ import {
 export const configureSwitchboards = async (
   addresses: DeploymentAddresses,
   chains: ChainSlug[],
+  siblings: ChainSlug[],
   executionManagerVersion: CORE_CONTRACTS
 ) => {
   try {
@@ -42,25 +43,25 @@ export const configureSwitchboards = async (
 
         let addr: ChainSocketAddresses = addresses[chain]!;
 
-        const list = isTestnet(chain) ? TestnetIds : MainnetIds;
-        const siblingSlugs: ChainSlug[] = list.filter(
-          (chainSlug) => chainSlug !== chain && chains.includes(chainSlug)
-        );
+        // const list = isTestnet(chain) ? TestnetIds : MainnetIds;
+        // const siblingSlugs: ChainSlug[] = list.filter(
+        //   (chainSlug) => chainSlug !== chain && chains.includes(chainSlug)
+        // );
 
         await configureExecutionManager(
           executionManagerVersion,
           addr[executionManagerVersion]!,
           addr[CORE_CONTRACTS.SocketBatcher],
           chain,
-          siblingSlugs,
+          siblings,
           socketSigner
         );
 
         await setManagers(addr, socketSigner, executionManagerVersion);
 
         const integrations = addr["integrations"] ?? {};
         const integrationList = Object.keys(integrations).filter((chain) =>
-          chains.includes(parseInt(chain) as ChainSlug)
+          siblings.includes(parseInt(chain) as ChainSlug)
         );
 
         console.log(`Configuring for ${chain}`);
@@ -91,7 +92,7 @@ export const configureSwitchboards = async (
 
         addr = await registerSwitchboards(
           chain,
-          siblingSlugs,
+          siblings,
           CORE_CONTRACTS.FastSwitchboard,
           IntegrationTypes.fast,
           addr,
@@ -101,7 +102,7 @@ export const configureSwitchboards = async (
 
         addr = await registerSwitchboards(
           chain,
-          siblingSlugs,
+          siblings,
           CORE_CONTRACTS.OptimisticSwitchboard,
           IntegrationTypes.optimistic,
           addr,

diff --git a/scripts/deploy/scripts/connect.ts b/scripts/deploy/scripts/connect.ts
@@ -18,7 +18,8 @@ import { overrides } from "../config/config";
 
 export const connectPlugs = async (
   addresses: DeploymentAddresses,
-  chains: ChainSlug[]
+  chains: ChainSlug[],
+  siblings: ChainSlug[]
 ) => {
   try {
     await Promise.all(
@@ -34,15 +35,15 @@ export const connectPlugs = async (
         const addr: ChainSocketAddresses = addresses[chain]!;
         if (!addr["integrations"]) return;
 
-        const list = isTestnet(chain) ? TestnetIds : MainnetIds;
-        const siblingSlugs: ChainSlug[] = list.filter(
-          (chainSlug) =>
-            chainSlug !== chain &&
-            addresses?.[chainSlug]?.["Counter"] &&
-            chains.includes(chainSlug)
-        );
+        // const list = isTestnet(chain) ? TestnetIds : MainnetIds;
+        // const siblingSlugs: ChainSlug[] = list.filter(
+        //   (chainSlug) =>
+        //     chainSlug !== chain &&
+        //     addresses?.[chainSlug]?.["Counter"] &&
+        //     chains.includes(chainSlug)
+        // );
 
-        const siblingIntegrationtype: IntegrationTypes[] = siblingSlugs.map(
+        const siblingIntegrationtype: IntegrationTypes[] = siblings.map(
           (chainSlug) => {
             return getDefaultIntegrationType(chain, chainSlug);
           }
@@ -58,8 +59,8 @@ export const connectPlugs = async (
           await getInstance("Socket", addr["Socket"])
         ).connect(socketSigner);
 
-        for (let index = 0; index < siblingSlugs.length; index++) {
-          const sibling = siblingSlugs[index];
+        for (let index = 0; index < siblings.length; index++) {
+          const sibling = siblings[index];
           const siblingCounter = addresses?.[sibling]?.["Counter"];
           let switchboard;
           try {

diff --git a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts
@@ -26,7 +26,7 @@ export const batcherSupportedChainSlugs = [
   // ChainSlug.BOB,
   ChainSlug.KINTO,
   // ChainSlug.KINTO_DEVNET,
-  ChainSlug.SIPHER_FUNKI_TESTNET,
+  // ChainSlug.SIPHER_FUNKI_TESTNET,
   ChainSlug.WINR,
   ChainSlug.BLAST,
   // ChainSlug.BSC_TESTNET,
@@ -41,4 +41,6 @@ export const batcherSupportedChainSlugs = [
   ChainSlug.AVALANCHE,
   ChainSlug.XLAYER,
   ChainSlug.MANTA_PACIFIC,
+  ChainSlug.OPBNB,
+  ChainSlug.GEIST,
 ];
diff --git a/scripts/rpcConfig/constants/explorers.ts b/scripts/rpcConfig/constants/explorers.ts
@@ -20,4 +20,6 @@ export const explorers = {
   [ChainSlug.AVALANCHE]: "https://snowtrace.io/",
   [ChainSlug.XLAYER]: "https://www.okx.com/web3/explorer/xlayer",
   [ChainSlug.MANTA_PACIFIC]: "https://pacific-explorer.manta.network/",
+  [ChainSlug.OPBNB]: "https://opbnb.bscscan.com/",
+  [ChainSlug.GEIST]: "https://geist-mainnet.explorer.alchemy.com/",
 };
diff --git a/scripts/rpcConfig/constants/icons.ts b/scripts/rpcConfig/constants/icons.ts
@@ -18,4 +18,6 @@ export const icons = {
   [ChainSlug.AVALANCHE]: "",
   [ChainSlug.XLAYER]: "",
   [ChainSlug.MANTA_PACIFIC]: "",
+  [ChainSlug.OPBNB]: "",
+  [ChainSlug.GEIST]: "",
 };
diff --git a/scripts/rpcConfig/constants/rpc.ts b/scripts/rpcConfig/constants/rpc.ts
@@ -53,4 +53,6 @@ export const rpcs = {
   [ChainSlug.AVALANCHE]: checkEnvValue("AVALANCHE_RPC"),
   [ChainSlug.XLAYER]: checkEnvValue("XLAYER_RPC"),
   [ChainSlug.MANTA_PACIFIC]: checkEnvValue("MANTA_PACIFIC_RPC"),
+  [ChainSlug.OPBNB]: checkEnvValue("OPBNB_RPC"),
+  [ChainSlug.GEIST]: checkEnvValue("GEIST_RPC"),
 };
diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts
@@ -2,5 +2,5 @@ import { DeploymentMode } from "../../../src";
 
 export const version = {
   [DeploymentMode.DEV]: "1.0.5",
-  [DeploymentMode.PROD]: "1.0.60",
+  [DeploymentMode.PROD]: "1.0.65",
 };
diff --git a/scripts/rpcConfig/rpcConfig.ts b/scripts/rpcConfig/rpcConfig.ts
@@ -62,8 +62,6 @@ const getOldEMVersionChainSlugs = (): ChainSlug[] => {
       if (!chainAddress.ExecutionManagerDF)
         chains.push(parseInt(chain) as ChainSlug);
     });
-
-    console.log(chains);
   } catch (error) {
     return [] as ChainSlug[];
   }