Merge pull request #413 from SocketDotTech/bungee-chains

Bungee chains
SocketDotTech · Mar 4, 2025 · 5e5a7c3 · 5e5a7c3
2 parents 8d29c07 + f1f3bb2
commit 5e5a7c3
Show file tree

Hide file tree

Showing 27 changed files with 1,523 additions and 95 deletions.
diff --git a/.env.example b/.env.example
@@ -119,3 +119,9 @@ BERA_RPC=' '
 B3_RPC=' '
 
 UNICHAIN_RPC=' '
+
+MONAD_TESTNET_RPC=' '
+
+SCROLL_RPC=' '
+
+SONEIUM_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
@@ -2841,6 +2841,20 @@
       ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34"]
     ]
   ],
+  "1868": [
+    [
+      "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619",
+      "SafeProxyFactory",
+      "contracts/utils/multisig/proxies/SafeProxyFactory.sol",
+      []
+    ],
+    [
+      "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3",
+      "SafeL2",
+      "contracts/utils/multisig/SafeL2.sol",
+      []
+    ]
+  ],
   "2999": [
     [
       "0x74EBb564b92A3F7AcfFeb8aF3b322831bF57ac22",
@@ -4128,6 +4142,152 @@
       ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34"]
     ]
   ],
+  "10143": [
+    [
+      "0xB152AC07a21966981fef9341DA3146f8e08e22bC",
+      "SwitchboardSimulator",
+      "contracts/mocks/fee-updater/SwitchboardSimulator.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7",
+        10143,
+        1000,
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705"
+      ]
+    ],
+    [
+      "0xcd620187f4846ba5a42ab41270aC550467dc9FbB",
+      "SimulatorUtils",
+      "contracts/mocks/fee-updater/SimulatorUtils.sol",
+      [
+        "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7",
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705",
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        10143
+      ]
+    ],
+    [
+      "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7",
+      "SocketSimulator",
+      "contracts/mocks/fee-updater/SocketSimulator.sol",
+      [
+        10143,
+        10143,
+        "0xb4Ef469c9d8317851270346070dA0ecE24616E6b",
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705",
+        "IMLI"
+      ]
+    ],
+    [
+      "0x8c36353db4F3a2DDDeed38405199d13DCF8a1B82",
+      "Counter",
+      "contracts/examples/Counter.sol",
+      ["0xb3314456567986e657d4C65Ec9e8cB736B92d11D"]
+    ],
+    [
+      "0xb4Db1838d0B97BD58C7663b3E487eEbC9a996472",
+      "SocketBatcher",
+      "contracts/socket/SocketBatcher.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"]
+    ],
+    [
+      "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E",
+      "OptimisticSwitchboard",
+      "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+        10143,
+        7200,
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705"
+      ]
+    ],
+    [
+      "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8",
+      "FastSwitchboard",
+      "contracts/switchboard/default-switchboards/FastSwitchboard.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+        10143,
+        7200,
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705"
+      ]
+    ],
+    [
+      "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF",
+      "TransmitManager",
+      "contracts/TransmitManager.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        10143,
+        "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705"
+      ]
+    ],
+    [
+      "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21",
+      "ExecutionManagerDF",
+      "contracts/ExecutionManagerDF.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        10143,
+        "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+        "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705"
+      ]
+    ],
+    [
+      "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+      "Socket",
+      "contracts/socket/Socket.sol",
+      [
+        10143,
+        "0xb4Ef469c9d8317851270346070dA0ecE24616E6b",
+        "0x0CC93650bF4D98237628DACf87f94E443956D8dF",
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        "IMLI"
+      ]
+    ],
+    [
+      "0x0CC93650bF4D98237628DACf87f94E443956D8dF",
+      "CapacitorFactory",
+      "contracts/CapacitorFactory.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10]
+    ],
+    [
+      "0xb4Ef469c9d8317851270346070dA0ecE24616E6b",
+      "Hasher",
+      "contracts/utils/Hasher.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"]
+    ],
+    [
+      "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705",
+      "SignatureVerifier",
+      "contracts/utils/SignatureVerifier.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"]
+    ],
+    [
+      "0x1CAdCd88fC148D3966eDe75D029937C886f66009",
+      "MultiSigWrapper",
+      "contracts/utils/multisig/MultiSigWrapper.sol",
+      [
+        "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836",
+        "0x93552A3453eB6e3cEA58bFB15f0c207040370720"
+      ]
+    ],
+    [
+      "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619",
+      "SafeProxyFactory",
+      "contracts/utils/multisig/proxies/SafeProxyFactory.sol",
+      []
+    ],
+    [
+      "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3",
+      "SafeL2",
+      "contracts/utils/multisig/SafeL2.sol",
+      []
+    ]
+  ],
   "34443": [
     [
       "0xF34411eE2940Fe5fc6c6228130e2EeF12b1f3E49",
@@ -6701,6 +6861,32 @@
       ["0x78Deb9225c3F28D12922913Fec978e4dC90E1aa4"]
     ]
   ],
