From 359f16677466bcf896881097e4fce4f71f99fff2 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Wed, 18 Sep 2024 01:45:53 -0400 Subject: [PATCH 1/4] feat(config): add hedera testnet --- axelar-chains-config/info/testnet.json | 104 +++++++++++++++++++++++++ evm/deploy-amplifier-gateway.js | 2 +- evm/deploy-gateway-v6.2.x.js | 2 +- 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/axelar-chains-config/info/testnet.json b/axelar-chains-config/info/testnet.json index dd1cb418..343b8bce 100644 --- a/axelar-chains-config/info/testnet.json +++ b/axelar-chains-config/info/testnet.json @@ -2405,6 +2405,82 @@ "confirmations": 1, "finality": "finalized", "approxFinalityWaitTime": 1 + }, + "hedera": { + "name": "Hedera", + "axelarId": "hedera", + "skipRevertTests": true, + "chainId": 296, + "rpc": "https://testnet.hashio.io/api", + "tokenSymbol": "HBAR", + "confirmations": 1, + "finality": "finalized", + "approxFinalityWaitTime": 1, + "chainType": "evm", + "explorer": { + "name": "HashScan", + "url": "https://hashscan.io/testnet", + "api": "" + }, + "gasOptions": { + "gasLimit": 8000000 + }, + "timeout": 50000, + "contracts": { + "ConstAddressDeployer": { + "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e", + "deployer": "0xE86375704CDb8491a5Ed82D90DceCE02Ee0ac25F", + "deploymentMethod": "create", + "codehash": "0x8fda47a596dfba923270da84e0c32a2d0312f1c03389f83e16f2b5a35ed37fbe", + "predeployCodehash": "0x8fda47a596dfba923270da84e0c32a2d0312f1c03389f83e16f2b5a35ed37fbe" + }, + "Create3Deployer": { + "address": "0x6513Aedb4D1593BA12e50644401D976aebDc90d8", + "deployer": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05", + "deploymentMethod": "create2", + "codehash": "0xf0ad66defbe082df243d4d274e626f557f97579c5c9e19f33d8093d6160808b7", + "predeployCodehash": "0x73fc31262c4bad113c79439fd231281201c7c7d45b50328bd86bccf37684bf92", + "salt": "Create3Deployer" + }, + "AxelarGateway": { + "deployer": "0xB8Cd93C83A974649D76B1c19f311f639e62272BC", + "operator": "0xB8Cd93C83A974649D76B1c19f311f639e62272BC", + "proxyDeploymentArgs": [ + "0x05823c334150a48ACD5D325fBA16147c21bA3653", + "0xB8Cd93C83A974649D76B1c19f311f639e62272BC", + "0x000000000000000000000000b8cd93c83a974649d76b1c19f311f639e62272bc0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000ea1c6200000000000000000000000000000000000000000000000000000000000000150000000000000000000000000e3c1ac746bd5d47fa44f77a6e3a700eadd9e1bc00000000000000000000000000000000000000000000000000000000000000010000000000000000000000001f2eb0420e6aac6e25154639a37587bbc4b256d6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020aecd082d8788639f2a4afb8563f62aee2183f2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000024449d80a8c616cff227b37a1461ebd059529d140000000000000000000000000000000000000000000000000000000000000001000000000000000000000000380dda1ce71d1922b37db6079ca6e26b2b65da4b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000414b06d536092988aa828a3209a0331be53a126f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000004acc331501a4cde2bea4a3703ccf328f2833182500000000000000000000000000000000000000000000000000000000000000010000000000000000000000005cdf30e201017cb3aaab487949af41e7225e2d1600000000000000000000000000000000000000000000000000000000000000010000000000000000000000006ff6e6fb7f3804fee29aa2ff75dd889c8e09eb7e000000000000000000000000000000000000000000000000000000000000000100000000000000000000000070a97c7328a22e012d6e7c7f0615a19f6761b617000000000000000000000000000000000000000000000000000000000000000100000000000000000000000083313ac5d1e023cbca79a18b9ec5ab7875746335000000000000000000000000000000000000000000000000000000000000000100000000000000000000000092ec015a988cf083c6ad0627f37df05937687e7900000000000000000000000000000000000000000000000000000000000000010000000000000000000000009ce4f02aab880308bc8db8cc6e4ec9a2a8cded5b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b00e4c94faa6698ad2c3b64af7c94071d5eeb2d00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b9f5ea2331ef8224b56576db506afc88f8b070480000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c4db1d3fcf418d4baf61f173eef18c6fb40132fb0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c89566ef25f70cbf3507d5b3c6605129ef9d508c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cbfa786fbdbb8779063fd7580a22da8f306eb8240000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cee3d5699cbfd940b7ee9ac71518120d5f8f67570000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e19404210888776d57780666d0a435298da6d7cf0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e6a16d54e432883da61ce9130b1cd0240025ce620000000000000000000000000000000000000000000000000000000000000001" + ], + "initialVerifierSetId": "3057ad91fc8e1de634e33ad33080d479b0614d0152b73b353e4dd676b3a66498", + "address": "0xe432150cce91c13a887f7D836923d5597adD8E31", + "implementation": "0x05823c334150a48ACD5D325fBA16147c21bA3653", + "implementationCodehash": "0xa74b970bc244e333ce51fcf0e5cff6cf11a4f412be86d6088a8f230a32c5b1df", + "deploymentMethod": "create", + "previousSignersRetention": 15, + "domainSeparator": "0xc66bfbc93dab13dda342d32a5b3f8025e07a8d0ee0b900cdc1d5e634e88ffb6a", + "minimumRotationDelay": 3600, + "connectionType": "amplifier", + "owner": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05" + }, + "InterchainGovernance": { + "address": "0xB8Cd93C83A974649D76B1c19f311f639e62272BC" + }, + "Operators": { + "owner": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05", + "address": "0x7F83F5cA2AE4206AbFf8a3C3668e88ce5F11C0B5", + "deployer": "0xB8Cd93C83A974649D76B1c19f311f639e62272BC", + "deploymentMethod": "create2", + "codehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb", + "predeployCodehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb", + "salt": "Operators" + }, + "AxelarGasService": { + "collector": "0x7F83F5cA2AE4206AbFf8a3C3668e88ce5F11C0B5", + "address": "0xbE406F0189A0B4cf3A05C286473D23791Dd44Cc6", + "implementation": "0xCD6b34FaF1FD1056C728A27426AB6807f84BAa1b", + "deployer": "0x5b593E7b1725dc6FcbbFe80b2415B19153F94A85", + "owner": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05" + } + } } }, "stellar": { @@ -2545,6 +2621,20 @@ "domainSeparator": "0x79191ee0824b0f995492dc4ac6e737040f4d9fd4501f6078e56671da70968259", "address": "axelar1rsuejfntt4rs2y8dn4dd3acszs00zyg9wpnsc6fmhevcp6plu5qspzn7e0" }, + "hedera": { + "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj", + "adminAddress": "axelar17qafmnc4hrfa96cq37wg5l68sxh354pj6eky35", + "signingThreshold": [ + "51", + "100" + ], + "serviceName": "amplifier", + "verifierSetDiffThreshold": 0, + "encoder": "abi", + "keyType": "ecdsa", + "domainSeparator": "0xc66bfbc93dab13dda342d32a5b3f8025e07a8d0ee0b900cdc1d5e634e88ffb6a", + "address": "axelar1kleasry5ed73a8u4q6tdeu80hquy4nplfnrntx3n6agm2tcx40fssjk7gj" + }, "storeCodeProposalId": "107", "storeCodeProposalCodeHash": "6c4d2f520d62bcd7edd4de772257e74b48a8dfba39f853a9c12ff51ca9ea1e83", "codeId": 12 @@ -2606,6 +2696,20 @@ "addressFormat": "eip55", "address": "axelar1kkqdsqvwq9a7p9fj0w89wpx2m2t0vrxl782aslhq0kdw2xxd2aesv3un04" }, + "hedera": { + "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj", + "serviceName": "amplifier", + "sourceGatewayAddress": "0xe432150cce91c13a887f7D836923d5597adD8E31", + "votingThreshold": [ + "51", + "100" + ], + "blockExpiry": 10, + "confirmationHeight": 100000, + "msgIdFormat": "hex_tx_hash_and_event_index", + "addressFormat": "eip55", + "address": "axelar1ce9rcvw8htpwukc048z9kqmyk5zz52d5a7zqn9xlq2pg0mxul9mqxlx2cq" + }, "storeCodeProposalId": "105", "storeCodeProposalCodeHash": "e256445185284a52fc0ca4163c5ffd02d7f605890fb5882d01d540966957465b", "codeId": 10 diff --git a/evm/deploy-amplifier-gateway.js b/evm/deploy-amplifier-gateway.js index a86046db..8b1660ff 100644 --- a/evm/deploy-amplifier-gateway.js +++ b/evm/deploy-amplifier-gateway.js @@ -282,7 +282,7 @@ async function deploy(config, chain, options) { contractConfig.domainSeparator = domainSeparator; contractConfig.minimumRotationDelay = minimumRotationDelay; contractConfig.connectionType = 'amplifier'; - contractConfig.chainType = 'evm'; + chain.chainType = 'evm'; if (options.deployMethod !== 'create') { contractConfig.salt = salt; diff --git a/evm/deploy-gateway-v6.2.x.js b/evm/deploy-gateway-v6.2.x.js index 3c24364b..fc1a70c8 100644 --- a/evm/deploy-gateway-v6.2.x.js +++ b/evm/deploy-gateway-v6.2.x.js @@ -367,7 +367,7 @@ async function deploy(config, chain, options) { contractConfig.deployer = wallet.address; contractConfig.deploymentMethod = options.deployMethod; contractConfig.connectionType = 'consensus'; - contractConfig.chainType = 'evm'; + chain.chainType = 'evm'; if (options.deployMethod !== 'create') { contractConfig.salt = salt; From 139ab93bd31229c1c5ebb50495f3851be1323c11 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Wed, 18 Sep 2024 01:55:25 -0400 Subject: [PATCH 2/4] add gateway address --- axelar-chains-config/info/testnet.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/axelar-chains-config/info/testnet.json b/axelar-chains-config/info/testnet.json index 343b8bce..11b35809 100644 --- a/axelar-chains-config/info/testnet.json +++ b/axelar-chains-config/info/testnet.json @@ -2649,6 +2649,9 @@ "flow": { "address": "axelar1w8frw33jn0yx59845wdgk0yru6fxvgr6hlh4xfdtdf08y5jamcnsyu0z6u" }, + "hedera": { + "address": "axelar1xgr3j2wuc9ut7yjz4nr677scmzd4z6lh3srnpmdh0nyqzcfka3rqe2nsmq" + }, "storeCodeProposalId": "106", "storeCodeProposalCodeHash": "eae97caf40ae6b5eea1e145eec27a59e73aa6f9de389fa9ca0cfc9354a3b68ac", "codeId": 11 From f049371fbfb199a0b60fddf0041f030fc44f0446 Mon Sep 17 00:00:00 2001 From: blockchainguyy Date: Wed, 18 Sep 2024 12:55:50 +0530 Subject: [PATCH 3/4] refactor: add timeout to config schema checks --- axelar-chains-config/tests/schema/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/axelar-chains-config/tests/schema/index.js b/axelar-chains-config/tests/schema/index.js index 97e11af8..61cedfd4 100644 --- a/axelar-chains-config/tests/schema/index.js +++ b/axelar-chains-config/tests/schema/index.js @@ -77,6 +77,7 @@ export const chainValueSchema = { confirmations: { type: 'number' }, finality: { type: 'string' }, approxFinalityWaitTime: { type: 'number' }, + timeout: { type: 'number' }, }, required: ['name', 'id', 'axelarId', 'chainId', 'rpc', 'tokenSymbol', 'contracts', 'explorer'], }; From f031f21424422e2d99a5e9b67b73c69a30ddc9db Mon Sep 17 00:00:00 2001 From: blockchainguyy Date: Wed, 18 Sep 2024 12:59:11 +0530 Subject: [PATCH 4/4] refactor: add ID to hedera testnet --- axelar-chains-config/info/testnet.json | 1 + 1 file changed, 1 insertion(+) diff --git a/axelar-chains-config/info/testnet.json b/axelar-chains-config/info/testnet.json index 11b35809..335c3276 100644 --- a/axelar-chains-config/info/testnet.json +++ b/axelar-chains-config/info/testnet.json @@ -2408,6 +2408,7 @@ }, "hedera": { "name": "Hedera", + "id": "hedera", "axelarId": "hedera", "skipRevertTests": true, "chainId": 296,