From 6dcde4cd81139581ceb4e904e4b1c341676a6230 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Fri, 19 Sep 2025 17:57:45 +0530 Subject: [PATCH 1/5] feat: ink and polygon stage --- deployments/dev_verification.json | 118 ++++--------------- deployments/stage_addresses.json | 28 ++++- deployments/stage_verification.json | 168 ++++++++++++++++++++++++++-- hardhat-scripts/config/config.ts | 6 +- 4 files changed, 211 insertions(+), 109 deletions(-) diff --git a/deployments/dev_verification.json b/deployments/dev_verification.json index 8ebf6a1d..3105a93d 100644 --- a/deployments/dev_verification.json +++ b/deployments/dev_verification.json @@ -53,11 +53,7 @@ "0xbDE0D2da12F703Ccd275d721214745BccDCAD124", "Socket", "contracts/protocol/Socket.sol", - [ - 1, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [1, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "56": [ @@ -114,11 +110,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 56, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [56, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "100": [ @@ -175,11 +167,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 100, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [100, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "130": [ @@ -236,11 +224,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 130, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [130, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "137": [ @@ -297,11 +281,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 137, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [137, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "146": [ @@ -358,11 +338,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 146, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [146, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "169": [ @@ -419,11 +395,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 169, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [169, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "484": [ @@ -480,11 +452,7 @@ "0xbDE0D2da12F703Ccd275d721214745BccDCAD124", "Socket", "contracts/protocol/Socket.sol", - [ - 484, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [484, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "747": [ @@ -541,11 +509,7 @@ "0xbDE0D2da12F703Ccd275d721214745BccDCAD124", "Socket", "contracts/protocol/Socket.sol", - [ - 747, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [747, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "999": [ @@ -602,11 +566,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 999, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [999, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "1329": [ @@ -663,11 +623,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 1329, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [1329, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "5000": [ @@ -724,11 +680,7 @@ "0xd8afBbB32706E7544f075151D4666D5B0B1F22CA", "Socket", "contracts/protocol/Socket.sol", - [ - 5000, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [5000, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ], [ "0xeAb2e310A53FD3Fb34C2944690a79DFB2e834F20", @@ -783,11 +735,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 5000, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [5000, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "8453": [], @@ -811,9 +759,7 @@ "0xEd2a3cd034D873096E40C7E2EfB0e5BE99bBbF7a", "PromiseResolver", "contracts/evmx/watcher/PromiseResolver.sol", - [ - "0xCeEc354B7784C667Bd661483Ae30C8d4eBA96e1d" - ] + ["0xCeEc354B7784C667Bd661483Ae30C8d4eBA96e1d"] ], [ "0x2ECF118De0d747980c5d934E78a5746B6b6fD441", @@ -921,11 +867,7 @@ "0x5F77550E3072c913A20B2fbdAb14026fe0E8B450", "Socket", "contracts/protocol/Socket.sol", - [ - 43114, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [43114, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ], [ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", @@ -940,11 +882,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 43114, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [43114, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "57073": [ @@ -1001,11 +939,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 57073, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [57073, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "59144": [ @@ -1062,11 +996,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 59144, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [59144, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "80094": [ @@ -1123,11 +1053,7 @@ "0xaC61f5696e0E2636dA7bD69827380f2Ab41A3C38", "Socket", "contracts/protocol/Socket.sol", - [ - 80094, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [80094, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "84532": [], @@ -1186,11 +1112,7 @@ "0x5e1641B190B71ECCc85b1ECe934F31cD9b3dcF7a", "Socket", "contracts/protocol/Socket.sol", - [ - 747474, - "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", - "EVMX" - ] + [747474, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] ] ], "11155420": [] diff --git a/deployments/stage_addresses.json b/deployments/stage_addresses.json index a5d95c93..f9b011fd 100644 --- a/deployments/stage_addresses.json +++ b/deployments/stage_addresses.json @@ -12,6 +12,19 @@ "1": "0xD78f99D62BeaF0918bB0601C68EB537b6703Ce63" } }, + "137": { + "ContractFactoryPlug": "0x55110083f087730A9c0FFf2379FC5F3356fFc5Bf", + "FastSwitchboard": "0xafaeb27cb9251E3a4260d7BaA548Ec907FDA8221", + "FastSwitchboardId": "1", + "FeesPlug": "0x1BD0acB874f9ce9771a838c662ac1a05ea478f3A", + "Socket": "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "SocketBatcher": "0xeD59644F0B2041dF9d2f341c146FfD413227E57c", + "startBlock": 76640333, + "SUSDC": "0x39Fa4b853e1b67Fd0c3B8CFcc0e156b0e21a5B01", + "SwitchboardIdToAddressMap": { + "1": "0xafaeb27cb9251E3a4260d7BaA548Ec907FDA8221" + } + }, "8453": { "ContractFactoryPlug": "0x2e531e37FdccA3CFd427a593f53f326bd24b8142", "FastSwitchboard": "0xd3009795fFDc64Ee0d23198772a58ca9e53EEd25", @@ -38,7 +51,7 @@ "DeployForwarderImpl": "0xD4DB3AB70EBA19586132686fBD4928809c3e42B4", "ERC1967Factory": "0x945300e92aA450A9aEf1d9FBA7b7Aee45622a082", "FeesManager": "0xB3a34AB69B538d48311656a4b5df56A1423C0075", - "FeesManagerImpl": "0xBe2153E78cc02F87a2652390Bd49481dBc1ccd2E", + "FeesManagerImpl": "0xA5e2a21eA5c59B8E605FA3ba4133e8c69b66A734", "FeesPool": "0xC8d803B7c1719cdF21392405879D1B56398045C4", "PromiseResolver": "0xD5225A5BC7ef3eAc6eb5255776fF5F007C95D03E", "ReadPrecompile": "0xD059D6D64B9dbAE2e56F70CBEc9Af03fd41DaE35", @@ -64,6 +77,19 @@ "1": "0x7E33B305e12aD0E73B3aedBE67A53B7818732d7d" } }, + "57073": { + "ContractFactoryPlug": "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "FastSwitchboard": "0x23DB8c6f2745896287f73a12F75fEa5230836675", + "FastSwitchboardId": "1", + "FeesPlug": "0x9D2394546141e494197Ee9a73AC7e3526Cb3241C", + "Socket": "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "SocketBatcher": "0xa001CF808f6062fdd78Fd971Ed3b24BB51c12ECd", + "startBlock": 24785614, + "SUSDC": "0x11a69F5e870e43832c01c9Ac02b8b6dC9c98A029", + "SwitchboardIdToAddressMap": { + "1": "0x23DB8c6f2745896287f73a12F75fEa5230836675" + } + }, "84532": { "ContractFactoryPlug": "0x24A6Da9bAa5ba4AE8AF411546429b7eD2B29aA48", "FastSwitchboard": "0x7442C13842dC293fce94Bf86116068F8FF62Ecf9", diff --git a/deployments/stage_verification.json b/deployments/stage_verification.json index f1a89c91..1684ee61 100644 --- a/deployments/stage_verification.json +++ b/deployments/stage_verification.json @@ -53,7 +53,72 @@ "0xA944BBe5D4F67a242C9e92d539fF2d55616283a7", "Socket", "contracts/protocol/Socket.sol", - [10, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 10, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] + ] + ], + "137": [ + [ + "0x55110083f087730A9c0FFf2379FC5F3356fFc5Bf", + "ContractFactoryPlug", + "contracts/evmx/plugs/ContractFactoryPlug.sol", + [ + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0x39Fa4b853e1b67Fd0c3B8CFcc0e156b0e21a5B01", + "SUSDC", + "contracts/evmx/plugs/SUSDC.sol", + [ + 18, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "SUSDC", + "SUSDC" + ] + ], + [ + "0x1BD0acB874f9ce9771a838c662ac1a05ea478f3A", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0xafaeb27cb9251E3a4260d7BaA548Ec907FDA8221", + "FastSwitchboard", + "contracts/protocol/switchboard/FastSwitchboard.sol", + [ + 137, + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0xeD59644F0B2041dF9d2f341c146FfD413227E57c", + "SocketBatcher", + "contracts/protocol/SocketBatcher.sol", + [ + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d" + ] + ], + [ + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "Socket", + "contracts/protocol/Socket.sol", + [ + 137, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ], "8453": [ @@ -110,10 +175,20 @@ "0x6EF9c18c1A69417625f4Cb3c634124a71025C3A9", "Socket", "contracts/protocol/Socket.sol", - [8453, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 8453, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ], "14323": [ + [ + "0xA5e2a21eA5c59B8E605FA3ba4133e8c69b66A734", + "FeesManager", + "contracts/evmx/fees/FeesManager.sol", + [] + ], [ "0x62Be6a0eabce7Efb1B9BB065e36b85C63B2101c6", "SchedulePrecompile", @@ -155,7 +230,9 @@ "0xD5225A5BC7ef3eAc6eb5255776fF5F007C95D03E", "PromiseResolver", "contracts/evmx/watcher/PromiseResolver.sol", - ["0xdd4B3431472573dB6dB988E8746a118005328589"] + [ + "0xdd4B3431472573dB6dB988E8746a118005328589" + ] ], [ "0x994DA55f4295B073f1D60B5074cc7f6cD7b11753", @@ -266,7 +343,72 @@ "0x693bcDb114a57302Cd687b8Af1bD7583ee56748C", "Socket", "contracts/protocol/Socket.sol", - [42161, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 42161, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] + ] + ], + "57073": [ + [ + "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", + "ContractFactoryPlug", + "contracts/evmx/plugs/ContractFactoryPlug.sol", + [ + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0x11a69F5e870e43832c01c9Ac02b8b6dC9c98A029", + "SUSDC", + "contracts/evmx/plugs/SUSDC.sol", + [ + 18, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "SUSDC", + "SUSDC" + ] + ], + [ + "0x9D2394546141e494197Ee9a73AC7e3526Cb3241C", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0x23DB8c6f2745896287f73a12F75fEa5230836675", + "FastSwitchboard", + "contracts/protocol/switchboard/FastSwitchboard.sol", + [ + 57073, + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], + [ + "0xa001CF808f6062fdd78Fd971Ed3b24BB51c12ECd", + "SocketBatcher", + "contracts/protocol/SocketBatcher.sol", + [ + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9" + ] + ], + [ + "0x89a4325470b0E5074Eaab640E1863B7bD11a2eA9", + "Socket", + "contracts/protocol/Socket.sol", + [ + 57073, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ], "84532": [ @@ -323,7 +465,11 @@ "0x4861c9EB83d8ba745a184E5a11a50B6be25e4dDb", "Socket", "contracts/protocol/Socket.sol", - [84532, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 84532, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ], "421614": [ @@ -380,7 +526,11 @@ "0x7aA47Ed012c185127edA67f533D91f44391bfC7C", "Socket", "contracts/protocol/Socket.sol", - [421614, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 421614, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ], "11155420": [ @@ -437,7 +587,11 @@ "0x26292db660fbeB0271E11aa4f1d2a2d0c57dc378", "Socket", "contracts/protocol/Socket.sol", - [11155420, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"] + [ + 11155420, + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", + "EVMX" + ] ] ] } diff --git a/hardhat-scripts/config/config.ts b/hardhat-scripts/config/config.ts index b1df1e34..2fe98a6a 100644 --- a/hardhat-scripts/config/config.ts +++ b/hardhat-scripts/config/config.ts @@ -53,7 +53,7 @@ export const getChains = () => { ChainSlug.CAMP, ChainSlug.FLOW, ChainSlug.MANTA_PACIFIC, - ChainSlug.MAINNET + ChainSlug.MAINNET, ]; case DeploymentMode.STAGE: return [ @@ -65,14 +65,14 @@ export const getChains = () => { ChainSlug.BASE, ChainSlug.BASE_SEPOLIA, // ChainSlug.BSC, - // ChainSlug.POLYGON_MAINNET, + ChainSlug.POLYGON_MAINNET, // ChainSlug.AVALANCHE, // ChainSlug.GNOSIS, // ChainSlug.LINEA, // ChainSlug.SONIC, // ChainSlug.KATANA, // ChainSlug.CAMP, - // ChainSlug.INK, + ChainSlug.INK, // ChainSlug.HYPEREVM, // ChainSlug.BERA, // ChainSlug.UNICHAIN, From ea9123fb764405e307ce95e159b0a1d796062dae Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Thu, 2 Oct 2025 15:11:53 +0530 Subject: [PATCH 2/5] fix: hyoerevm gas limit --- contracts/evmx/watcher/precompiles/WritePrecompile.sol | 3 +++ deployments/prod_addresses.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/contracts/evmx/watcher/precompiles/WritePrecompile.sol b/contracts/evmx/watcher/precompiles/WritePrecompile.sol index 49409261..1f6e1f16 100644 --- a/contracts/evmx/watcher/precompiles/WritePrecompile.sol +++ b/contracts/evmx/watcher/precompiles/WritePrecompile.sol @@ -134,6 +134,9 @@ contract WritePrecompile is WritePrecompileStorage, Initializable, Ownable, Watc } else { queueParams_.overrideParams.gasLimit = 10_000_000; // other chains default gas limit } + } else if (queueParams_.transaction.chainSlug == 999) { + // HyperEVM default gas limit + queueParams_.overrideParams.gasLimit = 1_500_000; } // For write precompile, encode the payload parameters diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 468e3a76..3115e474 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -205,7 +205,7 @@ "Watcher": "0x2566Bef2e914c7482d6FCB4955403fb0865951A5", "WatcherImpl": "0x03029500B038980745c5a671f271340CF9AF5830", "WritePrecompile": "0xc6506b1C3f34297B4de32f08d8d50CB0E9e64842", - "WritePrecompileImpl": "0xcd460687fe2a74ddEE8f2E3d791e1df306713353" + "WritePrecompileImpl": "0xb8613c3BfF759Bd4596DBf4e7a57195f08454EFB" }, "42161": { "ContractFactoryPlug": "0x176C18F871b9b0F363cBDF3b5a1872F6069CF538", From 6ce53f6bbd003603d3aac0d0db4eadcaf49dc794 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Wed, 15 Oct 2025 23:55:07 +0530 Subject: [PATCH 3/5] fix: rescue and upgrade fees plugs --- contracts/evmx/fees/Credit.sol | 16 +++ deployments/prod_addresses.json | 42 +++----- deployments/prod_verification.json | 150 +++++++++++++++++++++++++--- deployments/stage_addresses.json | 22 ++-- deployments/stage_verification.json | 9 ++ hardhat-scripts/config/config.ts | 2 +- hardhat-scripts/utils/overrides.ts | 8 +- 7 files changed, 190 insertions(+), 59 deletions(-) diff --git a/contracts/evmx/fees/Credit.sol b/contracts/evmx/fees/Credit.sol index c9234141..67c713d8 100644 --- a/contracts/evmx/fees/Credit.sol +++ b/contracts/evmx/fees/Credit.sol @@ -378,6 +378,22 @@ abstract contract Credit is FeesManagerStorage, Initializable, Ownable, AppGatew ); } + function rescue( + uint32 chainSlug_, + address token_, + uint256 amount_, + uint256 maxFees_, + address receiver_ + ) public onlyOwner{ + // Add it to the queue and submit request + _createRequest( + chainSlug_, + address(this), + maxFees_, + abi.encodeCall(IFeesPlug.withdrawFees, (token_, receiver_, amount_)) + ); + } + function _createRequest( uint32 chainSlug_, address consumeFrom_, diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index 3115e474..ddde4107 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -3,20 +3,18 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 23384432, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": { - "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" - } + "SwitchboardIdToAddressMap": {} }, "10": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 141266670, @@ -55,7 +53,7 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 27383897, @@ -68,7 +66,7 @@ "ContractFactoryPlug": "0x9e95545a13351aA79096839738d0B09434804D03", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", + "FeesPlug": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 76569494, @@ -81,7 +79,7 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 47181499, @@ -133,20 +131,18 @@ "ContractFactoryPlug": "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b", "FastSwitchboard": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "FastSwitchboardId": "1", - "FeesPlug": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", + "FeesPlug": "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d", "Socket": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "SocketBatcher": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "startBlock": 14120257, "SUSDC": "0xd90a33b0414F5C0De5F315428190598945BbEde2", - "SwitchboardIdToAddressMap": { - "1": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15" - } + "SwitchboardIdToAddressMap": {} }, "1329": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 168597971, @@ -172,14 +168,12 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 35670115, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": { - "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" - } + "SwitchboardIdToAddressMap": {} }, "12921": { "AddressResolver": "0x3d6EB76db49BF4b9aAf01DBB79fCEC2Ee71e44e2", @@ -194,7 +188,7 @@ "DeployForwarderImpl": "0xf05f680E0611b81eD0255A1Cd829540504765711", "ERC1967Factory": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FeesManager": "0xB63ab15c208A16a0480036C06e8828A4682E0B34", - "FeesManagerImpl": "0x9f3CDba2262DF94e415E092A4228ee7E6846ea1b", + "FeesManagerImpl": "0x22D99b38e32198D5C09C01AF872C6dBc0c875E92", "FeesPool": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "PromiseResolver": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC", "ReadPrecompile": "0x74D52027137a450b68315478AAE4528Ba839ea13", @@ -211,27 +205,23 @@ "ContractFactoryPlug": "0x176C18F871b9b0F363cBDF3b5a1872F6069CF538", "FastSwitchboard": "0xb3A5132Df72F1597ab474d73d387ecF8647af669", "FastSwitchboardId": "1", - "FeesPlug": "0x168d7bAb883a6430F0200bcaaFAf080371477B3D", + "FeesPlug": "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505", "Socket": "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b", "SocketBatcher": "0x9e95545a13351aA79096839738d0B09434804D03", "startBlock": 380165474, "SUSDC": "0x6d5B9B5aeC995F0CeE2dfbba3bdCc70698F2600d", - "SwitchboardIdToAddressMap": { - "1": "0xb3A5132Df72F1597ab474d73d387ecF8647af669" - } + "SwitchboardIdToAddressMap": {} }, "43114": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 68887506, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": { - "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" - } + "SwitchboardIdToAddressMap": {} }, "57073": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", diff --git a/deployments/prod_verification.json b/deployments/prod_verification.json index f95b60e8..e824acec 100644 --- a/deployments/prod_verification.json +++ b/deployments/prod_verification.json @@ -1,11 +1,70 @@ { - "1": [], - "10": [], + "1": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], + "10": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], "56": [], "100": [], - "130": [], - "137": [], - "146": [], + "130": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ], + [ + "0x79bB063eC647A51904d4Cf4c26144606A945bb32", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C" + ] + ] + ], + "137": [ + [ + "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], + "146": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], "169": [ [ "0xd90a33b0414F5C0De5F315428190598945BbEde2", @@ -60,7 +119,11 @@ "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "Socket", "contracts/protocol/Socket.sol", - [169, "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", "EVMX"] + [ + 169, + "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", + "EVMX" + ] ] ], "484": [], @@ -118,11 +181,35 @@ "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "Socket", "contracts/protocol/Socket.sol", - [747, "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", "EVMX"] + [ + 747, + "0x7BD61c667f869FB21b77626f0Ac0ACEE51e4BE7C", + "EVMX" + ] + ] + ], + "999": [ + [ + "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], + "1329": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] ] ], - "999": [], - "1329": [], "5000": [ [ "0xb8Bd628646BFfE5632B462F213F97DE038dBD8b2", @@ -135,10 +222,47 @@ ] ] ], - "8453": [], - "12921": [], - "42161": [], - "43114": [], + "8453": [ + [ + "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], + "12921": [ + [ + "0x22D99b38e32198D5C09C01AF872C6dBc0c875E92", + "FeesManager", + "contracts/evmx/fees/FeesManager.sol", + [] + ] + ], + "42161": [ + [ + "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], + "43114": [ + [ + "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", + "0xaFC48F060536BE516D5961F4dd7E3dbAF3615C23" + ] + ] + ], "57073": [], "59144": [], "80094": [], diff --git a/deployments/stage_addresses.json b/deployments/stage_addresses.json index 1c654f8b..40b9ae24 100644 --- a/deployments/stage_addresses.json +++ b/deployments/stage_addresses.json @@ -8,9 +8,7 @@ "SocketBatcher": "0x06234dB2D69Ac158793a3ce59c3764422028E964", "startBlock": 141180188, "SUSDC": "0x6D54668ba18B425a1DbFC0BD720145c0aeE97f65", - "SwitchboardIdToAddressMap": { - "1": "0xD78f99D62BeaF0918bB0601C68EB537b6703Ce63" - } + "SwitchboardIdToAddressMap": {} }, "137": { "ContractFactoryPlug": "0x55110083f087730A9c0FFf2379FC5F3356fFc5Bf", @@ -34,9 +32,7 @@ "SocketBatcher": "0x356DBc19C69832010f92c963a8Ded6b5f9deeaCe", "startBlock": 35584928, "SUSDC": "0x900Cf1914Adcee43Cb1A69c042ded801Cd5051Ef", - "SwitchboardIdToAddressMap": { - "1": "0xd3009795fFDc64Ee0d23198772a58ca9e53EEd25" - } + "SwitchboardIdToAddressMap": {} }, "14323": { "AddressResolver": "0xE4C438c46b9dB51e298A1F65151eDe8418be009A", @@ -73,9 +69,7 @@ "SocketBatcher": "0x0d7994B4aAc7cbdFAFEAED0B9B51E7de0586ec6f", "startBlock": 379484006, "SUSDC": "0x0c17822dcC44F8202F176a4960EAC8da8FDbfCA5", - "SwitchboardIdToAddressMap": { - "1": "0x7E33B305e12aD0E73B3aedBE67A53B7818732d7d" - } + "SwitchboardIdToAddressMap": {} }, "57073": { "ContractFactoryPlug": "0xbb43cF33A4eA5f5A8Bc95297e3E614A40fdcCD3d", @@ -94,14 +88,12 @@ "ContractFactoryPlug": "0x24A6Da9bAa5ba4AE8AF411546429b7eD2B29aA48", "FastSwitchboard": "0x7442C13842dC293fce94Bf86116068F8FF62Ecf9", "FastSwitchboardId": "1", - "FeesPlug": "0x5cdcD147A01Fc29C20c2061a89faF01F20363A20", + "FeesPlug": "0x788dA894736D9501B022D5bB3648763F252ec0E6", "Socket": "0x4861c9EB83d8ba745a184E5a11a50B6be25e4dDb", "SocketBatcher": "0x5132751743cD59DB406A043d9983984E52Ca2cD5", "startBlock": 31095773, "SUSDC": "0x99D946bB805adba0233956E475bf70ED09d50d40", - "SwitchboardIdToAddressMap": { - "1": "0x7442C13842dC293fce94Bf86116068F8FF62Ecf9" - } + "SwitchboardIdToAddressMap": {} }, "421614": { "ContractFactoryPlug": "0x5B6ed8Aaa52643d1d2d3409398e30b4eAdC767f2", @@ -125,8 +117,6 @@ "SocketBatcher": "0xaA02a6FdA809cF11c4e26a82AcfE7666204736A0", "startBlock": 33078325, "SUSDC": "0x3039AC5cC80C531c682045278f92439D740fa62B", - "SwitchboardIdToAddressMap": { - "1": "0xbE5CB1cf4e049F124B868DebF15d9B04ce0817b3" - } + "SwitchboardIdToAddressMap": {} } } diff --git a/deployments/stage_verification.json b/deployments/stage_verification.json index 757bd77d..143efdbc 100644 --- a/deployments/stage_verification.json +++ b/deployments/stage_verification.json @@ -308,6 +308,15 @@ ] ], "84532": [ + [ + "0x788dA894736D9501B022D5bB3648763F252ec0E6", + "FeesPlug", + "contracts/evmx/plugs/FeesPlug.sol", + [ + "0x4861c9EB83d8ba745a184E5a11a50B6be25e4dDb", + "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18" + ] + ], [ "0x99D946bB805adba0233956E475bf70ED09d50d40", "SUSDC", diff --git a/hardhat-scripts/config/config.ts b/hardhat-scripts/config/config.ts index f6eb1e45..0cf4686c 100644 --- a/hardhat-scripts/config/config.ts +++ b/hardhat-scripts/config/config.ts @@ -76,7 +76,7 @@ const MODE_CONFIGS: Record = { chains: [ // ChainSlug.MAINNET, ChainSlug.ARBITRUM, - ChainSlug.ARBITRUM_SEPOLIA, + // ChainSlug.ARBITRUM_SEPOLIA, ChainSlug.OPTIMISM, ChainSlug.OPTIMISM_SEPOLIA, ChainSlug.BASE, diff --git a/hardhat-scripts/utils/overrides.ts b/hardhat-scripts/utils/overrides.ts index dc4c17d2..0e5345cd 100644 --- a/hardhat-scripts/utils/overrides.ts +++ b/hardhat-scripts/utils/overrides.ts @@ -29,6 +29,9 @@ export const chainOverrides: { gasLimit: 3_000_000, // gasPrice: 200_000_000, }, + [ChainSlug.SONIC]: { + gasLimit: 2_000_000, + }, [ChainSlug.BSC]: { gasLimit: 6_000_000, }, @@ -38,10 +41,9 @@ export const chainOverrides: { }, [ChainSlug.POLYGON_MAINNET]: { - gasPriceMultiplier: 2, - gasLimit: 3_000_000, + // gasPriceMultiplier: 2, + gasLimit: 3_00_000, }, - [ChainSlug.SEPOLIA]: { type: 1, gasLimit: 2_000_000, From 73f5e089633caacfaa54c0ee3754fd462a0f9186 Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Thu, 16 Oct 2025 00:16:29 +0530 Subject: [PATCH 4/5] feat: v2 fees plug --- deployments/prod_addresses.json | 60 ++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json index ddde4107..40a94f0c 100644 --- a/deployments/prod_addresses.json +++ b/deployments/prod_addresses.json @@ -3,18 +3,22 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 23384432, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": {} + "SwitchboardIdToAddressMap": { + "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" + } }, "10": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 141266670, @@ -28,6 +32,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 61510453, @@ -41,6 +46,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 42253473, @@ -53,7 +59,8 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 27383897, @@ -66,7 +73,8 @@ "ContractFactoryPlug": "0x9e95545a13351aA79096839738d0B09434804D03", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", + "FeesPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", + "FeesPlugV2": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 76569494, @@ -79,7 +87,8 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 47181499, @@ -93,6 +102,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 6390809, @@ -106,6 +116,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 6737511, @@ -119,6 +130,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 40559259, @@ -131,18 +143,22 @@ "ContractFactoryPlug": "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b", "FastSwitchboard": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "FastSwitchboardId": "1", - "FeesPlug": "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d", + "FeesPlug": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", + "FeesPlugV2": "0x3dcbbcbD412aFaA0C1c46eb853Fd4DA363306C3d", "Socket": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "SocketBatcher": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "startBlock": 14120257, "SUSDC": "0xd90a33b0414F5C0De5F315428190598945BbEde2", - "SwitchboardIdToAddressMap": {} + "SwitchboardIdToAddressMap": { + "1": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15" + } }, "1329": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 168597971, @@ -156,6 +172,7 @@ "FastSwitchboard": "0x2277CF90Ce1cfE33b9576Ec06D9C4d053ee5f882", "FastSwitchboardId": "1", "FeesPlug": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC", + "FeesPlugV2": "0xFB349dcc5A1cB87Ff3A2b91C343814647AE820FC", "Socket": "0xb8Bd628646BFfE5632B462F213F97DE038dBD8b2", "SocketBatcher": "0x334A27A9aBe4413CD3fE7EF777196eE0568b29D4", "startBlock": 85006520, @@ -168,12 +185,15 @@ "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x37db801a12F45300f768F88eb03Bdfb0769e8d1A", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 35670115, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": {} + "SwitchboardIdToAddressMap": { + "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" + } }, "12921": { "AddressResolver": "0x3d6EB76db49BF4b9aAf01DBB79fCEC2Ee71e44e2", @@ -205,29 +225,36 @@ "ContractFactoryPlug": "0x176C18F871b9b0F363cBDF3b5a1872F6069CF538", "FastSwitchboard": "0xb3A5132Df72F1597ab474d73d387ecF8647af669", "FastSwitchboardId": "1", - "FeesPlug": "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505", + "FeesPlug": "0x168d7bAb883a6430F0200bcaaFAf080371477B3D", + "FeesPlugV2": "0xd4f7d5FeBaBF681f86dD185b77a4053CDd5Fe505", "Socket": "0xdb6d9dB6e4190a63FD3c50Af51785a9c3BB4080b", "SocketBatcher": "0x9e95545a13351aA79096839738d0B09434804D03", "startBlock": 380165474, "SUSDC": "0x6d5B9B5aeC995F0CeE2dfbba3bdCc70698F2600d", - "SwitchboardIdToAddressMap": {} + "SwitchboardIdToAddressMap": { + "1": "0xb3A5132Df72F1597ab474d73d387ecF8647af669" + } }, "43114": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", - "FeesPlug": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", + "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0xcAB06809015A7664E32F27A6F38BF3C902AFdDF9", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 68887506, "SUSDC": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", - "SwitchboardIdToAddressMap": {} + "SwitchboardIdToAddressMap": { + "1": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA" + } }, "57073": { "ContractFactoryPlug": "0xd90a33b0414F5C0De5F315428190598945BbEde2", "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 24633467, @@ -241,6 +268,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 23661748, @@ -254,6 +282,7 @@ "FastSwitchboard": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "FastSwitchboardId": "1", "FeesPlug": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", + "FeesPlugV2": "0xe37aFa3Aa95E153B8dD0FE8456CBF345cB4C51F7", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "startBlock": 10646345, @@ -267,6 +296,7 @@ "FastSwitchboard": "0x4023941D9AB563b1c4d447B3f2A9dd2F1eF19fCA", "FastSwitchboardId": "1", "FeesPlug": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", + "FeesPlugV2": "0x3B1f4ABA1667EeB992B623E7c6d119728cEd3b15", "Socket": "0xB94742B094f89A8D53e15A45CdBf9810a5B090Eb", "SocketBatcher": "0x20BB708875C3E99cbBD7239CeeB2670b795F4829", "startBlock": 11389173, From 367256ac295d50fb07fc9b10650b477e26c09f2d Mon Sep 17 00:00:00 2001 From: Ameesha Agrawal Date: Fri, 31 Oct 2025 18:47:54 +0530 Subject: [PATCH 5/5] fix: pol currency --- src/chain-enums/currency.ts | 4 ++-- src/chain-enums/native-tokens.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/chain-enums/currency.ts b/src/chain-enums/currency.ts index ef05435f..51ab10fd 100644 --- a/src/chain-enums/currency.ts +++ b/src/chain-enums/currency.ts @@ -3,7 +3,7 @@ import { NativeTokens } from "./native-tokens"; export const Currency = { [ChainSlug.BSC]: NativeTokens.BINANCECOIN, - [ChainSlug.POLYGON_MAINNET]: NativeTokens.MATIC_NETWORK, + [ChainSlug.POLYGON_MAINNET]: NativeTokens.POLYGON_ECOSYSTEM_TOKEN, [ChainSlug.SX_NETWORK_TESTNET]: NativeTokens.SX_NETWORK_2, [ChainSlug.SX_NETWORK]: NativeTokens.SX_NETWORK_2, [ChainSlug.MANTLE]: NativeTokens.MANTLE, @@ -16,7 +16,7 @@ export const Currency = { [ChainSlug.AVALANCHE]: NativeTokens.AVALANCHE_2, [ChainSlug.XLAYER]: NativeTokens.OKB, [ChainSlug.POLTER_TESTNET]: NativeTokens.AAVEGOTCHI, - [ChainSlug.POLYGON_AMOY]: NativeTokens.MATIC_NETWORK, + [ChainSlug.POLYGON_AMOY]: NativeTokens.POLYGON_ECOSYSTEM_TOKEN, [ChainSlug.OPBNB]: NativeTokens.BINANCECOIN, [ChainSlug.GEIST]: NativeTokens.AAVEGOTCHI, [ChainSlug.SONIC]: NativeTokens.SONIC_3, diff --git a/src/chain-enums/native-tokens.ts b/src/chain-enums/native-tokens.ts index 48e8c3e7..2f891b31 100644 --- a/src/chain-enums/native-tokens.ts +++ b/src/chain-enums/native-tokens.ts @@ -1,7 +1,6 @@ // add coingecko token id here export enum NativeTokens { ETHEREUM = "ethereum", - MATIC_NETWORK = "matic-network", BINANCECOIN = "binancecoin", SX_NETWORK_2 = "sx-network-2", MANTLE = "mantle",