From 210a1d62e2bb35a3c3bc57fceb59adf1136289f2 Mon Sep 17 00:00:00 2001 From: hernandp Date: Thu, 26 Dec 2024 17:40:40 -0300 Subject: [PATCH 1/5] FIles for Berachain deployment. --- .../relayer/config/testnet/chains.json | 14 ++++++++-- .../relayer/config/testnet/contracts.json | 28 +++++++++++++++++++ .../configureDeliveryProvider.json | 25 +++++++++++++++++ .../initializeDeliveryProvider.json | 11 ++++++++ .../ts-scripts/relayer/helpers/deployments.ts | 3 ++ .../relayer/shell/verifyCreate2Factory.sh | 7 +++++ 6 files changed, 85 insertions(+), 3 deletions(-) diff --git a/ethereum/ts-scripts/relayer/config/testnet/chains.json b/ethereum/ts-scripts/relayer/config/testnet/chains.json index 6ddff910fc..a0780c99e0 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/chains.json +++ b/ethereum/ts-scripts/relayer/config/testnet/chains.json @@ -2,12 +2,13 @@ "guardianSetIndex": 0, "description": "This file contains the chains against which all the scripts should run.", "useLastRun": true, + "operatingChains": [39], "chains": [ { "description": "BSC Testnet", "evmNetworkId": 97, "chainId": 4, - "rpc": "https://bsc-testnet.blockpi.network/v1/rpc/public", + "rpc": "https://data-seed-prebsc-2-s1.bnbchain.org:8545", "wormholeAddress": "0x68605AD7b15c732a30b1BbC62BE8F2A509D74b4D" }, { @@ -38,6 +39,13 @@ "rpc": "https://rpc.testnet.moonbeam.network", "wormholeAddress": "0xa5B7D85a8f27dd7907dc8FdC21FA5657D5E2F901" }, + { + "description": "Berachain bArtio", + "evmNetworkId": 80084, + "chainId": 39, + "rpc": "https://bartio.rpc.berachain.com", + "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" + }, { "description": "Ethereum Sepolia", "evmNetworkId": 11155111, @@ -49,7 +57,7 @@ "description": "Arbitrum Sepolia", "evmNetworkId": 421614, "chainId": 10003, - "rpc": "https://sepolia-rollup.arbitrum.io/rpc", + "rpc": "https://api.zan.top/arb-sepolia", "wormholeAddress": "0x6b9C8671cdDC8dEab9c719bB87cBd3e782bA6a35" }, { @@ -70,7 +78,7 @@ "description": "Monad Devnet", "evmNetworkId": 41454, "chainId": 10008, - "rpc": "https://devnet1.monad.xyz/rpc/your_api_key", + "rpc": "https://devnet1.monad.xyz/rpc/IqLeQXELOAhGolixSOVzq87hhCK3UeQK3NBwNTTN", "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" } ] diff --git a/ethereum/ts-scripts/relayer/config/testnet/contracts.json b/ethereum/ts-scripts/relayer/config/testnet/contracts.json index 07494eb093..b0c52b5df8 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/contracts.json +++ b/ethereum/ts-scripts/relayer/config/testnet/contracts.json @@ -61,6 +61,10 @@ { "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", "chainId": 10008 + }, + { + "address": "0xECa55749fe6AD6E655DcEdEd3C75102C653cf651", + "chainId": 39 } ], "wormholeRelayers": [ @@ -123,6 +127,10 @@ { "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", "chainId": 10008 + }, + { + "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", + "chainId": 39 } ], "wormholeRelayerImplementations": [ @@ -185,6 +193,10 @@ { "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", "chainId": 10008 + }, + { + "address": "0xceC913f7Db03ca677F779Ce918CF0c59D05D9217", + "chainId": 39 } ], "mockIntegrations": [ @@ -227,6 +239,10 @@ { "address": "0xa507Ff8D183D2BEcc9Ff9F82DFeF4b074e1d0E05", "chainId": 10008 + }, + { + "address": "0x4BD5B6F2d001D1547801F49270f2Df96Ab362b3C", + "chainId": 39 } ], "create2Factories": [ @@ -289,18 +305,30 @@ { "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", "chainId": 10008 + }, + { + "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", + "chainId": 39 } ], "deliveryProviderImplementations": [ { "address": "0x401d3A2ec0a071e2A8f8Fc9B4C69313C1a04540c", "chainId": 10008 + }, + { + "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", + "chainId": 39 } ], "deliveryProviderSetups": [ { "address": "0xedd08D4363820603fb1B261F7667B8ee170c37a5", "chainId": 10008 + }, + { + "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", + "chainId": 39 } ] } \ No newline at end of file diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json index e5ccbf2228..fdab7203d5 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json @@ -25,6 +25,11 @@ "updatePriceGas": "10000000000", "updatePriceNative": "100000" }, + { + "chainId": 39, + "updatePriceGas": "10000000000", + "updatePriceNative": "100000" + }, { "chainId": 10002, "updatePriceGas": "30000000000", @@ -72,6 +77,10 @@ "chainId": 16, "updateGasOverhead": "350000" }, + { + "chainId": 39, + "updateGasOverhead": "350000" + }, { "chainId": 10002, "updateGasOverhead": "350000" @@ -114,6 +123,10 @@ "chainId": 16, "updateMaximumBudget": "2000000000000000000" }, + { + "chainId": 39, + "updateMaximumBudget": "2000000000000000000" + }, { "chainId": 10002, "updateMaximumBudget": "2000000000000000000" @@ -162,6 +175,10 @@ "chainId": 16, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 39, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 10002, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -244,6 +261,10 @@ "chainId": 37, "isSupported": true }, + { + "chainId": 39, + "isSupported": true + }, { "chainId": 43, "isSupported": true @@ -330,6 +351,10 @@ "chainId": 37, "supportedKeys": ["vaa"] }, + { + "chainId": 39, + "supportedKeys": ["vaa"] + }, { "chainId": 43, "supportedKeys": ["vaa"] diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json index 9c31d988b8..318df7e23e 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json @@ -40,6 +40,10 @@ "chainId": 30, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 39, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 10002, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -132,6 +136,13 @@ "updatePriceNative": "200000", "maximumBudget": "1000000000000000000" }, + { + "chainId": 39, + "deliverGasOverhead": "350000", + "updatePriceGas": "30000000000", + "updatePriceNative": "200000", + "maximumBudget": "1000000000000000000" + }, { "chainId": 10002, "deliverGasOverhead": "350000", diff --git a/ethereum/ts-scripts/relayer/helpers/deployments.ts b/ethereum/ts-scripts/relayer/helpers/deployments.ts index 2aad3d6ea0..0a0ff70059 100644 --- a/ethereum/ts-scripts/relayer/helpers/deployments.ts +++ b/ethereum/ts-scripts/relayer/helpers/deployments.ts @@ -338,6 +338,9 @@ export async function buildOverrides( overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.000000001", "gwei"); } else if (chain.chainId === 37) { overrides.type = 0; + } else if (chain.chainId === 39) { + overrides.type = 2; + overrides.maxPriorityFeePerGas = 0; } else if (chain.chainId === 45) { overrides.type = 2; overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.0001", "gwei"); diff --git a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh index 5e756154b2..cdc51197e8 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh @@ -78,6 +78,13 @@ for chain in $chain_ids $create2_factory_address contracts/relayer/create2Factory/Create2Factory.sol:Create2Factory forge verify-contract --verifier oklink --verifier-url $xlayer_explorer_url --watch \ $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init + else if test $chain -eq 39 + set berachain_artio_verifier_url "https://api.routescan.io/v2/network/testnet/evm/80084/etherscan" + + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $create2_factory_address contracts/relayer/create2Factory/Create2Factory.sol:Create2Factory + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init else forge verify-contract --watch \ $create2_factory_address contracts/relayer/create2Factory/Create2Factory.sol:Create2Factory From 3b9769cebf8c760a933c87421b542ece051e99c8 Mon Sep 17 00:00:00 2001 From: hernandp Date: Fri, 27 Dec 2024 12:41:39 -0300 Subject: [PATCH 2/5] Entries for Ink deployment. --- .../relayer/config/testnet/chains.json | 10 +++++-- .../relayer/config/testnet/contracts.json | 28 +++++++++++++++++++ .../configureDeliveryProvider.json | 25 +++++++++++++++++ .../initializeDeliveryProvider.json | 11 ++++++++ .../ts-scripts/relayer/helpers/deployments.ts | 4 +++ .../relayer/shell/verifyCreate2Factory.sh | 12 +++++++- 6 files changed, 87 insertions(+), 3 deletions(-) diff --git a/ethereum/ts-scripts/relayer/config/testnet/chains.json b/ethereum/ts-scripts/relayer/config/testnet/chains.json index a0780c99e0..c5893ac541 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/chains.json +++ b/ethereum/ts-scripts/relayer/config/testnet/chains.json @@ -2,7 +2,6 @@ "guardianSetIndex": 0, "description": "This file contains the chains against which all the scripts should run.", "useLastRun": true, - "operatingChains": [39], "chains": [ { "description": "BSC Testnet", @@ -46,6 +45,13 @@ "rpc": "https://bartio.rpc.berachain.com", "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" }, + { + "description": "Ink", + "evmNetworkId": 763373, + "chainId": 46, + "rpc": "https://rpc-gel-sepolia.inkonchain.com", + "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" + }, { "description": "Ethereum Sepolia", "evmNetworkId": 11155111, @@ -57,7 +63,7 @@ "description": "Arbitrum Sepolia", "evmNetworkId": 421614, "chainId": 10003, - "rpc": "https://api.zan.top/arb-sepolia", + "rpc": "https://arbitrum-sepolia-rpc.publicnode.com", "wormholeAddress": "0x6b9C8671cdDC8dEab9c719bB87cBd3e782bA6a35" }, { diff --git a/ethereum/ts-scripts/relayer/config/testnet/contracts.json b/ethereum/ts-scripts/relayer/config/testnet/contracts.json index b0c52b5df8..a78c6ed07b 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/contracts.json +++ b/ethereum/ts-scripts/relayer/config/testnet/contracts.json @@ -65,6 +65,10 @@ { "address": "0xECa55749fe6AD6E655DcEdEd3C75102C653cf651", "chainId": 39 + }, + { + "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", + "chainId": 46 } ], "wormholeRelayers": [ @@ -131,6 +135,10 @@ { "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", "chainId": 39 + }, + { + "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", + "chainId": 46 } ], "wormholeRelayerImplementations": [ @@ -197,6 +205,10 @@ { "address": "0xceC913f7Db03ca677F779Ce918CF0c59D05D9217", "chainId": 39 + }, + { + "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", + "chainId": 46 } ], "mockIntegrations": [ @@ -243,6 +255,10 @@ { "address": "0x4BD5B6F2d001D1547801F49270f2Df96Ab362b3C", "chainId": 39 + }, + { + "address": "0xa507Ff8D183D2BEcc9Ff9F82DFeF4b074e1d0E05", + "chainId": 46 } ], "create2Factories": [ @@ -309,6 +325,10 @@ { "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", "chainId": 39 + }, + { + "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", + "chainId": 46 } ], "deliveryProviderImplementations": [ @@ -319,6 +339,10 @@ { "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", "chainId": 39 + }, + { + "address": "0x401d3A2ec0a071e2A8f8Fc9B4C69313C1a04540c", + "chainId": 46 } ], "deliveryProviderSetups": [ @@ -329,6 +353,10 @@ { "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", "chainId": 39 + }, + { + "address": "0xedd08D4363820603fb1B261F7667B8ee170c37a5", + "chainId": 46 } ] } \ No newline at end of file diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json index fdab7203d5..3a88479e19 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json @@ -30,6 +30,11 @@ "updatePriceGas": "10000000000", "updatePriceNative": "100000" }, + { + "chainId": 46, + "updatePriceGas": "10000000000", + "updatePriceNative": "100000" + }, { "chainId": 10002, "updatePriceGas": "30000000000", @@ -81,6 +86,10 @@ "chainId": 39, "updateGasOverhead": "350000" }, + { + "chainId": 46, + "updateGasOverhead": "350000" + }, { "chainId": 10002, "updateGasOverhead": "350000" @@ -127,6 +136,10 @@ "chainId": 39, "updateMaximumBudget": "2000000000000000000" }, + { + "chainId": 46, + "updateMaximumBudget": "2000000000000000000" + }, { "chainId": 10002, "updateMaximumBudget": "2000000000000000000" @@ -179,6 +192,10 @@ "chainId": 39, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 46, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 10002, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -269,6 +286,10 @@ "chainId": 43, "isSupported": true }, + { + "chainId": 46, + "isSupported": true + }, { "chainId": 10002, "isSupported": true @@ -359,6 +380,10 @@ "chainId": 43, "supportedKeys": ["vaa"] }, + { + "chainId": 46, + "supportedKeys": ["vaa"] + }, { "chainId": 10002, "supportedKeys": ["vaa", "cctp"] diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json index 318df7e23e..9777dd07ed 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json @@ -44,6 +44,10 @@ "chainId": 39, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 46, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 10002, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -143,6 +147,13 @@ "updatePriceNative": "200000", "maximumBudget": "1000000000000000000" }, + { + "chainId": 46, + "deliverGasOverhead": "350000", + "updatePriceGas": "30000000000", + "updatePriceNative": "200000", + "maximumBudget": "1000000000000000000" + }, { "chainId": 10002, "deliverGasOverhead": "350000", diff --git a/ethereum/ts-scripts/relayer/helpers/deployments.ts b/ethereum/ts-scripts/relayer/helpers/deployments.ts index 0a0ff70059..6eaa135a4c 100644 --- a/ethereum/ts-scripts/relayer/helpers/deployments.ts +++ b/ethereum/ts-scripts/relayer/helpers/deployments.ts @@ -345,6 +345,10 @@ export async function buildOverrides( overrides.type = 2; overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.0001", "gwei"); overrides.maxFeePerGas = ethers.utils.parseUnits("0.001", "gwei"); + } else if (chain.chainId === 46) { + overrides.type = 2; + overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.0001", "gwei");; + overrides.maxFeePerGas = ethers.utils.parseUnits("0.001", "gwei"); } return overrides; } diff --git a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh index cdc51197e8..e0707e4ecd 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh @@ -21,7 +21,7 @@ set contracts_file "ts-scripts/relayer/config/$ENV/contracts.json" set chain_ids (string split \n --no-empty -- (jq '.chains[] | .chainId' $chains_file)) -for chain in $chain_ids +for chain in 46 # Klaytn, Karura and Acala don't have a verification API yet if test 11 -le $chain && test $chain -le 13 continue @@ -71,6 +71,16 @@ for chain in $chain_ids forge verify-contract --verifier blockscout --verifier-url $monad_devnet_explorer_url --watch \ --rpc-url $monad_devnet_rpc_url \ $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init + else if test $chain -eq 46 + set ink_sepolia_explorer_url "https://explorer-sepolia.inkonchain.com/api/" + set ink_sepolia_rpc_url "https://explorer-sepolia.inkonchain.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $create2_factory_address contracts/relayer/create2Factory/Create2Factory.sol:Create2Factory + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init else if test $chain -eq 37 set xlayer_explorer_url "https://www.oklink.com/api/v5/explorer/contract/verify-source-code-plugin/XLAYER" From e839a4cf2818767dd7940fc30cda70a99badf648 Mon Sep 17 00:00:00 2001 From: hernandp Date: Sat, 28 Dec 2024 12:45:56 -0300 Subject: [PATCH 3/5] Unichain Sepolia SR deployment files --- .../relayer/config/testnet/chains.json | 8 ++++ .../relayer/config/testnet/contracts.json | 28 ++++++++++++ .../configureDeliveryProvider.json | 25 +++++++++++ .../initializeDeliveryProvider.json | 11 +++++ .../ts-scripts/relayer/helpers/deployments.ts | 4 ++ .../relayer/shell/verifyCreate2Factory.sh | 12 ++++- .../relayer/shell/verifyDeliveryProvider.sh | 36 +++++++++++++++ .../relayer/shell/verifyWormholeRelayer.sh | 44 ++++++++++++++++++- 8 files changed, 166 insertions(+), 2 deletions(-) diff --git a/ethereum/ts-scripts/relayer/config/testnet/chains.json b/ethereum/ts-scripts/relayer/config/testnet/chains.json index c5893ac541..b85d8f55d5 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/chains.json +++ b/ethereum/ts-scripts/relayer/config/testnet/chains.json @@ -2,6 +2,7 @@ "guardianSetIndex": 0, "description": "This file contains the chains against which all the scripts should run.", "useLastRun": true, + "operatingChains": [10002, 10003, 10004, 10005, 10008], "chains": [ { "description": "BSC Testnet", @@ -45,6 +46,13 @@ "rpc": "https://bartio.rpc.berachain.com", "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" }, + { + "description": "Unichain Sepolia", + "evmNetworkId": 1301, + "chainId": 44, + "rpc": "https://sepolia.unichain.org", + "wormholeAddress": "0xBB73cB66C26740F31d1FabDC6b7A46a038A300dd" + }, { "description": "Ink", "evmNetworkId": 763373, diff --git a/ethereum/ts-scripts/relayer/config/testnet/contracts.json b/ethereum/ts-scripts/relayer/config/testnet/contracts.json index a78c6ed07b..0f006e58a7 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/contracts.json +++ b/ethereum/ts-scripts/relayer/config/testnet/contracts.json @@ -69,6 +69,10 @@ { "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", "chainId": 46 + }, + { + "address": "0x7A0a53847776f7e94Cc35742971aCb2217b0Db81", + "chainId": 44 } ], "wormholeRelayers": [ @@ -139,6 +143,10 @@ { "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", "chainId": 46 + }, + { + "address": "0x362fca37E45fe1096b42021b543f462D49a5C8df", + "chainId": 44 } ], "wormholeRelayerImplementations": [ @@ -209,6 +217,10 @@ { "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", "chainId": 46 + }, + { + "address": "0x00337a31aEE3Ed37f5D5FBF892031d0090Da2EeF", + "chainId": 44 } ], "mockIntegrations": [ @@ -259,6 +271,10 @@ { "address": "0xa507Ff8D183D2BEcc9Ff9F82DFeF4b074e1d0E05", "chainId": 46 + }, + { + "address": "0xa507Ff8D183D2BEcc9Ff9F82DFeF4b074e1d0E05", + "chainId": 44 } ], "create2Factories": [ @@ -329,6 +345,10 @@ { "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", "chainId": 46 + }, + { + "address": "0xe9918f582A972613aC5700d2346a97B8ebAd48a2", + "chainId": 44 } ], "deliveryProviderImplementations": [ @@ -343,6 +363,10 @@ { "address": "0x401d3A2ec0a071e2A8f8Fc9B4C69313C1a04540c", "chainId": 46 + }, + { + "address": "0x401d3A2ec0a071e2A8f8Fc9B4C69313C1a04540c", + "chainId": 44 } ], "deliveryProviderSetups": [ @@ -357,6 +381,10 @@ { "address": "0xedd08D4363820603fb1B261F7667B8ee170c37a5", "chainId": 46 + }, + { + "address": "0xedd08D4363820603fb1B261F7667B8ee170c37a5", + "chainId": 44 } ] } \ No newline at end of file diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json index 3a88479e19..99b0e07fa8 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/configureDeliveryProvider.json @@ -30,6 +30,11 @@ "updatePriceGas": "10000000000", "updatePriceNative": "100000" }, + { + "chainId": 44, + "updatePriceGas": "10000000000", + "updatePriceNative": "100000" + }, { "chainId": 46, "updatePriceGas": "10000000000", @@ -86,6 +91,10 @@ "chainId": 39, "updateGasOverhead": "350000" }, + { + "chainId": 44, + "updateGasOverhead": "350000" + }, { "chainId": 46, "updateGasOverhead": "350000" @@ -136,6 +145,10 @@ "chainId": 39, "updateMaximumBudget": "2000000000000000000" }, + { + "chainId": 44, + "updateMaximumBudget": "2000000000000000000" + }, { "chainId": 46, "updateMaximumBudget": "2000000000000000000" @@ -192,6 +205,10 @@ "chainId": 39, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 44, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 46, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -286,6 +303,10 @@ "chainId": 43, "isSupported": true }, + { + "chainId": 44, + "isSupported": true + }, { "chainId": 46, "isSupported": true @@ -380,6 +401,10 @@ "chainId": 43, "supportedKeys": ["vaa"] }, + { + "chainId": 44, + "supportedKeys": ["vaa"] + }, { "chainId": 46, "supportedKeys": ["vaa"] diff --git a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json index 9777dd07ed..2cd749f4ee 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json +++ b/ethereum/ts-scripts/relayer/config/testnet/scriptConfigs/initializeDeliveryProvider.json @@ -44,6 +44,10 @@ "chainId": 39, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" }, + { + "chainId": 44, + "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" + }, { "chainId": 46, "rewardAddress": "0x734D539a7efEE15714a2755caa4280e12EF3d7e4" @@ -147,6 +151,13 @@ "updatePriceNative": "200000", "maximumBudget": "1000000000000000000" }, + { + "chainId": 44, + "deliverGasOverhead": "350000", + "updatePriceGas": "30000000000", + "updatePriceNative": "200000", + "maximumBudget": "1000000000000000000" + }, { "chainId": 46, "deliverGasOverhead": "350000", diff --git a/ethereum/ts-scripts/relayer/helpers/deployments.ts b/ethereum/ts-scripts/relayer/helpers/deployments.ts index 6eaa135a4c..fc15955976 100644 --- a/ethereum/ts-scripts/relayer/helpers/deployments.ts +++ b/ethereum/ts-scripts/relayer/helpers/deployments.ts @@ -341,6 +341,10 @@ export async function buildOverrides( } else if (chain.chainId === 39) { overrides.type = 2; overrides.maxPriorityFeePerGas = 0; + } else if (chain.chainId === 44) { + overrides.type = 2; + overrides.maxFeePerGas = ethers.utils.parseUnits("0.001", "gwei"); + overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.000000001", "gwei"); } else if (chain.chainId === 45) { overrides.type = 2; overrides.maxPriorityFeePerGas = ethers.utils.parseUnits("0.0001", "gwei"); diff --git a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh index e0707e4ecd..d1748cdd6f 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyCreate2Factory.sh @@ -21,7 +21,7 @@ set contracts_file "ts-scripts/relayer/config/$ENV/contracts.json" set chain_ids (string split \n --no-empty -- (jq '.chains[] | .chainId' $chains_file)) -for chain in 46 +for chain in $chain_ids # Klaytn, Karura and Acala don't have a verification API yet if test 11 -le $chain && test $chain -le 13 continue @@ -71,6 +71,16 @@ for chain in 46 forge verify-contract --verifier blockscout --verifier-url $monad_devnet_explorer_url --watch \ --rpc-url $monad_devnet_rpc_url \ $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init + else if test $chain -eq 44 + set unichain_sepolia_explorer_url "https://unichain-sepolia.blockscout.com/api/" + set unichain_sepolia_rpc_url "https://unichain-sepolia.blockscout.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $create2_factory_address contracts/relayer/create2Factory/Create2Factory.sol:Create2Factory + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $init_contract_address contracts/relayer/create2Factory/Create2Factory.sol:Init else if test $chain -eq 46 set ink_sepolia_explorer_url "https://explorer-sepolia.inkonchain.com/api/" set ink_sepolia_rpc_url "https://explorer-sepolia.inkonchain.com/api/eth-rpc" diff --git a/ethereum/ts-scripts/relayer/shell/verifyDeliveryProvider.sh b/ethereum/ts-scripts/relayer/shell/verifyDeliveryProvider.sh index 93c9a37a8f..4e8390b987 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyDeliveryProvider.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyDeliveryProvider.sh @@ -96,6 +96,42 @@ for chain in $chain_ids $setup_address contracts/relayer/deliveryProvider/DeliveryProviderSetup.sol:DeliveryProviderSetup forge verify-contract --verifier oklink --verifier-url $xlayer_explorer_url --watch \ $proxy_address contracts/relayer/deliveryProvider/DeliveryProviderProxy.sol:DeliveryProviderProxy + else if test $chain -eq 39 + set berachain_artio_verifier_url "https://api.routescan.io/v2/network/testnet/evm/80084/etherscan" + + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $implementation_address contracts/relayer/deliveryProvider/DeliveryProviderImplementation.sol:DeliveryProviderImplementation + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $setup_address contracts/relayer/deliveryProvider/DeliveryProviderSetup.sol:DeliveryProviderSetup + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $proxy_address contracts/relayer/deliveryProvider/DeliveryProviderProxy.sol:DeliveryProviderProxy + + else if test $chain -eq 44 + set unichain_sepolia_explorer_url "https://unichain-sepolia.blockscout.com/api/" + set unichain_sepolia_rpc_url "https://unichain-sepolia.blockscout.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $implementation_address contracts/relayer/deliveryProvider/DeliveryProviderImplementation.sol:DeliveryProviderImplementation + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $setup_address contracts/relayer/deliveryProvider/DeliveryProviderSetup.sol:DeliveryProviderSetup + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $proxy_address contracts/relayer/deliveryProvider/DeliveryProviderProxy.sol:DeliveryProviderProxy + else if test $chain -eq 46 + set ink_sepolia_explorer_url "https://explorer-sepolia.inkonchain.com/api/" + set ink_sepolia_rpc_url "https://explorer-sepolia.inkonchain.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $implementation_address contracts/relayer/deliveryProvider/DeliveryProviderImplementation.sol:DeliveryProviderImplementation + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $setup_address contracts/relayer/deliveryProvider/DeliveryProviderSetup.sol:DeliveryProviderSetup + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $proxy_address contracts/relayer/deliveryProvider/DeliveryProviderProxy.sol:DeliveryProviderProxy else forge verify-contract --watch \ $implementation_address contracts/relayer/deliveryProvider/DeliveryProviderImplementation.sol:DeliveryProviderImplementation diff --git a/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh b/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh index a09719b9a1..e315460fa7 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh @@ -23,7 +23,7 @@ set contracts_file "ts-scripts/relayer/config/$ENV/contracts.json" set chain_ids (string split \n --no-empty -- (jq '.operatingChains[]' $chains_file)) -for chain in $chain_ids +for chain in 39 # Klaytn, Karura and Acala don't have a verification API yet if test 11 -le $chain && test $chain -le 13 continue @@ -62,6 +62,7 @@ for chain in $chain_ids # Celo has a verification API but it currently doesn't work with `forge verify-contract` # We print the compiler input to a file instead for manual verification if test $chain -eq 14 + forge verify-contract --watch --show-standard-json-input --constructor-args $init_contract_address \ $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy > WormholeRelayerProxy.compiler-input.json forge verify-contract --watch --show-standard-json-input --constructor-args $wormhole_address \ @@ -70,28 +71,69 @@ for chain in $chain_ids echo "Please manually submit the compiler input files at celoscan.io" echo "- $implementation_address: WormholeRelayerImplementation.compiler-input.json" echo "- $proxy_address: WormholeRelayerProxy.compiler-input.json" + else if test $chain -eq 35 + set mantle_explorer_url "https://explorer.mantle.xyz/api?module=contract&action=verify" forge verify-contract --verifier blockscout --verifier-url $mantle_explorer_url --watch \ $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy forge verify-contract --verifier blockscout --verifier-url $mantle_explorer_url --watch \ $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + else if test $chain -eq 37 + set xlayer_explorer_url "https://www.oklink.com/api/v5/explorer/contract/verify-source-code-plugin/XLAYER" forge verify-contract --verifier oklink --verifier-url $xlayer_explorer_url --watch \ $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy forge verify-contract --verifier oklink --verifier-url $xlayer_explorer_url --watch \ $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + + else if test $chain -eq 39 + + set berachain_artio_verifier_url "https://api.routescan.io/v2/network/testnet/evm/80084/etherscan" + + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy + forge verify-contract --verifier custom --verifier-url $berachain_artio_verifier_url \ + --watch $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + else if test $chain -eq 43 + set snaxchain_explorer_url "https://explorer.snaxchain.io/api?module=contract&action=verify" forge verify-contract --verifier blockscout --verifier-url $snaxchain_explorer_url --watch \ $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy forge verify-contract --verifier blockscout --verifier-url $snaxchain_explorer_url --watch \ $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + + else if test $chain -eq 44 + + set unichain_sepolia_explorer_url "https://unichain-sepolia.blockscout.com/api/" + set unichain_sepolia_rpc_url "https://unichain-sepolia.blockscout.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy + forge verify-contract --verifier blockscout --verifier-url $unichain_sepolia_explorer_url --watch \ + --rpc-url $unichain_sepolia_rpc_url \ + $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + + else if test $chain -eq 46 + + set ink_sepolia_explorer_url "https://explorer-sepolia.inkonchain.com/api/" + set ink_sepolia_rpc_url "https://explorer-sepolia.inkonchain.com/api/eth-rpc" + + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $proxy_address contracts/relayer/create2Factory/Create2Factory.sol:SimpleProxy + forge verify-contract --verifier blockscout --verifier-url $ink_sepolia_explorer_url --watch \ + --rpc-url $ink_sepolia_rpc_url \ + $implementation_address contracts/relayer/wormholeRelayer/WormholeRelayer.sol:WormholeRelayer + else if test $chain -eq 10008 + set monad_devnet_explorer_url "https://brightstar-884.devnet1.monad.xyz/api/" set monad_devnet_rpc_url "https://brightstar-884.devnet1.monad.xyz/api/eth-rpc" From 91e872f827bf1d783df5a1de4dbf43ef8b846472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Di=20Pietro?= Date: Sat, 28 Dec 2024 12:46:34 -0300 Subject: [PATCH 4/5] Update chains.json --- ethereum/ts-scripts/relayer/config/testnet/chains.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ethereum/ts-scripts/relayer/config/testnet/chains.json b/ethereum/ts-scripts/relayer/config/testnet/chains.json index b85d8f55d5..5e8630013a 100644 --- a/ethereum/ts-scripts/relayer/config/testnet/chains.json +++ b/ethereum/ts-scripts/relayer/config/testnet/chains.json @@ -2,7 +2,6 @@ "guardianSetIndex": 0, "description": "This file contains the chains against which all the scripts should run.", "useLastRun": true, - "operatingChains": [10002, 10003, 10004, 10005, 10008], "chains": [ { "description": "BSC Testnet", From 3ebe3b1cd1d6555f56ef7716b8e0a3795b4e7b28 Mon Sep 17 00:00:00 2001 From: hernandp Date: Sat, 28 Dec 2024 12:48:46 -0300 Subject: [PATCH 5/5] fix --- ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh b/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh index e315460fa7..89b49b93b9 100755 --- a/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh +++ b/ethereum/ts-scripts/relayer/shell/verifyWormholeRelayer.sh @@ -23,7 +23,7 @@ set contracts_file "ts-scripts/relayer/config/$ENV/contracts.json" set chain_ids (string split \n --no-empty -- (jq '.operatingChains[]' $chains_file)) -for chain in 39 +for chain in $chain_ids # Klaytn, Karura and Acala don't have a verification API yet if test 11 -le $chain && test $chain -le 13 continue