From 369946418f4faa5db00409d39d0a8346bc687bd4 Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 22 Aug 2024 19:30:34 +0530 Subject: [PATCH 01/12] feat: code support for bungee chains --- .env.example | 4 ++++ scripts/rpcConfig/constants/batcherSupportedChainSlug.ts | 2 ++ scripts/rpcConfig/constants/explorers.ts | 2 ++ scripts/rpcConfig/constants/icons.ts | 2 ++ scripts/rpcConfig/constants/rpc.ts | 2 ++ src/enums/chainId.ts | 2 ++ src/enums/chainSlug.ts | 2 ++ src/enums/chainSlugToHardhatChainName.ts | 2 ++ src/enums/chainSlugToId.ts | 2 ++ src/enums/chainSlugToKey.ts | 2 ++ src/enums/currency.ts | 1 + src/enums/ethLikeChains.ts | 2 ++ src/enums/hardhatChainName.ts | 2 ++ src/enums/hardhatChainNameToSlug.ts | 2 ++ src/enums/mainnetIds.ts | 2 ++ src/enums/native-tokens.ts | 1 + 16 files changed, 32 insertions(+) diff --git a/.env.example b/.env.example index afbaeb3c..d69edd46 100644 --- a/.env.example +++ b/.env.example @@ -95,3 +95,7 @@ NEOX_TESTNET_RPC=' ' NEOX_T4_TESTNET_RPC=' ' NEOX_RPC=' ' + +GNOSIS_RPC=' ' + +LINEA_RPC=' ' diff --git a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts index 732b2950..c71c7748 100644 --- a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts +++ b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts @@ -37,4 +37,6 @@ export const batcherSupportedChainSlugs = [ // ChainSlug.NEOX_TESTNET, ChainSlug.NEOX_T4_TESTNET, ChainSlug.NEOX, + ChainSlug.GNOSIS, + ChainSlug.LINEA, ]; diff --git a/scripts/rpcConfig/constants/explorers.ts b/scripts/rpcConfig/constants/explorers.ts index a5cb0087..a53b77c3 100644 --- a/scripts/rpcConfig/constants/explorers.ts +++ b/scripts/rpcConfig/constants/explorers.ts @@ -15,4 +15,6 @@ export const explorers = { [ChainSlug.NEOX_TESTNET]: "https://xt3scan.ngd.network/", [ChainSlug.NEOX_T4_TESTNET]: "https://xt4scan.ngd.network/", [ChainSlug.NEOX]: "https://xexplorer.neo.org", + [ChainSlug.GNOSIS]: "https://gnosisscan.io/", + [ChainSlug.LINEA]: "https://lineascan.build/", }; diff --git a/scripts/rpcConfig/constants/icons.ts b/scripts/rpcConfig/constants/icons.ts index bd97d8b1..3b4634e3 100644 --- a/scripts/rpcConfig/constants/icons.ts +++ b/scripts/rpcConfig/constants/icons.ts @@ -13,4 +13,6 @@ export const icons = { [ChainSlug.NEOX_TESTNET]: "", [ChainSlug.NEOX_T4_TESTNET]: "", [ChainSlug.NEOX]: "", + [ChainSlug.GNOSIS]: "", + [ChainSlug.LINEA]: "", }; diff --git a/scripts/rpcConfig/constants/rpc.ts b/scripts/rpcConfig/constants/rpc.ts index aa5ce508..dc0fbdb7 100644 --- a/scripts/rpcConfig/constants/rpc.ts +++ b/scripts/rpcConfig/constants/rpc.ts @@ -49,4 +49,6 @@ export const rpcs = { [ChainSlug.NEOX_TESTNET]: checkEnvValue("NEOX_TESTNET_RPC"), [ChainSlug.NEOX_T4_TESTNET]: checkEnvValue("NEOX_T4_TESTNET_RPC"), [ChainSlug.NEOX]: checkEnvValue("NEOX_RPC"), + [ChainSlug.GNOSIS]: checkEnvValue("GNOSIS_RPC"), + [ChainSlug.LINEA]: checkEnvValue("LINEA_RPC"), }; diff --git a/src/enums/chainId.ts b/src/enums/chainId.ts index 956c1dc7..048b8e64 100644 --- a/src/enums/chainId.ts +++ b/src/enums/chainId.ts @@ -46,4 +46,6 @@ export enum ChainId { NEOX_TESTNET = 12227331, NEOX_T4_TESTNET = 12227332, NEOX = 47763, + GNOSIS = 100, + LINEA = 59144, } diff --git a/src/enums/chainSlug.ts b/src/enums/chainSlug.ts index d21a7481..9b572f9d 100644 --- a/src/enums/chainSlug.ts +++ b/src/enums/chainSlug.ts @@ -48,4 +48,6 @@ export enum ChainSlug { NEOX_TESTNET = ChainId.NEOX_TESTNET, NEOX_T4_TESTNET = ChainId.NEOX_T4_TESTNET, NEOX = ChainId.NEOX, + GNOSIS = ChainId.GNOSIS, + LINEA = ChainId.LINEA, } diff --git a/src/enums/chainSlugToHardhatChainName.ts b/src/enums/chainSlugToHardhatChainName.ts index b25b95a9..8bcc9644 100644 --- a/src/enums/chainSlugToHardhatChainName.ts +++ b/src/enums/chainSlugToHardhatChainName.ts @@ -49,4 +49,6 @@ export const chainSlugToHardhatChainName = { [ChainSlug.NEOX_TESTNET]: [HardhatChainName.NEOX_TESTNET], [ChainSlug.NEOX_T4_TESTNET]: [HardhatChainName.NEOX_T4_TESTNET], [ChainSlug.NEOX]: [HardhatChainName.NEOX], + [ChainSlug.GNOSIS]: [HardhatChainName.GNOSIS], + [ChainSlug.LINEA]: [HardhatChainName.LINEA], }; diff --git a/src/enums/chainSlugToId.ts b/src/enums/chainSlugToId.ts index eb9ea908..191e882a 100644 --- a/src/enums/chainSlugToId.ts +++ b/src/enums/chainSlugToId.ts @@ -49,4 +49,6 @@ export const ChainSlugToId = { [ChainSlug.NEOX_TESTNET]: ChainId.NEOX_TESTNET, [ChainSlug.NEOX_T4_TESTNET]: ChainId.NEOX_T4_TESTNET, [ChainSlug.NEOX]: ChainId.NEOX, + [ChainSlug.GNOSIS]: ChainId.GNOSIS, + [ChainSlug.LINEA]: ChainId.LINEA, }; diff --git a/src/enums/chainSlugToKey.ts b/src/enums/chainSlugToKey.ts index 5a7ceab8..539f7a3a 100644 --- a/src/enums/chainSlugToKey.ts +++ b/src/enums/chainSlugToKey.ts @@ -49,4 +49,6 @@ export const ChainSlugToKey = { [ChainSlug.NEOX_TESTNET]: HardhatChainName.NEOX_TESTNET, [ChainSlug.NEOX_T4_TESTNET]: HardhatChainName.NEOX_T4_TESTNET, [ChainSlug.NEOX]: HardhatChainName.NEOX, + [ChainSlug.GNOSIS]: HardhatChainName.GNOSIS, + [ChainSlug.LINEA]: HardhatChainName.LINEA, }; diff --git a/src/enums/currency.ts b/src/enums/currency.ts index 1764dcef..53fcb17f 100644 --- a/src/enums/currency.ts +++ b/src/enums/currency.ts @@ -12,4 +12,5 @@ export const Currency = { [ChainSlug.NEOX_TESTNET]: NativeTokens["gas"], [ChainSlug.NEOX_T4_TESTNET]: NativeTokens["gas"], [ChainSlug.NEOX]: NativeTokens["gas"], + [ChainSlug.GNOSIS]: NativeTokens["dai"], }; diff --git a/src/enums/ethLikeChains.ts b/src/enums/ethLikeChains.ts index b31ad149..47b25fb8 100644 --- a/src/enums/ethLikeChains.ts +++ b/src/enums/ethLikeChains.ts @@ -19,4 +19,6 @@ export const ethLikeChains = [ ChainSlug.NEOX_TESTNET, ChainSlug.NEOX_T4_TESTNET, ChainSlug.NEOX, + ChainSlug.GNOSIS, + ChainSlug.LINEA, ]; diff --git a/src/enums/hardhatChainName.ts b/src/enums/hardhatChainName.ts index d2697847..47fbb2bb 100644 --- a/src/enums/hardhatChainName.ts +++ b/src/enums/hardhatChainName.ts @@ -47,4 +47,6 @@ export enum HardhatChainName { NEOX_TESTNET = "neox_testnet", NEOX_T4_TESTNET = "neox_t4_testnet", NEOX = "neox", + GNOSIS = "gnosis", + LINEA = "linea", } diff --git a/src/enums/hardhatChainNameToSlug.ts b/src/enums/hardhatChainNameToSlug.ts index a1721fde..6d499274 100644 --- a/src/enums/hardhatChainNameToSlug.ts +++ b/src/enums/hardhatChainNameToSlug.ts @@ -49,4 +49,6 @@ export const hardhatChainNameToSlug = { [HardhatChainName.NEOX_TESTNET]: ChainSlug.NEOX_TESTNET, [HardhatChainName.NEOX_T4_TESTNET]: ChainSlug.NEOX_T4_TESTNET, [HardhatChainName.NEOX]: ChainSlug.NEOX, + [HardhatChainName.GNOSIS]: ChainSlug.GNOSIS, + [HardhatChainName.LINEA]: ChainSlug.LINEA, }; diff --git a/src/enums/mainnetIds.ts b/src/enums/mainnetIds.ts index 0d8db821..37123c5e 100644 --- a/src/enums/mainnetIds.ts +++ b/src/enums/mainnetIds.ts @@ -22,4 +22,6 @@ export const MainnetIds: ChainSlug[] = [ ChainSlug.POLYNOMIAL, ChainSlug.SYNDR, ChainSlug.NEOX, + ChainSlug.GNOSIS, + ChainSlug.LINEA, ]; diff --git a/src/enums/native-tokens.ts b/src/enums/native-tokens.ts index a6d7f18e..f7db682e 100644 --- a/src/enums/native-tokens.ts +++ b/src/enums/native-tokens.ts @@ -8,4 +8,5 @@ export enum NativeTokens { "winr" = "winr-protocol", "no-token" = "no-token", "gas" = "gas", + "dai" = "dai", } From 08df4c796c4e0e835c9ee97ba689476a64338f17 Mon Sep 17 00:00:00 2001 From: arthcp Date: Mon, 26 Aug 2024 16:26:41 +0530 Subject: [PATCH 02/12] feat: mantle override fixes --- scripts/deploy/scripts/registerSwitchboard.ts | 19 +++++++++++--- scripts/deploy/scripts/roles.ts | 25 ++++++++++++++++--- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/scripts/deploy/scripts/registerSwitchboard.ts b/scripts/deploy/scripts/registerSwitchboard.ts index daba6380..d9cbbdf7 100644 --- a/scripts/deploy/scripts/registerSwitchboard.ts +++ b/scripts/deploy/scripts/registerSwitchboard.ts @@ -3,7 +3,7 @@ import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers"; import { createObj, getInstance } from "../utils"; import { ChainSlug, ChainSocketAddresses } from "../../../src"; -import { initialPacketCount, overrides } from "../config/config"; +import { initialPacketCount, overrides, socketOwner } from "../config/config"; export default async function registerSwitchboardForSibling( switchBoardAddress: string, @@ -25,9 +25,13 @@ export default async function registerSwitchboardForSibling( await getInstance("FastSwitchboard", switchBoardAddress) ).connect(signer); + // send overrides while reading capacitor to avoid errors on mantle chain + // some chains give balance error if gas price is used with from address as zero + // therefore override from address as well let capacitor = await socket.capacitors__( switchBoardAddress, - remoteChainSlug + remoteChainSlug, + { ...(await overrides(await signer.getChainId())), from: socketOwner } ); if (capacitor === constants.AddressZero) { @@ -49,10 +53,17 @@ export default async function registerSwitchboardForSibling( } // get capacitor and decapacitor for config - capacitor = await socket.capacitors__(switchBoardAddress, remoteChainSlug); + // send overrides while reading capacitor/decapacitor to avoid errors on mantle chain + // some chains give balance error if gas price is used with from address as zero + // therefore override from address as well + capacitor = await socket.capacitors__(switchBoardAddress, remoteChainSlug, { + ...(await overrides(await signer.getChainId())), + from: socketOwner, + }); const decapacitor = await socket.decapacitors__( switchBoardAddress, - remoteChainSlug + remoteChainSlug, + { ...(await overrides(await signer.getChainId())), from: socketOwner } ); config = setCapacitorPair( diff --git a/scripts/deploy/scripts/roles.ts b/scripts/deploy/scripts/roles.ts index 48d1dc5d..7d6b374c 100644 --- a/scripts/deploy/scripts/roles.ts +++ b/scripts/deploy/scripts/roles.ts @@ -18,7 +18,7 @@ import { import { getRoleHash, getChainRoleHash, getInstance } from "../utils"; import { Wallet, ethers } from "ethers"; import { getProviderFromChainSlug } from "../../constants"; -import { overrides } from "../config/config"; +import { overrides, socketOwner } from "../config/config"; import AccessControlExtendedABI from "@socket.tech/dl-core/artifacts/abi/AccessControlExtended.json"; let roleStatus: any = {}; @@ -247,9 +247,13 @@ const checkNativeSwitchboardRoles = async ({ await Promise.all( requiredRoles.map(async (role) => { if (filterRoles.length > 0 && !filterRoles.includes(role)) return; + // send overrides while reading role to avoid errors on mantle chain + // some chains give balance error if gas price is used with from address as zero + // therefore override from address as well let hasRole = await instance.callStatic["hasRole(bytes32,address)"]( getRoleHash(role), - userAddress + userAddress, + { ...(await overrides(chainSlug)), from: socketOwner } ); if (!roleStatus[chainSlug][pseudoContractName]["global"]) @@ -351,9 +355,15 @@ export const checkAndUpdateRoles = async ( requiredRoles.map(async (role) => { if (filterRoles.length > 0 && !filterRoles.includes(role)) return; + // send overrides while reading role to avoid errors on mantle chain + // some chains give balance error if gas price is used with from address as zero + // therefore override from address as well let hasRole = await instance.callStatic[ "hasRole(bytes32,address)" - ](getRoleHash(role), userAddress); + ](getRoleHash(role), userAddress, { + ...(await overrides(chainSlug)), + from: socketOwner, + }); if (isRoleChanged(hasRole, newRoleStatus)) { if (!roleStatus[chainSlug][contractName!]["global"]) { roleStatus[chainSlug][contractName!]["global"] = []; @@ -403,9 +413,16 @@ export const checkAndUpdateRoles = async ( requiredChainRoles.map(async (role) => { if (filterRoles.length > 0 && !filterRoles.includes(role)) return; + // send overrides while reading role to avoid errors on mantle chain + // some chains give balance error if gas price is used with from address as zero + // therefore override from address as well let hasRole = await instance.callStatic[ "hasRole(bytes32,address)" - ](getChainRoleHash(role, Number(siblingSlug)), userAddress); + ]( + getChainRoleHash(role, Number(siblingSlug)), + userAddress, + { ...(await overrides(chainSlug)), from: socketOwner } + ); if (isRoleChanged(hasRole, newRoleStatus)) { if ( From 966cb98a88bceb22f4f7734ce06b3ebaa28c74e9 Mon Sep 17 00:00:00 2001 From: arthcp Date: Mon, 26 Aug 2024 16:29:24 +0530 Subject: [PATCH 03/12] feat: configs --- chainConfig.json | 17 ++++++----------- scripts/constants/overrides.ts | 6 ++++++ scripts/deploy/config/config.ts | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/chainConfig.json b/chainConfig.json index f844a630..1a53f927 100644 --- a/chainConfig.json +++ b/chainConfig.json @@ -1,18 +1,13 @@ { "8453": { "roleOwners": { - "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", + "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9", "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5", "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14", "feeUpdaterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5" }, - "siblings": [1, 137, 42161, 10, 56, 34443], - "overrides": { - "type": 1, - "gasLimit": 3000000, - "gasPrice": 10000000 - } + "siblings": [1, 137, 42161, 10, 56, 34443] }, "31337": { "siblings": [], @@ -26,7 +21,7 @@ }, "34443": { "roleOwners": { - "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", + "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9", "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5", "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14", @@ -41,7 +36,7 @@ }, "60808": { "roleOwners": { - "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", + "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9", "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5", "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14", @@ -52,7 +47,7 @@ }, "444444": { "roleOwners": { - "ownerAddress": "0x78Deb9225c3F28D12922913Fec978e4dC90E1aa4", + "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9", "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5", "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14", @@ -63,7 +58,7 @@ }, "2863311531": { "roleOwners": { - "ownerAddress": "0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", + "ownerAddress": "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", "executorAddress": "0x42639d8fd154b72472e149a7d5ac13fa280303d9", "transmitterAddress": "0xfbc5ea2525bb827979e4c33b237cd47bcb8f81c5", "watcherAddress": "0x75ddddf61b8180d3837b7d8b98c062ca442e0e14", diff --git a/scripts/constants/overrides.ts b/scripts/constants/overrides.ts index eb14924e..64ad6d15 100644 --- a/scripts/constants/overrides.ts +++ b/scripts/constants/overrides.ts @@ -87,6 +87,12 @@ export const chainOverrides: { gasLimit: 1_000_000, gasPrice: 212_000_000_000, }, + [ChainSlug.GNOSIS]: { + gasLimit: 15_000_000, + }, + [ChainSlug.LINEA]: { + gasLimit: 10_000_000, + }, }; export const getOverrides = async ( diff --git a/scripts/deploy/config/config.ts b/scripts/deploy/config/config.ts index 7c50aef3..86ffd18c 100644 --- a/scripts/deploy/config/config.ts +++ b/scripts/deploy/config/config.ts @@ -73,7 +73,7 @@ export const chains: Array = [ ChainSlug.BLAST, ]; -export const executionManagerVersion = CORE_CONTRACTS.ExecutionManager; +export const executionManagerVersion = CORE_CONTRACTS.ExecutionManagerDF; export const sendTransaction = true; export const newRoleStatus = true; export const filterChains: number[] = chains; From af8f43e6beb24277c1cde78ad1c1e2153113c3f2 Mon Sep 17 00:00:00 2001 From: arthcp Date: Mon, 26 Aug 2024 16:29:44 +0530 Subject: [PATCH 04/12] feat: bungee chains deployment --- deployments/prod_addresses.json | 398 +++++++++++++++++++++++++++++ deployments/prod_verification.json | 250 ++++++++++++++++++ 2 files changed, 648 insertions(+) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 930fb5d6..65a78f7c 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -412,6 +412,18 @@ "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" } }, + "100": { + "FAST": { + "capacitor": "0xfa97E8A1E8c8d2245FD6C466f15CA1942f2CBA33", + "decapacitor": "0x7D924CFcdb61798c2b47b607b0Bb360205Daf58D", + "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" + }, + "OPTIMISTIC": { + "capacitor": "0x32f83594Cc43441671954FD8328C0E76Fd25560A", + "decapacitor": "0xCcB693Ff4b9496EB6997fbCE9d6d21b642a838ba", + "switchboard": "0xb113d72896d4874111AF00c9499b5a64e9f1e3f4" + } + }, "137": { "OPTIMISTIC": { "capacitor": "0xF200600a9cB60Da2F0648C1203178b453c1B92B8", @@ -556,6 +568,18 @@ "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" } }, + "59144": { + "FAST": { + "capacitor": "0x77A03Fe510B4e8fc8C242a9065e611851eaf018B", + "decapacitor": "0xDF347061F9Bde0fcE93e296615F9066be775eAC7", + "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" + }, + "OPTIMISTIC": { + "capacitor": "0xE61a327Ebc876f48911208a7f933782125650a3d", + "decapacitor": "0xfa016a3F7866A6E7773a3Dc5C6d6E16B41B23d38", + "switchboard": "0xb113d72896d4874111AF00c9499b5a64e9f1e3f4" + } + }, "60808": { "FAST": { "capacitor": "0x4C17cA11eA42348f5f0186A75ED292B542FC0c80", @@ -648,6 +672,18 @@ "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" } }, + "100": { + "FAST": { + "capacitor": "0xff43cb8DA5A39E0dF9f2EA9ef47f349851d2b7Eb", + "decapacitor": "0xa7d090874D7CFBE12b49da49Ed81DE6f305aB06d", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x073a0d00Ee0dbc8321b27F195f38C686c84AF4bE", + "decapacitor": "0x018fB62d8a9e09fFa6dc2A5FE9f9e58b4A011594", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } + }, "137": { "OPTIMISTIC": { "capacitor": "0x2C570EB8450a22d22fC1935418649f5760bfD35b", @@ -696,6 +732,18 @@ "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" } }, + "5000": { + "FAST": { + "capacitor": "0xB09D5eA0c14e91488C4C2846B71E10Ce8e5DdaB3", + "decapacitor": "0xe191d44639893A68c719ac028aA7986107fC07CE", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0xe8BD286730164609945dA281fE573A41745170fD", + "decapacitor": "0xDa48Cbe8662dA91648Ee4e5C3DeA4d227c89dDD3", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } + }, "8453": { "FAST": { "capacitor": "0x7C3b20C738cE4a86483720C1c1894819d59615dd", @@ -719,6 +767,18 @@ "decapacitor": "0x8132AB5E0fb2836D79FA624c352412593924B7C5", "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" } + }, + "59144": { + "FAST": { + "capacitor": "0x362E547fB944a08a4ce4493be5C13047f2C217df", + "decapacitor": "0xfbF3E7D622744a264e20653539D877619ceF31FA", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x522D344b44b25604a46a105cED044B6a7E3DaE31", + "decapacitor": "0x2D4CA2C96b8342fA570644C8cdD1024404344F9a", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } } }, "OptimisticSwitchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25", @@ -759,6 +819,109 @@ } } }, + "100": { + "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "Hasher": "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "CapacitorFactory": "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "Socket": "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "ExecutionManagerDF": "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "TransmitManager": "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "FastSwitchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "OptimisticSwitchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "SocketBatcher": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "Counter": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "SocketSimulator": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SimulatorUtils": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "SwitchboardSimulator": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", + "startBlock": 35612300, + "integrations": { + "10": { + "FAST": { + "capacitor": "0xe73B81e0582110A3e1e84eD48986CF8365C67F5c", + "decapacitor": "0x2e544869aD700F70E47597Aa065e562deAFcA241", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xf0C835C640715Dc5363447bF7233078991889fC8", + "decapacitor": "0x2eF42ec2c355E6E5D296Ef888aBB7904386c0B94", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "56": { + "FAST": { + "capacitor": "0xcf4136C6537D6e4F2b17a0035663dCDD3C08F746", + "decapacitor": "0x949c6C52A539BAD93D2a31EF4EB923fd8a09c660", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x938DbeA077a5deB6a7680EBdCC85bB4bA216Cb52", + "decapacitor": "0x018FD84FFcaD3401C3465dFA7E8017218Fc55Dc9", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "137": { + "FAST": { + "capacitor": "0x19405671F9F14a81a1112ac890E85E321a79426D", + "decapacitor": "0xFE82774f00Ce859Aad948e71D739C417Ae85B1fd", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xF6f648CF8164Dd7Ec04C0dba8fc91e7b66A154C0", + "decapacitor": "0xc014b5C95B790b35acbeE3E4D7807Bd556FddebE", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "5000": { + "FAST": { + "capacitor": "0xCF029dbbFCeBf82C981B3Ffe78CCB38bbC57a6FC", + "decapacitor": "0xe9BE8937aDf6A92CBF464b2904097c71E480f925", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x5924cE286850adEC8ddC9f64E8e45900006D76dB", + "decapacitor": "0x2C806f22CA1CA75Fe8D7D6cEd53B199f23D43fCc", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "8453": { + "FAST": { + "capacitor": "0xcacBE8Caaa88003544BA8d6Ebf63af256Cba9b93", + "decapacitor": "0x68e39A99221087D3585fA4493911A60683AbE32d", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x441432a93E38BdB82f71684359E59AE49c0D9a79", + "decapacitor": "0x9D44AF8a4a0fD8D86Aaa584394845a86B31007f3", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "42161": { + "FAST": { + "capacitor": "0xfDab5AD9dD96deb42f093510641a325dB65cAD10", + "decapacitor": "0xE16b17BC461C3EDF6c351c1a27FB42851F085D19", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x9f72CAEAccc292977A0c134693AB5F63fe513202", + "decapacitor": "0x86917a199668155A7Aa1dA833499E5646c00d9dA", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "59144": { + "FAST": { + "capacitor": "0xdF24b92Ad07D39344B1abA69a8acbb5DEa5BA08a", + "decapacitor": "0x03bCf41D18Cd8AA7D4b13DCc8574150329e6D130", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xb5B1514a94584864e4b76eD0ea6C70363A8F8e52", + "decapacitor": "0x8946Ccfc19c4F7b230cA9D627aFF83A183c7fD9a", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + } + } + }, "137": { "SignatureVerifier": "0x2F04a8f11691Db9e0EE08BF44a7712aF8273720D", "Hasher": "0x8AFacb9b98d01cd8D1FD45ae1d9A8e4F12C7673e", @@ -808,6 +971,18 @@ "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" } }, + "100": { + "FAST": { + "capacitor": "0x4ca9Cb6E39E9fEa1C56ADED72f74F1e1D65c6945", + "decapacitor": "0x95D3468db1c312EA2fD8c14A024C0D6c46B55730", + "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" + }, + "OPTIMISTIC": { + "capacitor": "0xc8565B06320debFE9d9d58ad6B0a9497e7276BaD", + "decapacitor": "0x9D83ea9FEf84b0c23E049794f66C4a74fcAF00C5", + "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" + } + }, "404": { "FAST": { "capacitor": "0xB38f858237bc170C39334634E7d85900dBe57200", @@ -856,6 +1031,18 @@ "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" } }, + "5000": { + "FAST": { + "capacitor": "0x16E9A398baCFFAb459FBC3a0A110696D26BD841C", + "decapacitor": "0x03c081a505D728cf5f8a8ee1Bd3673Db245706eB", + "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" + }, + "OPTIMISTIC": { + "capacitor": "0xA14Becc12c09d54694f86f08849eb2A42641e87d", + "decapacitor": "0xD879dB60A4feF4887B18e4997622FbA8dC349F04", + "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" + } + }, "8453": { "FAST": { "capacitor": "0x053366f64580d2b3DA9eaA676f5C532046aD42bC", @@ -892,6 +1079,18 @@ "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" } }, + "59144": { + "FAST": { + "capacitor": "0xBaFD5672Ef6298bf262e13C1B68B3aBb60a9b567", + "decapacitor": "0x31c0D1A0ca3327b876B781B4d799D781F1321cAE", + "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" + }, + "OPTIMISTIC": { + "capacitor": "0x0b1671e956e3fbE9f626E8A279eccee7620C3926", + "decapacitor": "0x373758ADE9f0d710e6723e50F696895b75aFB03F", + "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" + } + }, "81457": { "FAST": { "capacitor": "0x8a0f43439b49F39cA4bBF63B6eBB117aF1Ed7566", @@ -1870,6 +2069,42 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } }, + "56": { + "FAST": { + "capacitor": "0xa9D32248962b8675438d488bbb28974081Fd4779", + "decapacitor": "0x298a5bef4052B15E32d66D27Bfe7Fd3677f1aEf1", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x633a828F7EbB3c30bd0fcD80E127d23e45b9CABb", + "decapacitor": "0x1CD4bc16F197FBe5AF493066cdea8095A1Fc46D1", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, + "100": { + "FAST": { + "capacitor": "0x8f13cFB9F90703318F03B90e1D53891e51Ba4cbE", + "decapacitor": "0x8016673CB8A69886935533331183E5040f503C5D", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0xD565E419f066fF70685a57160a673D614E2f885e", + "decapacitor": "0x85296450abCDb2D50DBfd6Dcb198ABC2A738497E", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, + "137": { + "FAST": { + "capacitor": "0xAe6b45e525e2cC18B1B613AA9BDa5E5C289B1b5a", + "decapacitor": "0xD864ba930F302F49EfA9142da6b9247A1e2b3cC4", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x33284bd6eaddB0558a2E3C77Be076bD359c72828", + "decapacitor": "0x4eA1FA330240d0fb19cBE66b6A6eecE2D32D73f9", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, "8453": { "FAST": { "capacitor": "0x8746E279A2Bb21e12e17d0121fb1Bbc57234c0b2", @@ -1893,6 +2128,18 @@ "decapacitor": "0x8757Fd4c8CEEFB59ed4F69d841ca6Fa0C2744f0D", "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } + }, + "59144": { + "FAST": { + "capacitor": "0x8DE90E501780eF595231162c5B9d90C782B2E16d", + "decapacitor": "0x2A4F9E51B2380903df4B5905003d6F8967021cdA", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x0cefaEe9453F939b43eD88EF659a54bE4c147106", + "decapacitor": "0x56DB02335CA50C4eDf074D4f819c37310f6F2cFA", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } } }, "SocketSimulator": "0xb07B3CfB1F0AaB839cbf84D2FB9442DebDDbDd2a", @@ -2085,6 +2332,18 @@ "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" } }, + "100": { + "FAST": { + "capacitor": "0xC102662CCA94f05138DD06acde5A2b8a94dF83b2", + "decapacitor": "0x3f9e360b941fc19576Fa5a9022AE007E3807E616", + "switchboard": "0x957301825Dc21d4A92919C9E72dC9E6C6a29e7f8" + }, + "OPTIMISTIC": { + "capacitor": "0x73065a524592473cd02316b1F66B3cB97190c5d1", + "decapacitor": "0xA4DE8C4F55870a45E8d52CDfe516E509dC035bB8", + "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" + } + }, "137": { "FAST": { "capacitor": "0x8470258083De192083c4EcCea4BfE80455C7f6c5", @@ -2217,6 +2476,18 @@ "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" } }, + "59144": { + "FAST": { + "capacitor": "0x24C3c9F85562e450cE0C70528484d7bBE1090688", + "decapacitor": "0x877E2D38ecf05514D62EDDB67f20Da4Ddf3838fe", + "switchboard": "0x957301825Dc21d4A92919C9E72dC9E6C6a29e7f8" + }, + "OPTIMISTIC": { + "capacitor": "0xC457207054acaA1dc956EA92F8180769C823444C", + "decapacitor": "0x6AcC0aA5Fc856ccA7479406497c886a881ADf998", + "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" + } + }, "81457": { "FAST": { "capacitor": "0xaAe7643D0C9AAD0a3A2Ac8932cf7c0d260600B79", @@ -2414,6 +2685,18 @@ "switchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f" } }, + "100": { + "FAST": { + "capacitor": "0x73f59f3E5C0cB15C41d8D96544242E279a6a2eFA", + "decapacitor": "0xfc1414a1e068695e55cEAD7bd9ba9d8189AdbE65", + "switchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f" + }, + "OPTIMISTIC": { + "capacitor": "0x0C91065f560A5C7047fFb65cC58d4Dc2D3C8A09c", + "decapacitor": "0xD05198d75e538B546950F13aFC6AAA58bd96C5C1", + "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" + } + }, "137": { "OPTIMISTIC": { "capacitor": "0x923FbD055Fdf3612Fa0bCeCda04b2F87B5689063", @@ -2546,6 +2829,18 @@ "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" } }, + "59144": { + "FAST": { + "capacitor": "0x2CecC589b7dCCc78600Bbd49D05C758b54bF5e6C", + "decapacitor": "0xc1Ddac8D7f2a8c05De075D81C55049A43f3A4bEF", + "switchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f" + }, + "OPTIMISTIC": { + "capacitor": "0x5897fecDCb13AE990c72653B650bce9E1b9a7817", + "decapacitor": "0xC072ac056bB2f94a890255fAF2b53cFd09b72312", + "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" + } + }, "60808": { "FAST": { "capacitor": "0xA4C93dF2aaDc02b258B6a7536A27cb594e3DE0Fb", @@ -2638,6 +2933,109 @@ }, "ExecutionManagerDF": "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6" }, + "59144": { + "SignatureVerifier": "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", + "Hasher": "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", + "CapacitorFactory": "0xB152AC07a21966981fef9341DA3146f8e08e22bC", + "Socket": "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + "ExecutionManagerDF": "0x10eC45De78BDfE26Cefb953F604E18BF70904FBa", + "TransmitManager": "0xB0a98605AcEDc6C9242B32516a0d823A2712F1A3", + "FastSwitchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18", + "OptimisticSwitchboard": "0x332901149A390D334498008449089f05fa273C3B", + "SocketBatcher": "0x8aC3fc1BCd767Fd7E98710bfC173AbCeDfAE0Ee5", + "Counter": "0xcF63F80d1ab518fcc4DFA5849d71B624fF4bF67D", + "SocketSimulator": "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", + "SimulatorUtils": "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6", + "SwitchboardSimulator": "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + "CapacitorSimulator": "0xd2BF218Fe89d528781684640F576073C99388E92", + "startBlock": 8465306, + "integrations": { + "10": { + "FAST": { + "capacitor": "0x300786AAd56B4f0F91882C92375ecDC58b5725d3", + "decapacitor": "0x717B9d554bFD4a49212056420A4B59f3fA93f644", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x41e2cEc22c53f742d79Fb3155FdeAa5ff057e9c9", + "decapacitor": "0x64b56F17F1d462c11ae6a8B4759D9ABc9cFED318", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "56": { + "FAST": { + "capacitor": "0xcAccbe801Ffd15Af6E5B529a17D3526Ab0EDd9f3", + "decapacitor": "0x5A6b4122f501672e64f19Fc8c730486e48A95eB0", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x2fdEC2f15Ea2F22B7538Fb6F4F5140c0924f1704", + "decapacitor": "0x3411E96ed6999e36096F930699Fb172FC1BCE266", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "100": { + "FAST": { + "capacitor": "0x51945F636d02663CB5bEEB9d84eb96d10AeC549e", + "decapacitor": "0x46d9190D64798EcBd3A2e7D2354e77E9D90c0946", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0xf4FA9E75D299C0aAbE6112489EF3c1D5E4C66775", + "decapacitor": "0x83BA3E0A1A5E3c83969AfFE261ec04326FfB11eD", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "137": { + "FAST": { + "capacitor": "0xa6191E8c7659161C0745E67e8Ba445d88331b8C0", + "decapacitor": "0xacab5ab3E355539faAbA006edEF5c7B8085114c2", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x3E35Da4EBD81c4601FC0e36Fb1660d99D19fcDDa", + "decapacitor": "0x34F7C25D855a57f033446058f2ECF874acEd6c61", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "5000": { + "FAST": { + "capacitor": "0x6b033a9c871e379D128cc94CB1b7ca56aB19D1F3", + "decapacitor": "0x4e557974fcbE44df80eD2e22bb01C1360E0250a2", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0xaE6635D819Da7aed5E2abFb91b58BCCd83AA953e", + "decapacitor": "0x151ad82F10B61f9Da5244ab1B091D6A422Ba7F4C", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "8453": { + "FAST": { + "capacitor": "0x24d950B011437750634D1e63C34dcA8dC0D6B7c4", + "decapacitor": "0xCF47A27cb68F284Ef9eC40fECbA019895720b350", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x8d48a4ee1d9bF0d077a18d41534A03bf1d04660a", + "decapacitor": "0x9fFAf668A0c79F2A2c24162B01EBDbE2087086bC", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, + "42161": { + "FAST": { + "capacitor": "0x16f0d8820f48864Da7ddA029BB219594F0dad6B9", + "decapacitor": "0x1f71Dac42a05d60ED0aAc377a2c7b330585D91E9", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x29D6C4964E81ae620B0781B4A0A0Ccd032497304", + "decapacitor": "0x60B458FD39a4b75eD21DDeC1a352B58e6363c2e1", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + } + } + }, "60808": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", "Hasher": "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index f33d2e54..576ad9da 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -536,6 +536,131 @@ ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] ] ], + "100": [ + [ + "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + 100, + 1000, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 100 + ] + ], + [ + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 100, + 100, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "IMLI" + ] + ], + [ + "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "Counter", + "contracts/examples/Counter.sol", + ["0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE"] + ], + [ + "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "SocketBatcher", + "contracts/socket/SocketBatcher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "OptimisticSwitchboard", + "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + 100, + 7200, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "FastSwitchboard", + "contracts/switchboard/default-switchboards/FastSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + 100, + 7200, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "TransmitManager", + "contracts/TransmitManager.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 100, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 100, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "Socket", + "contracts/socket/Socket.sol", + [ + 100, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "IMLI" + ] + ], + [ + "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] + ], + [ + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "Hasher", + "contracts/utils/Hasher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "SignatureVerifier", + "contracts/utils/SignatureVerifier.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ] + ], "137": [ [ "0x3b103Ada40478B169095063fC4bABa667f20BA45", @@ -4040,6 +4165,131 @@ ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] ] ], + "59144": [ + [ + "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", + 59144, + 1000, + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" + ] + ], + [ + "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 59144 + ] + ], + [ + "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 59144, + 59144, + "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", + "IMLI" + ] + ], + [ + "0xcF63F80d1ab518fcc4DFA5849d71B624fF4bF67D", + "Counter", + "contracts/examples/Counter.sol", + ["0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4"] + ], + [ + "0x8aC3fc1BCd767Fd7E98710bfC173AbCeDfAE0Ee5", + "SocketBatcher", + "contracts/socket/SocketBatcher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0x332901149A390D334498008449089f05fa273C3B", + "OptimisticSwitchboard", + "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + 59144, + 7200, + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" + ] + ], + [ + "0x497D0FA570c128830a3aA3C06582a94af2330A18", + "FastSwitchboard", + "contracts/switchboard/default-switchboards/FastSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + 59144, + 7200, + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" + ] + ], + [ + "0xB0a98605AcEDc6C9242B32516a0d823A2712F1A3", + "TransmitManager", + "contracts/TransmitManager.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 59144, + "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" + ] + ], + [ + "0x10eC45De78BDfE26Cefb953F604E18BF70904FBa", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 59144, + "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" + ] + ], + [ + "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", + "Socket", + "contracts/socket/Socket.sol", + [ + 59144, + "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", + "0xB152AC07a21966981fef9341DA3146f8e08e22bC", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "IMLI" + ] + ], + [ + "0xB152AC07a21966981fef9341DA3146f8e08e22bC", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] + ], + [ + "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", + "Hasher", + "contracts/utils/Hasher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", + "SignatureVerifier", + "contracts/utils/SignatureVerifier.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ] + ], "60808": [ [ "0x040993fbF458b95871Cd2D73Ee2E09F4AF6d56bB", From c708e4abd724c83ef8c86a7f1c914714331083b4 Mon Sep 17 00:00:00 2001 From: arthcp Date: Mon, 26 Aug 2024 16:30:10 +0530 Subject: [PATCH 05/12] feat: enable kinto df --- scripts/rpcConfig/constants/disabledDFFeeChains.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rpcConfig/constants/disabledDFFeeChains.ts b/scripts/rpcConfig/constants/disabledDFFeeChains.ts index d42cda06..84f6e58d 100644 --- a/scripts/rpcConfig/constants/disabledDFFeeChains.ts +++ b/scripts/rpcConfig/constants/disabledDFFeeChains.ts @@ -12,7 +12,7 @@ export const disabledDFFeeChains = [ // ChainSlug.HOOK, ChainSlug.REYA, ChainSlug.BASE, - ChainSlug.KINTO, + // ChainSlug.KINTO, // ChainSlug.WINR, ChainSlug.BLAST, // ChainSlug.POLYNOMIAL, From 28e27dff3712c60fd5bcdd2eb729907b151ae1cb Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 29 Aug 2024 16:23:17 +0530 Subject: [PATCH 06/12] feat: gnosis linea verify --- deployments/prod_verification.json | 210 ----------------------------- hardhat.config.ts | 20 +++ 2 files changed, 20 insertions(+), 210 deletions(-) diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index 576ad9da..b4f78014 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -537,29 +537,6 @@ ] ], "100": [ - [ - "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", - "SwitchboardSimulator", - "contracts/mocks/fee-updater/SwitchboardSimulator.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", - 100, - 1000, - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" - ] - ], - [ - "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", - "SimulatorUtils", - "contracts/mocks/fee-updater/SimulatorUtils.sol", - [ - "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 100 - ] - ], [ "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", "SocketSimulator", @@ -572,93 +549,11 @@ "IMLI" ] ], - [ - "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", - "Counter", - "contracts/examples/Counter.sol", - ["0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE"] - ], - [ - "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", - "SocketBatcher", - "contracts/socket/SocketBatcher.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] - ], - [ - "0x0CC93650bF4D98237628DACf87f94E443956D8dF", - "OptimisticSwitchboard", - "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", - 100, - 7200, - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" - ] - ], - [ - "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", - "FastSwitchboard", - "contracts/switchboard/default-switchboards/FastSwitchboard.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", - 100, - 7200, - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" - ] - ], - [ - "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", - "TransmitManager", - "contracts/TransmitManager.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 100, - "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" - ] - ], - [ - "0x1CAdCd88fC148D3966eDe75D029937C886f66009", - "ExecutionManagerDF", - "contracts/ExecutionManagerDF.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 100, - "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" - ] - ], - [ - "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", - "Socket", - "contracts/socket/Socket.sol", - [ - 100, - "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", - "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "IMLI" - ] - ], [ "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", "CapacitorFactory", "contracts/CapacitorFactory.sol", ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] - ], - [ - "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", - "Hasher", - "contracts/utils/Hasher.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] - ], - [ - "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", - "SignatureVerifier", - "contracts/utils/SignatureVerifier.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] ] ], "137": [ @@ -4166,29 +4061,6 @@ ] ], "59144": [ - [ - "0xf4B9Cddc9d326F6e01A1A61b8eF3Df44F1E08449", - "SwitchboardSimulator", - "contracts/mocks/fee-updater/SwitchboardSimulator.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", - 59144, - 1000, - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" - ] - ], - [ - "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6", - "SimulatorUtils", - "contracts/mocks/fee-updater/SimulatorUtils.sol", - [ - "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 59144 - ] - ], [ "0x58f1693e84B80799B85106c13fb759DB7C5EF35D", "SocketSimulator", @@ -4201,93 +4073,11 @@ "IMLI" ] ], - [ - "0xcF63F80d1ab518fcc4DFA5849d71B624fF4bF67D", - "Counter", - "contracts/examples/Counter.sol", - ["0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4"] - ], - [ - "0x8aC3fc1BCd767Fd7E98710bfC173AbCeDfAE0Ee5", - "SocketBatcher", - "contracts/socket/SocketBatcher.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] - ], - [ - "0x332901149A390D334498008449089f05fa273C3B", - "OptimisticSwitchboard", - "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", - 59144, - 7200, - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" - ] - ], - [ - "0x497D0FA570c128830a3aA3C06582a94af2330A18", - "FastSwitchboard", - "contracts/switchboard/default-switchboards/FastSwitchboard.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", - 59144, - 7200, - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" - ] - ], - [ - "0xB0a98605AcEDc6C9242B32516a0d823A2712F1A3", - "TransmitManager", - "contracts/TransmitManager.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 59144, - "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" - ] - ], - [ - "0x10eC45De78BDfE26Cefb953F604E18BF70904FBa", - "ExecutionManagerDF", - "contracts/ExecutionManagerDF.sol", - [ - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - 59144, - "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7" - ] - ], - [ - "0x134633394c8Cef32a671B6Fed5e99b4B6466f4e4", - "Socket", - "contracts/socket/Socket.sol", - [ - 59144, - "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", - "0xB152AC07a21966981fef9341DA3146f8e08e22bC", - "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", - "IMLI" - ] - ], [ "0xB152AC07a21966981fef9341DA3146f8e08e22bC", "CapacitorFactory", "contracts/CapacitorFactory.sol", ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] - ], - [ - "0xcd620187f4846ba5a42ab41270aC550467dc9FbB", - "Hasher", - "contracts/utils/Hasher.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] - ], - [ - "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", - "SignatureVerifier", - "contracts/utils/SignatureVerifier.sol", - ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] ] ], "60808": [ diff --git a/hardhat.config.ts b/hardhat.config.ts index a725f5c1..f21b13ec 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -114,6 +114,8 @@ if (isProduction) { [HardhatChainName.SYNDR]: getChainConfig(ChainSlug.SYNDR), [HardhatChainName.BLAST]: getChainConfig(ChainSlug.BLAST), [HardhatChainName.NEOX_TESTNET]: getChainConfig(ChainSlug.NEOX_TESTNET), + [HardhatChainName.GNOSIS]: getChainConfig(ChainSlug.GNOSIS), + [HardhatChainName.LINEA]: getChainConfig(ChainSlug.LINEA), }; } @@ -162,6 +164,8 @@ const config: HardhatUserConfig = { syndr: "none", blast: process.env.BLASTSCAN_API_KEY || "", neox_testnet: "none", + gnosis: process.env.GNOSISSCAN_API_KEY || "", + linea: process.env.LINEASCAN_API_KEY || "", }, customChains: [ { @@ -268,6 +272,22 @@ const config: HardhatUserConfig = { browserURL: "https://xt3scan.ngd.network", }, }, + { + network: "gnosis", + chainId: ChainId.GNOSIS, + urls: { + apiURL: "https://api.gnosisscan.io/api", + browserURL: "https://gnosisscan.io", + }, + }, + { + network: "linea", + chainId: ChainId.LINEA, + urls: { + apiURL: "https://api.lineascan.build/api", + browserURL: "https://lineascan.build", + }, + }, ], }, networks: { From 9eb497a2157e73dd6f5720d20d82c06572679aab Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 29 Aug 2024 16:23:47 +0530 Subject: [PATCH 07/12] feat: linea finality and version bumps --- package.json | 2 +- scripts/rpcConfig/constants/finality.ts | 5 +++++ scripts/rpcConfig/constants/version.ts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1f9017ba..49945f9f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@socket.tech/dl-core", "license": "UNLICENSED", - "version": "2.23.0", + "version": "2.25.0", "description": "Smart contracts for socket data layer.", "main": "./dist/src/index.js", "types": "./dist/src/index.d.ts", diff --git a/scripts/rpcConfig/constants/finality.ts b/scripts/rpcConfig/constants/finality.ts index 3ac16e02..b03a03fd 100644 --- a/scripts/rpcConfig/constants/finality.ts +++ b/scripts/rpcConfig/constants/finality.ts @@ -31,4 +31,9 @@ export const finalityOverrides: { [FinalityBucket.medium]: 10, [FinalityBucket.slow]: 100, }, + [ChainSlug.LINEA]: { + [FinalityBucket.fast]: 1, + [FinalityBucket.medium]: 10, + [FinalityBucket.slow]: 100, + }, }; diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts index 60b25d98..68b09213 100644 --- 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.43", + [DeploymentMode.PROD]: "1.0.47", }; From 70a5535d3268487a3dcd95cb19627db84d74fcaa Mon Sep 17 00:00:00 2001 From: arthcp Date: Tue, 3 Sep 2024 10:22:06 +0400 Subject: [PATCH 08/12] feat: change override logic and add default 5% multiplier --- scripts/constants/overrides.ts | 86 ++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/scripts/constants/overrides.ts b/scripts/constants/overrides.ts index 64ad6d15..c61122ec 100644 --- a/scripts/constants/overrides.ts +++ b/scripts/constants/overrides.ts @@ -1,14 +1,22 @@ import { ChainSlug } from "../../src/enums/chainSlug"; -import { BigNumber, providers } from "ethers"; +import { providers } from "ethers"; const defaultType = 0; +const DEFAULT_GAS_PRICE_MULTIPLIER = 1.05; +type ChainOverride = { + type?: number; + gasLimit?: number; + gasPrice?: number; + gasPriceMultiplier?: number; +}; + +// Gas price calculation priority: +// 1. Use `gasPrice` if provided in chainOverrides +// 2. If not, calculate using `gasPriceMultiplier` from chainOverrides +// 3. If neither is provided, use DEFAULT_GAS_PRICE_MULTIPLIER export const chainOverrides: { - [chainSlug in ChainSlug]?: { - type?: number; - gasLimit?: number; - gasPrice?: number; - }; + [chainSlug in ChainSlug]?: ChainOverride; } = { [ChainSlug.ARBITRUM_SEPOLIA]: { type: 1, @@ -20,16 +28,22 @@ export const chainOverrides: { }, [ChainSlug.MAINNET]: { gasLimit: 6_000_000, - // gasPrice: 5_000_000_000, // calculate in real time + gasPriceMultiplier: 1.25, }, [ChainSlug.POLYGON_MAINNET]: { - // gasPrice: 50_000_000_000, // calculate in real time + gasPriceMultiplier: 2, + }, + [ChainSlug.ZKEVM]: { + gasPriceMultiplier: 1.3, + }, + [ChainSlug.BASE]: { + gasPriceMultiplier: 2, }, [ChainSlug.SEPOLIA]: { type: 1, gasLimit: 2_000_000, - // gasPrice: 50_000_000_000, // calculate in real time + gasPriceMultiplier: 1.5, }, [ChainSlug.AEVO_TESTNET]: { type: 2, @@ -93,39 +107,41 @@ export const chainOverrides: { [ChainSlug.LINEA]: { gasLimit: 10_000_000, }, + [ChainSlug.AVALANCHE]: { + gasLimit: 10_000_000, + }, }; +/** + * Get transaction overrides for a specific chain + * + * Gas price calculation priority: + * 1. Use `gasPrice` from chainOverrides if provided + * 2. If not, calculate based on the current network gas price: + * a. Use `gasPriceMultiplier` from chainOverrides if provided + * b. If not, use DEFAULT_GAS_PRICE_MULTIPLIER + * + * @param chainSlug - The chain identifier + * @param provider - The network provider + * @returns An object with gasLimit, gasPrice, and transaction type + */ export const getOverrides = async ( chainSlug: ChainSlug, provider: providers.StaticJsonRpcProvider ) => { - let overrides = chainOverrides[chainSlug]; - let gasPrice = overrides?.gasPrice; - let gasLimit = overrides?.gasLimit; - let type = overrides?.type; - if (!gasPrice) gasPrice = (await getGasPrice(chainSlug, provider)).toNumber(); - if (type == undefined) type = defaultType; - // if gas limit is undefined, ethers will calcuate it automatically. If want to override, - // add in the overrides object. Dont set a default value - return { gasLimit, gasPrice, type }; -}; + const overrides = chainOverrides[chainSlug] || {}; + const { gasLimit, type = defaultType } = overrides; -export const getGasPrice = async ( - chainSlug: ChainSlug, - provider: providers.StaticJsonRpcProvider -): Promise => { - let gasPrice = await provider.getGasPrice(); - - if (chainSlug === ChainSlug.POLYGON_MAINNET) { - return gasPrice.mul(BigNumber.from(115)).div(BigNumber.from(100)); + let gasPrice = overrides.gasPrice; + if (!gasPrice) { + const baseGasPrice = await provider.getGasPrice(); + const multiplier = + overrides.gasPriceMultiplier || DEFAULT_GAS_PRICE_MULTIPLIER; + gasPrice = baseGasPrice + .mul(Math.round(multiplier * 1000)) + .div(1000) + .toNumber(); } - if ([ChainSlug.MAINNET].includes(chainSlug as ChainSlug)) { - return gasPrice.mul(BigNumber.from(105)).div(BigNumber.from(100)); - } - - if ([ChainSlug.SEPOLIA].includes(chainSlug as ChainSlug)) { - return gasPrice.mul(BigNumber.from(150)).div(BigNumber.from(100)); - } - return gasPrice; + return { gasLimit, gasPrice, type }; }; From 8c6b7642a3e1b9c7e34468cc29a489eba2711777 Mon Sep 17 00:00:00 2001 From: arthcp Date: Tue, 3 Sep 2024 14:29:11 +0400 Subject: [PATCH 09/12] feat: bungee chains --- .env.example | 6 +- deployments/prod_addresses.json | 542 ++++++++++++++++++ hardhat.config.ts | 1 - package.json | 2 +- .../constants/batcherSupportedChainSlug.ts | 2 + scripts/rpcConfig/constants/explorers.ts | 2 + scripts/rpcConfig/constants/icons.ts | 2 + scripts/rpcConfig/constants/rpc.ts | 2 + scripts/rpcConfig/constants/version.ts | 2 +- src/enums/chainId.ts | 3 +- src/enums/chainSlug.ts | 3 +- src/enums/chainSlugToHardhatChainName.ts | 3 +- src/enums/chainSlugToId.ts | 3 +- src/enums/chainSlugToKey.ts | 3 +- src/enums/currency.ts | 1 + src/enums/ethLikeChains.ts | 2 + src/enums/hardhatChainName.ts | 4 +- src/enums/hardhatChainNameToSlug.ts | 3 +- src/enums/mainnetIds.ts | 2 + src/enums/native-tokens.ts | 1 + 20 files changed, 576 insertions(+), 13 deletions(-) diff --git a/.env.example b/.env.example index d69edd46..a7ca575d 100644 --- a/.env.example +++ b/.env.example @@ -42,8 +42,6 @@ OPTIMISM_SEPOLIA_RPC='' POLYGON_RPC='https://rpc.ankr.com/polygon' POLYGON_MUMBAI_RPC='https://matic-mumbai.chainstacklabs.com' -AVAX_RPC='https://api.avax.network/ext/bc/C/rpc' - BSC_RPC='https://bsc-dataseed1.binance.org' BSC_TESTNET_RPC='https://data-seed-prebsc-1-s1.binance.org:8545' @@ -99,3 +97,7 @@ NEOX_RPC=' ' GNOSIS_RPC=' ' LINEA_RPC=' ' + +ZKEVM_RPC=' ' + +AVALANCHE_RPC=' ' diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 65a78f7c..7744ae59 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -38,6 +38,18 @@ "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" } }, + "100": { + "FAST": { + "capacitor": "0xA8f3690dc4a9630092d1f6D2FF9dC6976AcE03e8", + "decapacitor": "0x37fA8622aD4E2fC875067DE7cC0B540d80c8057d", + "switchboard": "0xD5a83a40F262E2247e6566171f9ADc76b745F5cD" + }, + "OPTIMISTIC": { + "capacitor": "0x347aAac9A70DeA104B8eECcbaE5C4D135df7F101", + "decapacitor": "0xB7A43E33BAC7b7E284183313E4D076Bd7Ccde5a1", + "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" + } + }, "137": { "NATIVE_BRIDGE": { "switchboard": "0x053407DFA30267f6332f3c94a9e9F704A55e62CD", @@ -108,6 +120,18 @@ "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" } }, + "1101": { + "FAST": { + "capacitor": "0x87281FE7Bbf5Ab787969a688B68b86A581328Ad1", + "decapacitor": "0xD80f503727D1804e7fBBabf3e7b9e67c10b9800c", + "switchboard": "0xD5a83a40F262E2247e6566171f9ADc76b745F5cD" + }, + "OPTIMISTIC": { + "capacitor": "0x01447Df789E72A039FDa7C116b2AF1f254eBf51F", + "decapacitor": "0x2588df6f13c07eC7ac595218b8f249CeDD043C32", + "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" + } + }, "2999": { "FAST": { "capacitor": "0x82EE7e3F3ED34cbAC50bA9747b64dCB871Fd9Ead", @@ -209,6 +233,18 @@ "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" } }, + "43114": { + "FAST": { + "capacitor": "0xdeEAf67dC6b680212D89245268953d72068b34a3", + "decapacitor": "0xa01cB016567491761c4e11fBeD626bAbEDACac15", + "switchboard": "0xD5a83a40F262E2247e6566171f9ADc76b745F5cD" + }, + "OPTIMISTIC": { + "capacitor": "0x260Ae1b091d0120Bb0345C5FbEB88249E6008590", + "decapacitor": "0xD67b26401E82e16584C7F5Bbd65aAE49881f458B", + "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" + } + }, "47763": { "FAST": { "capacitor": "0xBd3261D5817b9913d9E997444730D1a299344bc3", @@ -221,6 +257,18 @@ "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" } }, + "59144": { + "FAST": { + "capacitor": "0x29bED105C126a60A768CfD837A7e8146Eb6898fF", + "decapacitor": "0x6C7e7053d456c451d91735027447FD29d4097d86", + "switchboard": "0xD5a83a40F262E2247e6566171f9ADc76b745F5cD" + }, + "OPTIMISTIC": { + "capacitor": "0x2765CFFe2e8c13BcDD8d7FD0E6caB6c235E86048", + "decapacitor": "0xCe29B880259d3Ec1D3CB8Dd6f878AA98c8B4676E", + "switchboard": "0xEaa15Fd42D68b8334a3BB1E9bF8cA85BaBE83790" + } + }, "81457": { "FAST": { "capacitor": "0xbeBd97eA1476388460Fed0E3658C014AA357d8d5", @@ -472,6 +520,18 @@ "switchboard": "0xb113d72896d4874111AF00c9499b5a64e9f1e3f4" } }, + "1101": { + "FAST": { + "capacitor": "0xFb3920c9857e0083D0bc9D34bDe0c1b2B73652f4", + "decapacitor": "0x1bb884cC27bf5ECF8896f1c7CdbEe0CC4f568C0A", + "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" + }, + "OPTIMISTIC": { + "capacitor": "0x300c383E30b3c1922fB0bb8f87Ac913c0162033e", + "decapacitor": "0x0A3bf66e1eBBa017DfCFb476D1cE9b419De60308", + "switchboard": "0xb113d72896d4874111AF00c9499b5a64e9f1e3f4" + } + }, "2999": { "OPTIMISTIC": { "capacitor": "0x2E92b72554F182008AD655EAbcD6606209c577f3", @@ -568,6 +628,18 @@ "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" } }, + "43114": { + "FAST": { + "capacitor": "0xd46E57b07626C556163D8B24dC9dA66ba144Aa30", + "decapacitor": "0x254221abBB5Dd0dbc6F612c8501075621ec8E5b5", + "switchboard": "0x09A6e77912a6bcFc3abfDfb841A85380Bb2A8B97" + }, + "OPTIMISTIC": { + "capacitor": "0x502457B7c12abDFFFEb83cD662146CA774Bd85aD", + "decapacitor": "0xf54e90F508A6E61D13Db8b32d1C28fE10CE316bF", + "switchboard": "0xb113d72896d4874111AF00c9499b5a64e9f1e3f4" + } + }, "59144": { "FAST": { "capacitor": "0x77A03Fe510B4e8fc8C242a9065e611851eaf018B", @@ -720,6 +792,18 @@ "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" } }, + "1101": { + "FAST": { + "capacitor": "0x77BF4ee46460dF3cBb0d46bE82e2515fB81F3739", + "decapacitor": "0xB3DCD58501E33Cc4eCc1c55846dFc51828D7556f", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x7886BaA2759b7656A4f5e3dB70ec7AB84b6bF6E3", + "decapacitor": "0x97974D84dE70C1eb919Ee42F8fE5F4AEbF768099", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } + }, "2999": { "OPTIMISTIC": { "capacitor": "0x7591CEBD85109b2B17F483b3892c897Cd777A3e3", @@ -768,6 +852,18 @@ "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" } }, + "43114": { + "FAST": { + "capacitor": "0x92D3C046b7687AD30e920e64FEb86F0C108Dfcb0", + "decapacitor": "0x6C2aa125d34A5682D83D649008D9A5cd9AB85933", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x38168c01d58468Fb504D845a074CFF0dB9211284", + "decapacitor": "0x1B7931FC9826F4442A46846A9ccCFedb0156718f", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } + }, "59144": { "FAST": { "capacitor": "0x362E547fB944a08a4ce4493be5C13047f2C217df", @@ -836,6 +932,18 @@ "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", "startBlock": 35612300, "integrations": { + "1": { + "FAST": { + "capacitor": "0xd9DB6A7Ff0175c68053542Dc0714967f316c3923", + "decapacitor": "0x4E04BC370629D101AAB69546a12d4D98b9d369aF", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x07229718F47457B61bd6859d0C818a1A33394d76", + "decapacitor": "0x3C2b3bCB80ABC57DF4Cf06f1991684308513d72c", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, "10": { "FAST": { "capacitor": "0xe73B81e0582110A3e1e84eD48986CF8365C67F5c", @@ -872,6 +980,18 @@ "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" } }, + "1101": { + "FAST": { + "capacitor": "0xe056cD2C8d6172259CEf4a6bCfBa51430C930EA4", + "decapacitor": "0x9915a72206BB6f57d694d975146694C4d33aD4b1", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xB36c60cCdc2022DB4f6e4f917E9b28e473B0402b", + "decapacitor": "0xE187cc0847880f7dEBDf00F8C5d7F001175F3445", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, "5000": { "FAST": { "capacitor": "0xCF029dbbFCeBf82C981B3Ffe78CCB38bbC57a6FC", @@ -908,6 +1028,18 @@ "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" } }, + "43114": { + "FAST": { + "capacitor": "0x8490EA934cC935db5252bb98D99099acBE6e1913", + "decapacitor": "0x0E26F08dE9B0BB34C483768fe5809808780Aad96", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xdc666E0C861140ed69ecF5A3a32efefFb44C5854", + "decapacitor": "0xdfAbC6a129d351d0dF0858bB7F66ba4554Bcdfb5", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, "59144": { "FAST": { "capacitor": "0xdF24b92Ad07D39344B1abA69a8acbb5DEa5BA08a", @@ -1019,6 +1151,18 @@ "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" } }, + "1101": { + "FAST": { + "capacitor": "0x71f57fb1eeDf164e18Cc15CC28a99FD2E8e33354", + "decapacitor": "0x6c012F489fD48f1C516799c3185e7c8BF01C69d8", + "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" + }, + "OPTIMISTIC": { + "capacitor": "0xC0798090645C7407e9406BF884183Bd9a20063e5", + "decapacitor": "0x50c1C2213058F525b036FCe520BE55a17F4E4197", + "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" + } + }, "2999": { "OPTIMISTIC": { "capacitor": "0xF4515eA74e50710bbb5b05ed5bB0d5764A65f9EE", @@ -1079,6 +1223,18 @@ "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" } }, + "43114": { + "FAST": { + "capacitor": "0x2d1AA6c1fFfAA22D93EB4a29392Bde436f89af8A", + "decapacitor": "0x682BF0834e4a545826cce62a6B9286669Ea91A23", + "switchboard": "0x33918BBF9f5269d90b8c0AbF1Fd1134C827bA445" + }, + "OPTIMISTIC": { + "capacitor": "0x4CacF83Ff6954bF0450e841682FC09d9C03882F0", + "decapacitor": "0x3459D762c4DC456145541B8E5b9de2b13fAd56d3", + "switchboard": "0xeF7C79DF9c9AA6BC5d1d4ae308907e9B6a6B4372" + } + }, "59144": { "FAST": { "capacitor": "0xBaFD5672Ef6298bf262e13C1B68B3aBb60a9b567", @@ -1860,6 +2016,145 @@ "SwitchboardSimulator": "0xd0580065858313f0300eBb6e7970cD3699323985", "CapacitorSimulator": "0x45d899798Fe32A791b78E68437f7D2DBd6910261" }, + "1101": { + "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "Hasher": "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "CapacitorFactory": "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "Socket": "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "ExecutionManagerDF": "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "TransmitManager": "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "FastSwitchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "OptimisticSwitchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "SocketBatcher": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "Counter": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "SocketSimulator": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SimulatorUtils": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "SwitchboardSimulator": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", + "startBlock": 15535571, + "integrations": { + "1": { + "FAST": { + "capacitor": "0x19405671F9F14a81a1112ac890E85E321a79426D", + "decapacitor": "0xFE82774f00Ce859Aad948e71D739C417Ae85B1fd", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x938DbeA077a5deB6a7680EBdCC85bB4bA216Cb52", + "decapacitor": "0x018FD84FFcaD3401C3465dFA7E8017218Fc55Dc9", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "10": { + "FAST": { + "capacitor": "0xcf4136C6537D6e4F2b17a0035663dCDD3C08F746", + "decapacitor": "0x949c6C52A539BAD93D2a31EF4EB923fd8a09c660", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xb5B1514a94584864e4b76eD0ea6C70363A8F8e52", + "decapacitor": "0x8946Ccfc19c4F7b230cA9D627aFF83A183c7fD9a", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "56": { + "FAST": { + "capacitor": "0xcacBE8Caaa88003544BA8d6Ebf63af256Cba9b93", + "decapacitor": "0x68e39A99221087D3585fA4493911A60683AbE32d", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xd9DB6A7Ff0175c68053542Dc0714967f316c3923", + "decapacitor": "0x4E04BC370629D101AAB69546a12d4D98b9d369aF", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "100": { + "FAST": { + "capacitor": "0xF6f648CF8164Dd7Ec04C0dba8fc91e7b66A154C0", + "decapacitor": "0xc014b5C95B790b35acbeE3E4D7807Bd556FddebE", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x07229718F47457B61bd6859d0C818a1A33394d76", + "decapacitor": "0x3C2b3bCB80ABC57DF4Cf06f1991684308513d72c", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "137": { + "FAST": { + "capacitor": "0xfDab5AD9dD96deb42f093510641a325dB65cAD10", + "decapacitor": "0xE16b17BC461C3EDF6c351c1a27FB42851F085D19", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x441432a93E38BdB82f71684359E59AE49c0D9a79", + "decapacitor": "0x9D44AF8a4a0fD8D86Aaa584394845a86B31007f3", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "5000": { + "FAST": { + "capacitor": "0xdF24b92Ad07D39344B1abA69a8acbb5DEa5BA08a", + "decapacitor": "0x03bCf41D18Cd8AA7D4b13DCc8574150329e6D130", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x8490EA934cC935db5252bb98D99099acBE6e1913", + "decapacitor": "0x0E26F08dE9B0BB34C483768fe5809808780Aad96", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "8453": { + "FAST": { + "capacitor": "0xCF029dbbFCeBf82C981B3Ffe78CCB38bbC57a6FC", + "decapacitor": "0xe9BE8937aDf6A92CBF464b2904097c71E480f925", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xe056cD2C8d6172259CEf4a6bCfBa51430C930EA4", + "decapacitor": "0x9915a72206BB6f57d694d975146694C4d33aD4b1", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "42161": { + "FAST": { + "capacitor": "0xe73B81e0582110A3e1e84eD48986CF8365C67F5c", + "decapacitor": "0x2e544869aD700F70E47597Aa065e562deAFcA241", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0x5924cE286850adEC8ddC9f64E8e45900006D76dB", + "decapacitor": "0x2C806f22CA1CA75Fe8D7D6cEd53B199f23D43fCc", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "43114": { + "FAST": { + "capacitor": "0xf0C835C640715Dc5363447bF7233078991889fC8", + "decapacitor": "0x2eF42ec2c355E6E5D296Ef888aBB7904386c0B94", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xdc666E0C861140ed69ecF5A3a32efefFb44C5854", + "decapacitor": "0xdfAbC6a129d351d0dF0858bB7F66ba4554Bcdfb5", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + }, + "59144": { + "FAST": { + "capacitor": "0x9f72CAEAccc292977A0c134693AB5F63fe513202", + "decapacitor": "0x86917a199668155A7Aa1dA833499E5646c00d9dA", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xB36c60cCdc2022DB4f6e4f917E9b28e473B0402b", + "decapacitor": "0xE187cc0847880f7dEBDf00F8C5d7F001175F3445", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + } + } + }, "2999": { "SignatureVerifier": "0x6D290609b3F5F02D52F28d97C75a443ED8564cBf", "Hasher": "0x2b42AFFD4b7C14d9B7C2579229495c052672Ccd3", @@ -2105,6 +2400,18 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } }, + "1101": { + "FAST": { + "capacitor": "0x611DE381354427265a58BD829184476E969de103", + "decapacitor": "0xD8D2650259eC8d201Dcc8Cb31150d16A38498Da5", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0xe7496A237fD0E08Bbe2a8466523dD7a1F651dd75", + "decapacitor": "0x0B50BB965295ac8C1b212c37A77e86F3D282fd81", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, "8453": { "FAST": { "capacitor": "0x8746E279A2Bb21e12e17d0121fb1Bbc57234c0b2", @@ -2129,6 +2436,18 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } }, + "43114": { + "FAST": { + "capacitor": "0x14Fe73b25eFa3f4C56ab37854F12Ab5Fdc503338", + "decapacitor": "0x8135DbDca6968EFD64896dB64aFf6233bd961eB9", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x3618D6E2a62b0A50e2A994F4A837FE2C7b7Aa2F5", + "decapacitor": "0x2C954D3F82f7134f95C6FF7385798e4ca6e6c111", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, "59144": { "FAST": { "capacitor": "0x8DE90E501780eF595231162c5B9d90C782B2E16d", @@ -2392,6 +2711,18 @@ "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" } }, + "1101": { + "FAST": { + "capacitor": "0x434980fF616B66a96Ebce21b3a6218D1DEEB371C", + "decapacitor": "0xEad0e6BA53a3034244cbD06C09040ebE23157C08", + "switchboard": "0x957301825Dc21d4A92919C9E72dC9E6C6a29e7f8" + }, + "OPTIMISTIC": { + "capacitor": "0xF115f1b2fACdFACcDd1F2DBd234e01CcaeEbF529", + "decapacitor": "0x5837Ca010dD98f4C0afb993d6EAa65045c0C6cea", + "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" + } + }, "2999": { "FAST": { "capacitor": "0xabCa240De0eA9a02028Fd7eE2585c94BeCF229aE", @@ -2476,6 +2807,18 @@ "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" } }, + "43114": { + "FAST": { + "capacitor": "0x05452E6DAda0e7745AbCb22157Ff7eff149E9fe1", + "decapacitor": "0xAb6E972B19057708fCf289b663d8D06AD7afd3b7", + "switchboard": "0x957301825Dc21d4A92919C9E72dC9E6C6a29e7f8" + }, + "OPTIMISTIC": { + "capacitor": "0xf7d4FbF642bEEd498D75209809d22eC62590B751", + "decapacitor": "0x6De3c837e96F2E6e5775C5b41Cb0B034725c83Cd", + "switchboard": "0x15A55294B7278260DdfFC659Fb39a401871EeE34" + } + }, "59144": { "FAST": { "capacitor": "0x24C3c9F85562e450cE0C70528484d7bBE1090688", @@ -2745,6 +3088,18 @@ "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" } }, + "1101": { + "FAST": { + "capacitor": "0xD61441CBB90C15f470CFa78CbaA140106eda37cb", + "decapacitor": "0xE4C87Dd05d4A335Aa4C00acd83ddE360736e76aD", + "switchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f" + }, + "OPTIMISTIC": { + "capacitor": "0x6BB83633A9F2eff10c684f77d7A5ca7E4EcaF799", + "decapacitor": "0x7d98cd0cb80080d72501468adb8E437e89664307", + "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" + } + }, "2999": { "OPTIMISTIC": { "capacitor": "0xf2d85CDd4C89ac37141FbBc4367D1EA4151F9D1E", @@ -2829,6 +3184,18 @@ "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" } }, + "43114": { + "FAST": { + "capacitor": "0x47CAa09e584C1bF93e1c107243C114F7f7D4B386", + "decapacitor": "0xa44EfA9Fb568549F94B34E0a4a84E26E6B3FEB76", + "switchboard": "0xd5e829827F665c42326EAF68Da3360bd59b42f2f" + }, + "OPTIMISTIC": { + "capacitor": "0x824654690c468664dED7A01aD045bdca5a9a03D5", + "decapacitor": "0xa1C108385edA8D34B585D2e5d44cC26aEbfe22bf", + "switchboard": "0x1812ff6bd726934f18159164e2927B34949B16a8" + } + }, "59144": { "FAST": { "capacitor": "0x2CecC589b7dCCc78600Bbd49D05C758b54bF5e6C", @@ -2901,6 +3268,145 @@ "CapacitorSimulator": "0xebbfb1d4dbB4a868d04f4cEc88292e93f7E6A8d3", "ExecutionManagerDF": "0x4ac0dD10eE6F29A897fDE3007c6239A6C654D5B3" }, + "43114": { + "SignatureVerifier": "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "Hasher": "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "CapacitorFactory": "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "Socket": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "ExecutionManagerDF": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "TransmitManager": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "FastSwitchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "OptimisticSwitchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SocketBatcher": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "Counter": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "SocketSimulator": "0xb4Db1838d0B97BD58C7663b3E487eEbC9a996472", + "SimulatorUtils": "0x8c36353db4F3a2DDDeed38405199d13DCF8a1B82", + "SwitchboardSimulator": "0x09A03E0d298AA13a07A9a3e36a606d4F6a4b8bB7", + "CapacitorSimulator": "0xe8634C358B1f98543399C32fA275d450F3df77AA", + "startBlock": 49860699, + "integrations": { + "1": { + "FAST": { + "capacitor": "0xd0AAF35a9870e1D8470f49822afdceC219B770c4", + "decapacitor": "0xaDb63D2281182bccfE382d5Ba4e0eCdC351c5F2E", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x77075809377d9Db6C9A2148210eD241E1f16CA53", + "decapacitor": "0xcF79fc9A7e028112a59CFC0234ddfe358283B2Cb", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "10": { + "FAST": { + "capacitor": "0x4b8E6ef3461e18b3c59Cb9F624709321Df93F2A6", + "decapacitor": "0x61Ad0622B355963Ad595E0848357f83a7DA41383", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x41b421906da71Cb6148A9a8AaEC21061BB8565e3", + "decapacitor": "0x32b4780ec614Aa1D3003Df10726A09318A8e6997", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "56": { + "FAST": { + "capacitor": "0x7C78dA75549719e6006bab4370E9E745964344db", + "decapacitor": "0x2Ca87564fCB2b3DFEeDBD4c4baFbaA7aCBbf9491", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x80b11153AbEa5a66384A65b5d7A64207E7D42470", + "decapacitor": "0x46f34Fd5744f8f145B9d3965884b160D4D596e4d", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "100": { + "FAST": { + "capacitor": "0x22d81971fE93E0C6432aD34c028B3a0c042Fa041", + "decapacitor": "0xfe44b3435c232D7F4b0825a81e8CcB624307B976", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x7C258d944705093EE90Ab648168DF8FAc4eE2dF0", + "decapacitor": "0x3c20996D62A73336A5f1B1D2FdB7C5053D321a25", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "137": { + "FAST": { + "capacitor": "0x7F4A6041A8E238c2988aB5311d4a0772864DFDaa", + "decapacitor": "0x59A183969509B4554dCC734C6C37abaCBec3f829", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0xF21CDDbe97229B4aD1BE0eB1fdca5aad4b83D0F7", + "decapacitor": "0x94ae9AF84642BF2A0E408BA6820c9acF04614E80", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "1101": { + "FAST": { + "capacitor": "0x5E24Da3ec27868C1d72e7A48d0e280E8Bd2d5b33", + "decapacitor": "0xe8f046b0ed52a4428C5b8548a995751f8cE46417", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x1fADB06BeA498999de22692B4eCe43d62D8d16de", + "decapacitor": "0x4A1cf75218a86677E4a8F5A3099774E7E1196aAF", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "5000": { + "FAST": { + "capacitor": "0x536d9A127a137858ec729c52b70A768b551559b8", + "decapacitor": "0xF758E40b0ACc078d2ad9868591445AFCC43067C7", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x633378cBeb9B3a17FB4E1e39123725AFFE855794", + "decapacitor": "0x2Ea398C96F66e726943468b757B828dbA76B8824", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "8453": { + "FAST": { + "capacitor": "0x29730d8d679e74139d7350C8b02aCA30F1bc6dca", + "decapacitor": "0x90227e78f3FCc218D3e534f2f13D02e33Bcd71f3", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x568023DFB6264b9e4890b183ea2C8c7167569C9D", + "decapacitor": "0x52615eBEC93f86DB64cB86CdD327D2F0ec6baa8e", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "42161": { + "FAST": { + "capacitor": "0x4f223f004A5D221ec05951961dc2Bd8B42c87643", + "decapacitor": "0x32F7a63cd45Ac7114dd1E32669810C0e64e7D7Cb", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0x38548f05be2C3FF256ab75E9EEe195796128cB4A", + "decapacitor": "0x4105C8b86b76A11DF745077EFf0a8ad96Dac3F0C", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + }, + "59144": { + "FAST": { + "capacitor": "0x71Ccb994347eB1a34f3148b59f4465BB9c94a160", + "decapacitor": "0xd87f37A074217B2fF86d8Dd8B0661dDF8003fBB2", + "switchboard": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21" + }, + "OPTIMISTIC": { + "capacitor": "0xF41bF4F91493B76DE0Cc68797817e5f802c0271C", + "decapacitor": "0x99333a8fAcbbfFBD91BbFC4dB5144B3c21F123B1", + "switchboard": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF" + } + } + } + }, "47763": { "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", "Hasher": "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", @@ -2950,6 +3456,18 @@ "CapacitorSimulator": "0xd2BF218Fe89d528781684640F576073C99388E92", "startBlock": 8465306, "integrations": { + "1": { + "FAST": { + "capacitor": "0x7e4788652BC2E3fcdCe5Dd702D675201456D67F2", + "decapacitor": "0xF8b6266B6405254241B8e2dAFdCb2a82Ce4D9877", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x3003B9b70104aF1d37c6e00Af01aD59765CC8eAF", + "decapacitor": "0x642506cB159ab8e61e6D497360114A5bAe9C3221", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, "10": { "FAST": { "capacitor": "0x300786AAd56B4f0F91882C92375ecDC58b5725d3", @@ -2998,6 +3516,18 @@ "switchboard": "0x332901149A390D334498008449089f05fa273C3B" } }, + "1101": { + "FAST": { + "capacitor": "0xFe9Bc66C4A9D3cFFCFc51EAf9A7cbE3915F46654", + "decapacitor": "0x96b899921D3266d3002dd5aD25Aa62AaaBaF7187", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0x2557242A2c12e9187564B8f3D5DDE384df117473", + "decapacitor": "0x668cd9B2EA681cBf3Df47457C2A7cb7b01Ed94a4", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } + }, "5000": { "FAST": { "capacitor": "0x6b033a9c871e379D128cc94CB1b7ca56aB19D1F3", @@ -3033,6 +3563,18 @@ "decapacitor": "0x60B458FD39a4b75eD21DDeC1a352B58e6363c2e1", "switchboard": "0x332901149A390D334498008449089f05fa273C3B" } + }, + "43114": { + "FAST": { + "capacitor": "0x970787405CEffAf5399B6C41fC6eF0f49584B032", + "decapacitor": "0xE904dF0234655d6114d6fA55C148120A5b911c6F", + "switchboard": "0x497D0FA570c128830a3aA3C06582a94af2330A18" + }, + "OPTIMISTIC": { + "capacitor": "0xD39F56A0FaD7908AfD141c111C9634b2057B28d2", + "decapacitor": "0xFb9d05bD4D45271DBb437E6f425D12B1931a85A3", + "switchboard": "0x332901149A390D334498008449089f05fa273C3B" + } } } }, diff --git a/hardhat.config.ts b/hardhat.config.ts index f21b13ec..a157d791 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -129,7 +129,6 @@ const config: HardhatUserConfig = { apiKey: { arbitrumOne: process.env.ARBISCAN_API_KEY || "", arbitrumTestnet: process.env.ARBISCAN_API_KEY || "", - avalanche: process.env.SNOWTRACE_API_KEY || "", bsc: process.env.BSCSCAN_API_KEY || "", bscTestnet: process.env.BSCSCAN_API_KEY || "", goerli: process.env.ETHERSCAN_API_KEY || "", diff --git a/package.json b/package.json index 49945f9f..585075cc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@socket.tech/dl-core", "license": "UNLICENSED", - "version": "2.25.0", + "version": "2.26.0", "description": "Smart contracts for socket data layer.", "main": "./dist/src/index.js", "types": "./dist/src/index.d.ts", diff --git a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts index c71c7748..f61a978e 100644 --- a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts +++ b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts @@ -39,4 +39,6 @@ export const batcherSupportedChainSlugs = [ ChainSlug.NEOX, ChainSlug.GNOSIS, ChainSlug.LINEA, + ChainSlug.ZKEVM, + ChainSlug.AVALANCHE, ]; diff --git a/scripts/rpcConfig/constants/explorers.ts b/scripts/rpcConfig/constants/explorers.ts index a53b77c3..4221e387 100644 --- a/scripts/rpcConfig/constants/explorers.ts +++ b/scripts/rpcConfig/constants/explorers.ts @@ -17,4 +17,6 @@ export const explorers = { [ChainSlug.NEOX]: "https://xexplorer.neo.org", [ChainSlug.GNOSIS]: "https://gnosisscan.io/", [ChainSlug.LINEA]: "https://lineascan.build/", + [ChainSlug.ZKEVM]: "https://zkevm.polygonscan.com/", + [ChainSlug.AVALANCHE]: "https://snowtrace.io/", }; diff --git a/scripts/rpcConfig/constants/icons.ts b/scripts/rpcConfig/constants/icons.ts index 3b4634e3..dbfed42f 100644 --- a/scripts/rpcConfig/constants/icons.ts +++ b/scripts/rpcConfig/constants/icons.ts @@ -15,4 +15,6 @@ export const icons = { [ChainSlug.NEOX]: "", [ChainSlug.GNOSIS]: "", [ChainSlug.LINEA]: "", + [ChainSlug.ZKEVM]: "", + [ChainSlug.AVALANCHE]: "", }; diff --git a/scripts/rpcConfig/constants/rpc.ts b/scripts/rpcConfig/constants/rpc.ts index dc0fbdb7..a8079b57 100644 --- a/scripts/rpcConfig/constants/rpc.ts +++ b/scripts/rpcConfig/constants/rpc.ts @@ -51,4 +51,6 @@ export const rpcs = { [ChainSlug.NEOX]: checkEnvValue("NEOX_RPC"), [ChainSlug.GNOSIS]: checkEnvValue("GNOSIS_RPC"), [ChainSlug.LINEA]: checkEnvValue("LINEA_RPC"), + [ChainSlug.ZKEVM]: checkEnvValue("ZKEVM_RPC"), + [ChainSlug.AVALANCHE]: checkEnvValue("AVALANCHE_RPC"), }; diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts index 68b09213..50e88cee 100644 --- 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.47", + [DeploymentMode.PROD]: "1.0.49", }; diff --git a/src/enums/chainId.ts b/src/enums/chainId.ts index 048b8e64..bb20a533 100644 --- a/src/enums/chainId.ts +++ b/src/enums/chainId.ts @@ -13,7 +13,6 @@ export enum ChainId { AEVO_TESTNET = 11155112, AEVO = 2999, HARDHAT = 31337, - AVALANCHE = 43114, LYRA_TESTNET = 901, LYRA = 957, XAI_TESTNET = 47279324479, @@ -48,4 +47,6 @@ export enum ChainId { NEOX = 47763, GNOSIS = 100, LINEA = 59144, + ZKEVM = 1101, + AVALANCHE = 43114, } diff --git a/src/enums/chainSlug.ts b/src/enums/chainSlug.ts index 9b572f9d..9be81cb9 100644 --- a/src/enums/chainSlug.ts +++ b/src/enums/chainSlug.ts @@ -15,7 +15,6 @@ export enum ChainSlug { AEVO_TESTNET = ChainId.AEVO_TESTNET, AEVO = ChainId.AEVO, HARDHAT = ChainId.HARDHAT, - AVALANCHE = ChainId.AVALANCHE, LYRA_TESTNET = ChainId.LYRA_TESTNET, LYRA = ChainId.LYRA, XAI_TESTNET = 1399904803, @@ -50,4 +49,6 @@ export enum ChainSlug { NEOX = ChainId.NEOX, GNOSIS = ChainId.GNOSIS, LINEA = ChainId.LINEA, + ZKEVM = ChainId.ZKEVM, + AVALANCHE = ChainId.AVALANCHE, } diff --git a/src/enums/chainSlugToHardhatChainName.ts b/src/enums/chainSlugToHardhatChainName.ts index 8bcc9644..16078e39 100644 --- a/src/enums/chainSlugToHardhatChainName.ts +++ b/src/enums/chainSlugToHardhatChainName.ts @@ -16,7 +16,6 @@ export const chainSlugToHardhatChainName = { [ChainSlug.AEVO_TESTNET]: HardhatChainName.AEVO_TESTNET, [ChainSlug.AEVO]: HardhatChainName.AEVO, [ChainSlug.HARDHAT]: HardhatChainName.HARDHAT, - [ChainSlug.AVALANCHE]: HardhatChainName.AVALANCHE, [ChainSlug.LYRA_TESTNET]: HardhatChainName.LYRA_TESTNET, [ChainSlug.LYRA]: HardhatChainName.LYRA, [ChainSlug.XAI_TESTNET]: HardhatChainName.XAI_TESTNET, @@ -51,4 +50,6 @@ export const chainSlugToHardhatChainName = { [ChainSlug.NEOX]: [HardhatChainName.NEOX], [ChainSlug.GNOSIS]: [HardhatChainName.GNOSIS], [ChainSlug.LINEA]: [HardhatChainName.LINEA], + [ChainSlug.ZKEVM]: [HardhatChainName.ZKEVM], + [ChainSlug.AVALANCHE]: [HardhatChainName.AVALANCHE], }; diff --git a/src/enums/chainSlugToId.ts b/src/enums/chainSlugToId.ts index 191e882a..c7ed24c7 100644 --- a/src/enums/chainSlugToId.ts +++ b/src/enums/chainSlugToId.ts @@ -16,7 +16,6 @@ export const ChainSlugToId = { [ChainSlug.AEVO_TESTNET]: ChainId.AEVO_TESTNET, [ChainSlug.AEVO]: ChainId.AEVO, [ChainSlug.HARDHAT]: ChainId.HARDHAT, - [ChainSlug.AVALANCHE]: ChainId.AVALANCHE, [ChainSlug.LYRA_TESTNET]: ChainId.LYRA_TESTNET, [ChainSlug.LYRA]: ChainId.LYRA, [ChainSlug.XAI_TESTNET]: ChainId.XAI_TESTNET, @@ -51,4 +50,6 @@ export const ChainSlugToId = { [ChainSlug.NEOX]: ChainId.NEOX, [ChainSlug.GNOSIS]: ChainId.GNOSIS, [ChainSlug.LINEA]: ChainId.LINEA, + [ChainSlug.ZKEVM]: ChainId.ZKEVM, + [ChainSlug.AVALANCHE]: ChainId.AVALANCHE, }; diff --git a/src/enums/chainSlugToKey.ts b/src/enums/chainSlugToKey.ts index 539f7a3a..7ed4714c 100644 --- a/src/enums/chainSlugToKey.ts +++ b/src/enums/chainSlugToKey.ts @@ -16,7 +16,6 @@ export const ChainSlugToKey = { [ChainSlug.AEVO_TESTNET]: HardhatChainName.AEVO_TESTNET, [ChainSlug.AEVO]: HardhatChainName.AEVO, [ChainSlug.HARDHAT]: HardhatChainName.HARDHAT, - [ChainSlug.AVALANCHE]: HardhatChainName.AVALANCHE, [ChainSlug.LYRA_TESTNET]: HardhatChainName.LYRA_TESTNET, [ChainSlug.LYRA]: HardhatChainName.LYRA, [ChainSlug.XAI_TESTNET]: HardhatChainName.XAI_TESTNET, @@ -51,4 +50,6 @@ export const ChainSlugToKey = { [ChainSlug.NEOX]: HardhatChainName.NEOX, [ChainSlug.GNOSIS]: HardhatChainName.GNOSIS, [ChainSlug.LINEA]: HardhatChainName.LINEA, + [ChainSlug.ZKEVM]: HardhatChainName.ZKEVM, + [ChainSlug.AVALANCHE]: HardhatChainName.AVALANCHE, }; diff --git a/src/enums/currency.ts b/src/enums/currency.ts index 53fcb17f..2e74d7dc 100644 --- a/src/enums/currency.ts +++ b/src/enums/currency.ts @@ -13,4 +13,5 @@ export const Currency = { [ChainSlug.NEOX_T4_TESTNET]: NativeTokens["gas"], [ChainSlug.NEOX]: NativeTokens["gas"], [ChainSlug.GNOSIS]: NativeTokens["dai"], + [ChainSlug.AVALANCHE]: NativeTokens["avalanche"], }; diff --git a/src/enums/ethLikeChains.ts b/src/enums/ethLikeChains.ts index 47b25fb8..b21fefc2 100644 --- a/src/enums/ethLikeChains.ts +++ b/src/enums/ethLikeChains.ts @@ -21,4 +21,6 @@ export const ethLikeChains = [ ChainSlug.NEOX, ChainSlug.GNOSIS, ChainSlug.LINEA, + ChainSlug.ZKEVM, + ChainSlug.AVALANCHE, ]; diff --git a/src/enums/hardhatChainName.ts b/src/enums/hardhatChainName.ts index 47fbb2bb..cfb81aff 100644 --- a/src/enums/hardhatChainName.ts +++ b/src/enums/hardhatChainName.ts @@ -5,8 +5,6 @@ export enum HardhatChainName { OPTIMISM = "optimism", OPTIMISM_GOERLI = "optimism_goerli", OPTIMISM_SEPOLIA = "optimism_sepolia", - AVALANCHE = "avalanche", - AVALANCHE_TESTNET = "avalanche_testnet", BSC = "bsc", MAINNET = "mainnet", GOERLI = "goerli", @@ -49,4 +47,6 @@ export enum HardhatChainName { NEOX = "neox", GNOSIS = "gnosis", LINEA = "linea", + ZKEVM = "zkevm", + AVALANCHE = "avalanche", } diff --git a/src/enums/hardhatChainNameToSlug.ts b/src/enums/hardhatChainNameToSlug.ts index 6d499274..095b728d 100644 --- a/src/enums/hardhatChainNameToSlug.ts +++ b/src/enums/hardhatChainNameToSlug.ts @@ -16,7 +16,6 @@ export const hardhatChainNameToSlug = { [HardhatChainName.AEVO_TESTNET]: ChainSlug.AEVO_TESTNET, [HardhatChainName.AEVO]: ChainSlug.AEVO, [HardhatChainName.HARDHAT]: ChainSlug.HARDHAT, - [HardhatChainName.AVALANCHE]: ChainSlug.AVALANCHE, [HardhatChainName.LYRA_TESTNET]: ChainSlug.LYRA_TESTNET, [HardhatChainName.LYRA]: ChainSlug.LYRA, [HardhatChainName.XAI_TESTNET]: ChainSlug.XAI_TESTNET, @@ -51,4 +50,6 @@ export const hardhatChainNameToSlug = { [HardhatChainName.NEOX]: ChainSlug.NEOX, [HardhatChainName.GNOSIS]: ChainSlug.GNOSIS, [HardhatChainName.LINEA]: ChainSlug.LINEA, + [HardhatChainName.ZKEVM]: ChainSlug.ZKEVM, + [HardhatChainName.AVALANCHE]: ChainSlug.AVALANCHE, }; diff --git a/src/enums/mainnetIds.ts b/src/enums/mainnetIds.ts index 37123c5e..316f1575 100644 --- a/src/enums/mainnetIds.ts +++ b/src/enums/mainnetIds.ts @@ -24,4 +24,6 @@ export const MainnetIds: ChainSlug[] = [ ChainSlug.NEOX, ChainSlug.GNOSIS, ChainSlug.LINEA, + ChainSlug.ZKEVM, + ChainSlug.AVALANCHE, ]; diff --git a/src/enums/native-tokens.ts b/src/enums/native-tokens.ts index f7db682e..bee84919 100644 --- a/src/enums/native-tokens.ts +++ b/src/enums/native-tokens.ts @@ -9,4 +9,5 @@ export enum NativeTokens { "no-token" = "no-token", "gas" = "gas", "dai" = "dai", + "avalanche" = "avalanche", } From 3781aae2978ab2772eb7e6898cccf3bc5eba47df Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 12 Sep 2024 21:04:37 +0400 Subject: [PATCH 10/12] fix: bungee chain fixes --- scripts/rpcConfig/constants/version.ts | 2 +- scripts/rpcConfig/rpcConfig.ts | 1 - src/enums/currency.ts | 2 +- src/enums/native-tokens.ts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts index 50e88cee..ce194d74 100644 --- 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.49", + [DeploymentMode.PROD]: "1.0.51", }; diff --git a/scripts/rpcConfig/rpcConfig.ts b/scripts/rpcConfig/rpcConfig.ts index cdae0671..d6c8eded 100644 --- a/scripts/rpcConfig/rpcConfig.ts +++ b/scripts/rpcConfig/rpcConfig.ts @@ -150,7 +150,6 @@ export const generateProdConfig = async (txData: TxData): Promise => { ChainSlug.POLYGON_MAINNET, ChainSlug.LYRA, ChainSlug.MAINNET, - ChainSlug.GOERLI, ChainSlug.SEPOLIA, ChainSlug.LYRA_TESTNET, ChainSlug.ARBITRUM_SEPOLIA, diff --git a/src/enums/currency.ts b/src/enums/currency.ts index 2e74d7dc..ad9c2f3a 100644 --- a/src/enums/currency.ts +++ b/src/enums/currency.ts @@ -13,5 +13,5 @@ export const Currency = { [ChainSlug.NEOX_T4_TESTNET]: NativeTokens["gas"], [ChainSlug.NEOX]: NativeTokens["gas"], [ChainSlug.GNOSIS]: NativeTokens["dai"], - [ChainSlug.AVALANCHE]: NativeTokens["avalanche"], + [ChainSlug.AVALANCHE]: NativeTokens["avalanche-2"], }; diff --git a/src/enums/native-tokens.ts b/src/enums/native-tokens.ts index bee84919..3616045b 100644 --- a/src/enums/native-tokens.ts +++ b/src/enums/native-tokens.ts @@ -9,5 +9,5 @@ export enum NativeTokens { "no-token" = "no-token", "gas" = "gas", "dai" = "dai", - "avalanche" = "avalanche", + "avalanche-2" = "avalanche-2", } From 50f252daef991bba3beba1fc2bf62d7dbf573c8d Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 12 Sep 2024 21:40:10 +0400 Subject: [PATCH 11/12] feat: connect winr chains, xlayer --- .env.example | 2 + deployments/prod_addresses.json | 91 +++++++++++++ deployments/prod_verification.json | 125 ++++++++++++++++++ package.json | 2 +- .../constants/batcherSupportedChainSlug.ts | 1 + scripts/rpcConfig/constants/explorers.ts | 1 + scripts/rpcConfig/constants/icons.ts | 1 + scripts/rpcConfig/constants/rpc.ts | 1 + scripts/rpcConfig/constants/version.ts | 2 +- src/enums/chainId.ts | 1 + src/enums/chainSlug.ts | 1 + src/enums/chainSlugToHardhatChainName.ts | 1 + src/enums/chainSlugToId.ts | 1 + src/enums/chainSlugToKey.ts | 1 + src/enums/currency.ts | 1 + src/enums/hardhatChainName.ts | 1 + src/enums/hardhatChainNameToSlug.ts | 1 + src/enums/mainnetIds.ts | 1 + src/enums/native-tokens.ts | 1 + src/enums/polygonCDKChains.ts | 1 + 20 files changed, 235 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index a7ca575d..999719ef 100644 --- a/.env.example +++ b/.env.example @@ -101,3 +101,5 @@ LINEA_RPC=' ' ZKEVM_RPC=' ' AVALANCHE_RPC=' ' + +XLAYER_RPC=' ' diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 7744ae59..0d24aa17 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -875,6 +875,30 @@ "decapacitor": "0x2D4CA2C96b8342fA570644C8cdD1024404344F9a", "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" } + }, + "81457": { + "FAST": { + "capacitor": "0xdD183D53a1F038e5dDFfda832cAc92a67d17e07d", + "decapacitor": "0x606c8B1393abB1600d41E822B7c9C0f84EAb0Cf5", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x5f2886Af7067B8aeB6298661Bfa0e853b8f74372", + "decapacitor": "0x8C38f4Dc8946aE48AeCc62CBaAB68235Ff9c2f64", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } + }, + "777777": { + "FAST": { + "capacitor": "0xC1bD5861e8Cc1aB32125bcb3bA61F7FA8FDf3a7B", + "decapacitor": "0x129CbbDd6b759D03C23592efBa532e3Da0dAE7b6", + "switchboard": "0xCedce2e52aa6551bC407f640D8Bd9179b528347C" + }, + "OPTIMISTIC": { + "capacitor": "0x4a90B366A4fbB32F47730725dC7e93EF7e9E8116", + "decapacitor": "0x73A17d2EC93C4207aAD062b5A2A76749622C2Bc8", + "switchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25" + } } }, "OptimisticSwitchboard": "0x5490aBcD9949833FB68e4d222ee68dc225881c25", @@ -1283,6 +1307,37 @@ "CapacitorSimulator": "0x76fA03B93Ac9b48a66C38C6075C200b750E21923", "ExecutionManagerDF": "0x5a0e01ED2be962a16cF56DFb6C3F252adED4483c" }, + "196": { + "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "Hasher": "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "CapacitorFactory": "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "Socket": "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "ExecutionManagerDF": "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "TransmitManager": "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "FastSwitchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "OptimisticSwitchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "SocketBatcher": "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "Counter": "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "SocketSimulator": "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SimulatorUtils": "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "SwitchboardSimulator": "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "CapacitorSimulator": "0xD7B34Db1477797FA2Dff890afBa88a00eb89b9eE", + "startBlock": 4765124, + "integrations": { + "777777": { + "FAST": { + "capacitor": "0x19405671F9F14a81a1112ac890E85E321a79426D", + "decapacitor": "0xFE82774f00Ce859Aad948e71D739C417Ae85B1fd", + "switchboard": "0xb4Ef469c9d8317851270346070dA0ecE24616E6b" + }, + "OPTIMISTIC": { + "capacitor": "0xfDab5AD9dD96deb42f093510641a325dB65cAD10", + "decapacitor": "0xE16b17BC461C3EDF6c351c1a27FB42851F085D19", + "switchboard": "0x0CC93650bF4D98237628DACf87f94E443956D8dF" + } + } + } + }, "404": { "SignatureVerifier": "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", "Hasher": "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", @@ -3714,6 +3769,18 @@ "switchboard": "0x09217a4A727418A7A9fc60aE07E31c2Dfd13Bf2f" } }, + "56": { + "FAST": { + "capacitor": "0xc6c1EA92d3850ecC60f8D7B12F1cd1AAE38C6E36", + "decapacitor": "0xaC800E9a6b82A8E4878d6367137CFe90A70B82eA", + "switchboard": "0xdcABb6d7E88396498FFF4CD987F60e354BF2a44b" + }, + "OPTIMISTIC": { + "capacitor": "0x1Bd05F60eEFF392EaBEcB3374650F67b8C97D968", + "decapacitor": "0xf10CbD639b94136c91a6314240f5A4d63ed7e5e9", + "switchboard": "0x09217a4A727418A7A9fc60aE07E31c2Dfd13Bf2f" + } + }, "137": { "FAST": { "capacitor": "0xa3b065C48E33239cc8d01084a4bfa26Ed0ea325C", @@ -4203,6 +4270,30 @@ "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" } }, + "56": { + "FAST": { + "capacitor": "0x33284bd6eaddB0558a2E3C77Be076bD359c72828", + "decapacitor": "0x4eA1FA330240d0fb19cBE66b6A6eecE2D32D73f9", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x633a828F7EbB3c30bd0fcD80E127d23e45b9CABb", + "decapacitor": "0x1CD4bc16F197FBe5AF493066cdea8095A1Fc46D1", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, + "196": { + "FAST": { + "capacitor": "0xD565E419f066fF70685a57160a673D614E2f885e", + "decapacitor": "0x85296450abCDb2D50DBfd6Dcb198ABC2A738497E", + "switchboard": "0x8f9EaEe5c5df888aBA3c1Ab19689a0660d042c6d" + }, + "OPTIMISTIC": { + "capacitor": "0x0cefaEe9453F939b43eD88EF659a54bE4c147106", + "decapacitor": "0x56DB02335CA50C4eDf074D4f819c37310f6F2cFA", + "switchboard": "0x57D1Aeafb6a2b7Bd4954e47a556622161A8c0A65" + } + }, "8453": { "FAST": { "capacitor": "0x8590b1DDb6a4A06145bF008e8e708A81f9fb53e6", diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index b4f78014..65f1431d 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -829,6 +829,131 @@ ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34", 10] ] ], + "196": [ + [ + "0xd9E3a8Ba9Be55919C5C0De6694e3103F5a35820E", + "SwitchboardSimulator", + "contracts/mocks/fee-updater/SwitchboardSimulator.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + 196, + 1000, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x3043Ad9C9e01664bc3A68477f0870Df35dC4bFf8", + "SimulatorUtils", + "contracts/mocks/fee-updater/SimulatorUtils.sol", + [ + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 196 + ] + ], + [ + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 196, + 196, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "IMLI" + ] + ], + [ + "0x657e72B305Dc1c41e98d9efC2350EC10e3c83E21", + "Counter", + "contracts/examples/Counter.sol", + ["0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE"] + ], + [ + "0xb3314456567986e657d4C65Ec9e8cB736B92d11D", + "SocketBatcher", + "contracts/socket/SocketBatcher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0x0CC93650bF4D98237628DACf87f94E443956D8dF", + "OptimisticSwitchboard", + "contracts/switchboard/default-switchboards/OptimisticSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + 196, + 7200, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xb4Ef469c9d8317851270346070dA0ecE24616E6b", + "FastSwitchboard", + "contracts/switchboard/default-switchboards/FastSwitchboard.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + 196, + 7200, + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "TransmitManager", + "contracts/TransmitManager.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 196, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "ExecutionManagerDF", + "contracts/ExecutionManagerDF.sol", + [ + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + 196, + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead" + ] + ], + [ + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "Socket", + "contracts/socket/Socket.sol", + [ + 196, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", + "IMLI" + ] + ], + [ + "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] + ], + [ + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "Hasher", + "contracts/utils/Hasher.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ], + [ + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "SignatureVerifier", + "contracts/utils/SignatureVerifier.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836"] + ] + ], "238": [ [ "0x2a1094b6585b32FE33929cDdF7Ee3F5a1c1E163A", diff --git a/package.json b/package.json index 585075cc..4e7886ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@socket.tech/dl-core", "license": "UNLICENSED", - "version": "2.26.0", + "version": "2.27.0", "description": "Smart contracts for socket data layer.", "main": "./dist/src/index.js", "types": "./dist/src/index.d.ts", diff --git a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts index f61a978e..43c0d3d7 100644 --- a/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts +++ b/scripts/rpcConfig/constants/batcherSupportedChainSlug.ts @@ -41,4 +41,5 @@ export const batcherSupportedChainSlugs = [ ChainSlug.LINEA, ChainSlug.ZKEVM, ChainSlug.AVALANCHE, + ChainSlug.XLAYER, ]; diff --git a/scripts/rpcConfig/constants/explorers.ts b/scripts/rpcConfig/constants/explorers.ts index 4221e387..edc7fb77 100644 --- a/scripts/rpcConfig/constants/explorers.ts +++ b/scripts/rpcConfig/constants/explorers.ts @@ -19,4 +19,5 @@ export const explorers = { [ChainSlug.LINEA]: "https://lineascan.build/", [ChainSlug.ZKEVM]: "https://zkevm.polygonscan.com/", [ChainSlug.AVALANCHE]: "https://snowtrace.io/", + [ChainSlug.XLAYER]: "https://www.okx.com/web3/explorer/xlayer", }; diff --git a/scripts/rpcConfig/constants/icons.ts b/scripts/rpcConfig/constants/icons.ts index dbfed42f..f1eeb7e3 100644 --- a/scripts/rpcConfig/constants/icons.ts +++ b/scripts/rpcConfig/constants/icons.ts @@ -17,4 +17,5 @@ export const icons = { [ChainSlug.LINEA]: "", [ChainSlug.ZKEVM]: "", [ChainSlug.AVALANCHE]: "", + [ChainSlug.XLAYER]: "", }; diff --git a/scripts/rpcConfig/constants/rpc.ts b/scripts/rpcConfig/constants/rpc.ts index a8079b57..d8e060b2 100644 --- a/scripts/rpcConfig/constants/rpc.ts +++ b/scripts/rpcConfig/constants/rpc.ts @@ -53,4 +53,5 @@ export const rpcs = { [ChainSlug.LINEA]: checkEnvValue("LINEA_RPC"), [ChainSlug.ZKEVM]: checkEnvValue("ZKEVM_RPC"), [ChainSlug.AVALANCHE]: checkEnvValue("AVALANCHE_RPC"), + [ChainSlug.XLAYER]: checkEnvValue("XLAYER_RPC"), }; diff --git a/scripts/rpcConfig/constants/version.ts b/scripts/rpcConfig/constants/version.ts index ce194d74..53b46eb1 100644 --- 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.51", + [DeploymentMode.PROD]: "1.0.52", }; diff --git a/src/enums/chainId.ts b/src/enums/chainId.ts index bb20a533..33bb6606 100644 --- a/src/enums/chainId.ts +++ b/src/enums/chainId.ts @@ -49,4 +49,5 @@ export enum ChainId { LINEA = 59144, ZKEVM = 1101, AVALANCHE = 43114, + XLAYER = 196, } diff --git a/src/enums/chainSlug.ts b/src/enums/chainSlug.ts index 9be81cb9..68245fed 100644 --- a/src/enums/chainSlug.ts +++ b/src/enums/chainSlug.ts @@ -51,4 +51,5 @@ export enum ChainSlug { LINEA = ChainId.LINEA, ZKEVM = ChainId.ZKEVM, AVALANCHE = ChainId.AVALANCHE, + XLAYER = ChainId.XLAYER, } diff --git a/src/enums/chainSlugToHardhatChainName.ts b/src/enums/chainSlugToHardhatChainName.ts index 16078e39..d30e5517 100644 --- a/src/enums/chainSlugToHardhatChainName.ts +++ b/src/enums/chainSlugToHardhatChainName.ts @@ -52,4 +52,5 @@ export const chainSlugToHardhatChainName = { [ChainSlug.LINEA]: [HardhatChainName.LINEA], [ChainSlug.ZKEVM]: [HardhatChainName.ZKEVM], [ChainSlug.AVALANCHE]: [HardhatChainName.AVALANCHE], + [ChainSlug.XLAYER]: [HardhatChainName.XLAYER], }; diff --git a/src/enums/chainSlugToId.ts b/src/enums/chainSlugToId.ts index c7ed24c7..79103b0e 100644 --- a/src/enums/chainSlugToId.ts +++ b/src/enums/chainSlugToId.ts @@ -52,4 +52,5 @@ export const ChainSlugToId = { [ChainSlug.LINEA]: ChainId.LINEA, [ChainSlug.ZKEVM]: ChainId.ZKEVM, [ChainSlug.AVALANCHE]: ChainId.AVALANCHE, + [ChainSlug.XLAYER]: ChainId.XLAYER, }; diff --git a/src/enums/chainSlugToKey.ts b/src/enums/chainSlugToKey.ts index 7ed4714c..814d6572 100644 --- a/src/enums/chainSlugToKey.ts +++ b/src/enums/chainSlugToKey.ts @@ -52,4 +52,5 @@ export const ChainSlugToKey = { [ChainSlug.LINEA]: HardhatChainName.LINEA, [ChainSlug.ZKEVM]: HardhatChainName.ZKEVM, [ChainSlug.AVALANCHE]: HardhatChainName.AVALANCHE, + [ChainSlug.XLAYER]: HardhatChainName.XLAYER, }; diff --git a/src/enums/currency.ts b/src/enums/currency.ts index ad9c2f3a..f3162213 100644 --- a/src/enums/currency.ts +++ b/src/enums/currency.ts @@ -14,4 +14,5 @@ export const Currency = { [ChainSlug.NEOX]: NativeTokens["gas"], [ChainSlug.GNOSIS]: NativeTokens["dai"], [ChainSlug.AVALANCHE]: NativeTokens["avalanche-2"], + [ChainSlug.XLAYER]: NativeTokens["okb"], }; diff --git a/src/enums/hardhatChainName.ts b/src/enums/hardhatChainName.ts index cfb81aff..5281b926 100644 --- a/src/enums/hardhatChainName.ts +++ b/src/enums/hardhatChainName.ts @@ -49,4 +49,5 @@ export enum HardhatChainName { LINEA = "linea", ZKEVM = "zkevm", AVALANCHE = "avalanche", + XLAYER = "xlayer", } diff --git a/src/enums/hardhatChainNameToSlug.ts b/src/enums/hardhatChainNameToSlug.ts index 095b728d..f19307e5 100644 --- a/src/enums/hardhatChainNameToSlug.ts +++ b/src/enums/hardhatChainNameToSlug.ts @@ -52,4 +52,5 @@ export const hardhatChainNameToSlug = { [HardhatChainName.LINEA]: ChainSlug.LINEA, [HardhatChainName.ZKEVM]: ChainSlug.ZKEVM, [HardhatChainName.AVALANCHE]: ChainSlug.AVALANCHE, + [HardhatChainName.XLAYER]: ChainSlug.XLAYER, }; diff --git a/src/enums/mainnetIds.ts b/src/enums/mainnetIds.ts index 316f1575..3cf6b2ad 100644 --- a/src/enums/mainnetIds.ts +++ b/src/enums/mainnetIds.ts @@ -26,4 +26,5 @@ export const MainnetIds: ChainSlug[] = [ ChainSlug.LINEA, ChainSlug.ZKEVM, ChainSlug.AVALANCHE, + ChainSlug.XLAYER, ]; diff --git a/src/enums/native-tokens.ts b/src/enums/native-tokens.ts index 3616045b..c059d89a 100644 --- a/src/enums/native-tokens.ts +++ b/src/enums/native-tokens.ts @@ -10,4 +10,5 @@ export enum NativeTokens { "gas" = "gas", "dai" = "dai", "avalanche-2" = "avalanche-2", + "okb" = "okb", } diff --git a/src/enums/polygonCDKChains.ts b/src/enums/polygonCDKChains.ts index cc0c757b..4a29a7ab 100644 --- a/src/enums/polygonCDKChains.ts +++ b/src/enums/polygonCDKChains.ts @@ -6,4 +6,5 @@ export const polygonCDKChains = [ ChainSlug.SX_NETWORK_TESTNET, ChainSlug.SX_NETWORK, ChainSlug.XAI_TESTNET, + ChainSlug.XLAYER, ]; From 73315637730480d20e159821bc69359986644a3b Mon Sep 17 00:00:00 2001 From: arthcp Date: Thu, 12 Sep 2024 22:33:41 +0400 Subject: [PATCH 12/12] feat: contract verify and df migrate --- deployments/prod_verification.json | 40 +++++++++++++++++++ hardhat.config.ts | 20 ++++++++++ .../constants/disabledDFFeeChains.ts | 4 +- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index 65f1431d..f9a3f810 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -2265,6 +2265,26 @@ ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34"] ] ], + "1101": [ + [ + "0x525a6489a1df5fF1ae077fAf628E43b7F52298eF", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 1101, + 1101, + "0x1F6bc87f3309B5D31Eb0BdaBE3ED7d3110d3B9c3", + "0xc8a4D2fd77c155fd52e65Ab07F337aBF84495Ead", + "IMLI" + ] + ], + [ + "0x6C593aD4C0Fa4E293a0f1240F9ca3CF0e8a28619", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] + ] + ], "1729": [ [ "0xd286595d2e3D879596FAB51f83A702D10a6db27b", @@ -4049,6 +4069,26 @@ ["0x5fD7D0d6b91CC4787Bcb86ca47e0Bd4ea0346d34"] ] ], + "43114": [ + [ + "0xb4Db1838d0B97BD58C7663b3E487eEbC9a996472", + "SocketSimulator", + "contracts/mocks/fee-updater/SocketSimulator.sol", + [ + 43114, + 43114, + "0x1CAdCd88fC148D3966eDe75D029937C886f66009", + "0xbe7241e9D11EC2D1Ac86CE217c4A37b7aD1701cE", + "IMLI" + ] + ], + [ + "0x9B8c323468AEC7A7Cb041CeD48F92559bFF33705", + "CapacitorFactory", + "contracts/CapacitorFactory.sol", + ["0xB0BBff6311B7F245761A7846d3Ce7B1b100C1836", 10] + ] + ], "47763": [ [ "0x8Bc50b98B55F42DD3966e9b428AF3581386B7Fa6", diff --git a/hardhat.config.ts b/hardhat.config.ts index a157d791..8d9051f1 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -116,6 +116,8 @@ if (isProduction) { [HardhatChainName.NEOX_TESTNET]: getChainConfig(ChainSlug.NEOX_TESTNET), [HardhatChainName.GNOSIS]: getChainConfig(ChainSlug.GNOSIS), [HardhatChainName.LINEA]: getChainConfig(ChainSlug.LINEA), + [HardhatChainName.ZKEVM]: getChainConfig(ChainSlug.ZKEVM), + [HardhatChainName.AVALANCHE]: getChainConfig(ChainSlug.AVALANCHE), }; } @@ -165,6 +167,8 @@ const config: HardhatUserConfig = { neox_testnet: "none", gnosis: process.env.GNOSISSCAN_API_KEY || "", linea: process.env.LINEASCAN_API_KEY || "", + zkevm: process.env.ZKEVM_API_KEY || "", + avalanche: process.env.SNOWTRACE_API_KEY || "", }, customChains: [ { @@ -287,6 +291,22 @@ const config: HardhatUserConfig = { browserURL: "https://lineascan.build", }, }, + { + network: "zkevm", + chainId: ChainId.ZKEVM, + urls: { + apiURL: "https://api-zkevm.polygonscan.com/api", + browserURL: "https://zkevm.polygonscan.com/", + }, + }, + { + network: "avalanche", + chainId: ChainId.AVALANCHE, + urls: { + apiURL: "https://api.snowtrace.io//api", + browserURL: "https://snowtrace.io/", + }, + }, ], }, networks: { diff --git a/scripts/rpcConfig/constants/disabledDFFeeChains.ts b/scripts/rpcConfig/constants/disabledDFFeeChains.ts index 84f6e58d..98595147 100644 --- a/scripts/rpcConfig/constants/disabledDFFeeChains.ts +++ b/scripts/rpcConfig/constants/disabledDFFeeChains.ts @@ -10,11 +10,11 @@ export const disabledDFFeeChains = [ ChainSlug.MAINNET, ChainSlug.MANTLE, // ChainSlug.HOOK, - ChainSlug.REYA, + // ChainSlug.REYA, ChainSlug.BASE, // ChainSlug.KINTO, // ChainSlug.WINR, ChainSlug.BLAST, // ChainSlug.POLYNOMIAL, - ChainSlug.SYNDR, + // ChainSlug.SYNDR, ];