+  "534352": [
+    [
+      "0xcd620187f4846ba5a42ab41270aC550467dc9FbB",
+      "SocketSimulator",
+      "contracts/mocks/fee-updater/SocketSimulator.sol",
+      [
+        534352,
+        534352,
+        "0x0CC93650bF4D98237628DACf87f94E443956D8dF",
+        "0xb4Ef469c9d8317851270346070dA0ecE24616E6b",
+        "IMLI"
+      ]
+    ],
+    [
+      "0xb3314456567986e657d4C65Ec9e8cB736B92d11D",
+      "CapacitorFactory",
+      "contracts/CapacitorFactory.sol",
+      ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10]
+    ],
+    [
+      "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE",
+      "SafeProxyFactory",
+      "contracts/utils/multisig/proxies/SafeProxyFactory.sol",
+      []
+    ]
+  ],
   "543210": [
     [
       "0xDb3c47f98285C6A61C31371499aC902230aAf6F9",

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -124,6 +124,8 @@ if (isProduction) {
     [HardhatChainName.BERA]: getChainConfig(ChainSlug.BERA),
     [HardhatChainName.B3]: getChainConfig(ChainSlug.B3),
     [HardhatChainName.UNICHAIN]: getChainConfig(ChainSlug.UNICHAIN),
+    [HardhatChainName.SCROLL]: getChainConfig(ChainSlug.SCROLL),
+    [HardhatChainName.SONEIUM]: getChainConfig(ChainSlug.SONEIUM),
   };
 }
 
@@ -180,6 +182,8 @@ const config: HardhatUserConfig = {
       berascan: process.env.BERASCAN_API_KEY || "",
       b3: process.env.B3_API_KEY || "none",
       unichain: process.env.UNICHAIN_API_KEY || "none",
+      scroll: process.env.SCROLLSCAN_API_KEY || "",
+      soneium: process.env.SONEIUM_API_KEY || "none",
     },
     customChains: [
       {
@@ -374,6 +378,22 @@ const config: HardhatUserConfig = {
           browserURL: "https://unichain.blockscout.com/",
         },
       },
+      {
+        network: "scroll",
+        chainId: ChainId.SCROLL,
+        urls: {
+          apiURL: "https://api.scrollscan.com/api",
+          browserURL: "https://scrollscan.com/",
+        },
+      },
+      {
+        network: "soneium",
+        chainId: ChainId.SONEIUM,
+        urls: {
+          apiURL: "https://soneium.blockscout.com/api",
+          browserURL: "https://soneium.blockscout.com/",
+        },
+      },
     ],
   },
   networks: {

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

diff --git a/scripts/admin/rescueFunds.ts b/scripts/admin/rescueFunds.ts
@@ -3,7 +3,7 @@ import { config as dotenvConfig } from "dotenv";
 dotenvConfig();
 
 import { Contract, Wallet, ethers } from "ethers";
-import { mode, overrides } from "../deploy/config/config";
+import { mode, overrides, ownerAddresses } from "../deploy/config/config";
 import { getProviderFromChainSlug } from "../constants";
 
 import {
@@ -16,6 +16,8 @@ import {
   isTestnet,
 } from "../../src";
 import { formatEther } from "ethers/lib/utils";
+import { getSocketSigner } from "../deploy/utils/socket-signer";
+import { deploymentMode } from "../rpcConfig/rpcConfig";
 
 /**
  * Usable flags
@@ -148,9 +150,12 @@ export const main = async () => {
         const providerInstance = getProviderFromChainSlug(
           parseInt(chainSlug) as ChainSlug
         );
-        const signer: Wallet = new ethers.Wallet(
-          process.env.SOCKET_SIGNER_KEY as string,
-          providerInstance
+
+        const signer = await getSocketSigner(
+          parseInt(chainSlug),
+          chainAddresses,
+          chainAddresses["SocketSafeProxy"] ? true : false,
+          true
         );
 
         const contractAddr = createContractAddrArray(chainAddresses);
@@ -187,7 +192,7 @@ export const main = async () => {
             try {
               const tx = await contractInstance.rescueFunds(
                 ETH_ADDRESS,
-                signer.address,
+                ownerAddresses[deploymentMode],
                 rescueAmount,
                 { ...(await overrides(parseInt(chainSlug))) }
               );

diff --git a/scripts/constants/overrides.ts b/scripts/constants/overrides.ts
@@ -33,6 +33,7 @@ export const chainOverrides: {
 
   [ChainSlug.POLYGON_MAINNET]: {
     gasPriceMultiplier: 2,
+    gasLimit: 3_000_000,
   },
   [ChainSlug.ZKEVM]: {
     gasPriceMultiplier: 1.3,
@@ -105,8 +106,11 @@ export const chainOverrides: {
     gasLimit: 10_000_000,
   },
   [ChainSlug.AVALANCHE]: {
-    // gasLimit: 3_000_000,
-    gasPriceMultiplier: 1.5,
+    gasLimit: 3_000_000,
+    gasPriceMultiplier: 1.1,
+  },
+  [ChainSlug.SCROLL]: {
+    gasLimit: 3_000_000,
   },
 };
 

diff --git a/scripts/deploy/scripts/configureRoles.ts b/scripts/deploy/scripts/configureRoles.ts
@@ -18,7 +18,7 @@ import {
 import { checkAndUpdateRoles } from "./roles";
 import { sleep } from "@socket.tech/dl-common";
 
-const sleepTime = 10000;
+const sleepTime = 100;
 const newRoleStatus = true;
 
 export const configureRoles = async (

diff --git a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts
@@ -55,4 +55,7 @@ export const batcherSupportedChainSlugs = [
   ChainSlug.BERA,
   ChainSlug.B3,
   ChainSlug.UNICHAIN,
+  // ChainSlug.MONAD_TESTNET,
+  ChainSlug.SCROLL,
+  ChainSlug.SONEIUM,
 ];
diff --git a/scripts/rpcConfig/constants/explorers.ts b/scripts/rpcConfig/constants/explorers.ts
@@ -34,4 +34,7 @@ export const explorers = {
   [ChainSlug.BERA]: "https://berascan.com/",
   [ChainSlug.B3]: "https://explorer.b3.fun/",
   [ChainSlug.UNICHAIN]: "https://unichain.blockscout.com/",
+  [ChainSlug.MONAD_TESTNET]: "https://monad-testnet.socialscan.io/",
+  [ChainSlug.SCROLL]: "https://scrollscan.com/",
+  [ChainSlug.SONEIUM]: "https://soneium.blockscout.com/",
 };
diff --git a/scripts/rpcConfig/constants/finality.ts b/scripts/rpcConfig/constants/finality.ts
@@ -46,4 +46,9 @@ export const finalityOverrides: {
     [FinalityBucket.medium]: 2000,
     [FinalityBucket.high]: 3000,
   },
+  [ChainSlug.SCROLL]: {
+    [FinalityBucket.low]: 1,
+    [FinalityBucket.medium]: 100,
+    [FinalityBucket.high]: 1024,
+  },
 };
diff --git a/scripts/rpcConfig/constants/icons.ts b/scripts/rpcConfig/constants/icons.ts
@@ -32,4 +32,7 @@ export const icons = {
   [ChainSlug.BERA]: "",
   [ChainSlug.B3]: "",
   [ChainSlug.UNICHAIN]: "",
+  [ChainSlug.MONAD_TESTNET]: "",
+  [ChainSlug.SCROLL]: "",
+  [ChainSlug.SONEIUM]: "",
 };
diff --git a/scripts/rpcConfig/constants/rpc.ts b/scripts/rpcConfig/constants/rpc.ts
@@ -67,4 +67,7 @@ export const rpcs = {
   [ChainSlug.BERA]: checkEnvValue("BERA_RPC"),
   [ChainSlug.B3]: checkEnvValue("B3_RPC"),
   [ChainSlug.UNICHAIN]: checkEnvValue("UNICHAIN_RPC"),
+  [ChainSlug.MONAD_TESTNET]: checkEnvValue("MONAD_TESTNET_RPC"),
+  [ChainSlug.SCROLL]: checkEnvValue("SCROLL_RPC"),
+  [ChainSlug.SONEIUM]: checkEnvValue("SONEIUM_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.79",
+  [DeploymentMode.PROD]: "1.0.84",
 };
diff --git a/src/enums/chainId.ts b/src/enums/chainId.ts
@@ -63,4 +63,7 @@ export enum ChainId {
   BERA = 80094,
   B3 = 8333,
   UNICHAIN = 130,
+  MONAD_TESTNET = 10143,
+  SCROLL = 534352,
+  SONEIUM = 1868,
 }