From 567de8278bffd5a226bf833b22638e78a0d136b9 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 20 Nov 2024 19:55:28 -0500 Subject: [PATCH 01/20] chore: update devnet-amplifier.json after v1.3.0 release --- .../info/devnet-amplifier.json | 100 ++++++++++++------ 1 file changed, 70 insertions(+), 30 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 36f3d3f33..e441e0701 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -627,32 +627,44 @@ "contracts": { "ServiceRegistry": { "governanceAccount": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", - "codeId": 624, - "lastUploadedCodeId": 624, - "address": "axelar1c9fkszt5lq34vvvlat3fxj6yv7ejtqapz04e97vtc9m5z9cwnamq8zjlhz" + "codeId": 852, + "lastUploadedCodeId": 852, + "address": "axelar1c9fkszt5lq34vvvlat3fxj6yv7ejtqapz04e97vtc9m5z9cwnamq8zjlhz", + "storeCodeProposalId": "75", + "storeCodeProposalCodeHash": "fcbd66ffc824fc52383132d7a57617e9bc40dd1521ecad77341726434f801406" }, "Router": { "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", - "codeId": 623, - "lastUploadedCodeId": 623, + "codeId": 850, + "lastUploadedCodeId": 850, "address": "axelar14jjdxqhuxk803e9pq64w4fgf385y86xxhkpzswe9crmu6vxycezst0zq8y", - "executeProposalId": "54" + "executeProposalId": "54", + "storeCodeProposalId": "71", + "storeCodeProposalCodeHash": "6dcf6bad5ec0e90272a015651b491e8a4e099740bdeede813ec7c947a24a9737" }, "Multisig": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "blockExpiry": 10, - "codeId": 617, - "lastUploadedCodeId": 617, + "codeId": 851, + "lastUploadedCodeId": 851, "address": "axelar19jxy26z0qnnspa45y5nru0l5rmy9d637z5km2ndjxthfxf5qaswst9290r", - "executeProposalId": "55" + "executeProposalId": "55", + "storeCodeProposalId": "72", + "storeCodeProposalCodeHash": "765929ba3060cdfa5573ec621cb91b3a77f7d9fbc8d1b953f545876bb5abb05e" }, "Coordinator": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "codeId": 615, - "lastUploadedCodeId": 615, + "lastUploadedCodeId": 846, "address": "axelar1m2498n4h2tskcsmssjnzswl5e6eflmqnh487ds47yxyu6y5h4zuqr9zk4g", - "executeProposalId": "56" + "executeProposalId": "56", + "axelar": { + "codeId": 846, + "address": "axelar1m2498n4h2tskcsmssjnzswl5e6eflmqnh487ds47yxyu6y5h4zuqr9zk4g" + }, + "storeCodeProposalId": "62", + "storeCodeProposalCodeHash": "a57dccb229cfab931b904618af2ebc854699a25a963c231834837d88ee4a0217" }, "Rewards": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", @@ -665,9 +677,14 @@ "10" ] }, - "codeId": 737, - "lastUploadedCodeId": 737, - "address": "axelar1vaj9sfzc3z0gpel90wu4ljutncutv0wuhvvwfsh30rqxq422z89qnd989l" + "codeId": 849, + "lastUploadedCodeId": 849, + "address": "axelar1vaj9sfzc3z0gpel90wu4ljutncutv0wuhvvwfsh30rqxq422z89qnd989l", + "axelar": { + "codeId": 849 + }, + "storeCodeProposalId": "69", + "storeCodeProposalCodeHash": "095c1caca4f9b7381519bd8395f3f558202fd4d4ad03f223dd8a2e991c568bd6" }, "NexusGateway": { "nexus": "axelar17h8uk4ct0mdv9mgkuxszt4gp2htpfr08mge20r", @@ -676,14 +693,29 @@ "address": "axelar1jjjr3tqs0nzjv3y9fg4xvzkww50jq06a9qp77r8kzmqyla97556sxx7702" }, "AxelarnetGateway": { - "codeId": 661, - "address": "axelar1yvfcrdke7fasxfaxx2r706h7h85rnk3w68cc5f4fkmafz5j755ssl8h9p0" + "codeId": 844, + "address": "axelar1wvms3cy5hxrgl7uxhkz7yth4qzqum6aaccwkmvafq8z0mgdfxr8qrnvw0k", + "nexus": "axelar17h8uk4ct0mdv9mgkuxszt4gp2htpfr08mge20r", + "axelar": { + "storeInstantiateProposalId": "59", + "codeId": 845 + }, + "storeCodeProposalCodeHash": "c7286d0f59276b794641bdfbb4f96fafcee3553b67f3397d662a4683968f525b", + "storeCodeProposalId": "60", + "lastUploadedCodeId": 845 }, "InterchainTokenService": { "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "codeId": 738, - "address": "axelar10jzzmv5m7da7dn2xsfac0yqe7zamy34uedx3e28laq0p6f3f8dzqp649fp" + "address": "axelar10jzzmv5m7da7dn2xsfac0yqe7zamy34uedx3e28laq0p6f3f8dzqp649fp", + "axelar": { + "codeId": 843, + "instantiateProposalId": "61" + }, + "storeCodeProposalId": "58", + "storeCodeProposalCodeHash": "b60d0d227c7a400a0fcc80ed52f0e6688e5da6db676a61ed8b6942823294031d", + "lastUploadedCodeId": 843 }, "VotingVerifier": { "avalanche-fuji": { @@ -701,7 +733,7 @@ "codeId": 626, "address": "axelar1252ahkw208d08ls64atp2pql4cnl9naxy7ahhq3lrthvq3spseys26l8xj" }, - "lastUploadedCodeId": 784, + "lastUploadedCodeId": 854, "eth-sepolia": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "serviceName": "validators", @@ -714,7 +746,7 @@ "confirmationHeight": 1, "msgIdFormat": "hex_tx_hash_and_event_index", "addressFormat": "eip55", - "codeId": 626, + "codeId": 854, "address": "axelar16swl5eh3vspnyzddwltuf93hc65nwju7498u0zyq33u4cj8rxy4sgxx30m" }, "optimism-sepolia": { @@ -729,7 +761,7 @@ "confirmationHeight": 1, "msgIdFormat": "hex_tx_hash_and_event_index", "addressFormat": "eip55", - "codeId": 626, + "codeId": 854, "address": "axelar1qtg2es55w6zp539a2xh9mnajxqq2rsqghf604muyw85vrn0ky97qyu795s" }, "flow": { @@ -744,7 +776,8 @@ "confirmationHeight": 1, "msgIdFormat": "hex_tx_hash_and_event_index", "addressFormat": "eip55", - "address": "axelar1hn4hf23pqy2s2yacs4cuzjqe72hxn0rtxugy2vq485l7cngtcavqu9d0zq" + "address": "axelar1hn4hf23pqy2s2yacs4cuzjqe72hxn0rtxugy2vq485l7cngtcavqu9d0zq", + "codeId": 854 }, "sui-test2": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", @@ -775,24 +808,27 @@ ], "blockExpiry": 10, "confirmationHeight": 1 - } + }, + "storeCodeProposalId": "78", + "storeCodeProposalCodeHash": "d9412440820a51bc48bf41a77ae39cfb33101ddc6562323845627ea2042bf708" }, "Gateway": { "avalanche-fuji": { - "codeId": 616, + "codeId": 848, "address": "axelar1agyunp32jwynnkrf92wuvac2xa7cvgthtk5yr3wh7jypg59zjjqqsqf36s" }, - "lastUploadedCodeId": 785, + "lastUploadedCodeId": 848, "eth-sepolia": { - "codeId": 616, + "codeId": 848, "address": "axelar18zrymnzgdmutdjhqlfsslzy4yvzw8uylysjwqlq4uk4muq3qx30qde39qz" }, "optimism-sepolia": { - "codeId": 616, + "codeId": 848, "address": "axelar16wd6350f575t5cts9sduqmt7nsw9kc822ltf6dcn46rvejmmg8cqrq4ara" }, "flow": { - "address": "axelar10w5sqgun0q3m0vkz29vh55ujug57m0t54cue04aesrg45rqcgf6sjv4wwh" + "address": "axelar10w5sqgun0q3m0vkz29vh55ujug57m0t54cue04aesrg45rqcgf6sjv4wwh", + "codeId": 848 }, "sui-test2": { "codeId": 785, @@ -801,7 +837,9 @@ "stellar-test2": { "address": "axelar1yekgav0alr7ptakd9uhlengvcfwals6agjceszxzmj77af825y3qs5asgx", "codeId": 781 - } + }, + "storeCodeProposalId": "64", + "storeCodeProposalCodeHash": "2ba600ee0d162184c9387eaf6fad655f1d75db548f93e379f0565cb2042d856f" }, "MultisigProver": { "avalanche-fuji": { @@ -897,10 +935,12 @@ "address": "axelar1s8unjkst9sjc8csa8xu7sspv4maz8frl34ac2ypny0mylllyuz9qej9lfk", "codeId": 782, "domainSeparator": "0xe33a8ab3341e36bdcc552924ea42c85ef40dc2cfa41259eb166fb254bc3f036a" - } + }, + "storeCodeProposalId": "77", + "storeCodeProposalCodeHash": "c20281e52b0d9121189b6567378ffb1262d1a925fb653bad7aee8c4f29610e9e" } }, - "axelarId": "axelarnet", + "axelarId": "axelar", "chainId": "devnet-amplifier", "rpc": "http://devnet-amplifier.axelar.dev:26657", "lcd": "http://devnet-amplifier.axelar.dev:1317", From 11b84f401db53f781d75547b15a2cccbe9ca70b1 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Fri, 22 Nov 2024 10:18:54 -0500 Subject: [PATCH 02/20] chore: migrated all wasm chains --- .../info/devnet-amplifier.json | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index e441e0701..df3b43227 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -730,7 +730,7 @@ "confirmationHeight": 1, "msgIdFormat": "hex_tx_hash_and_event_index", "addressFormat": "eip55", - "codeId": 626, + "codeId": 854, "address": "axelar1252ahkw208d08ls64atp2pql4cnl9naxy7ahhq3lrthvq3spseys26l8xj" }, "lastUploadedCodeId": 854, @@ -791,7 +791,7 @@ ], "blockExpiry": 10, "confirmationHeight": 1, - "codeId": 784, + "codeId": 854, "address": "axelar1pgzqdnnayxw0t73wea06amp4lpatg34q6wnlyplf2u2edt2veu0qygcpqe" }, "stellar-test2": { @@ -801,7 +801,7 @@ "msgIdFormat": "hex_tx_hash_and_event_index", "addressFormat": "stellar", "address": "axelar1y00kk2j8pjx700hedhn3u7dyduy5q9kr37hgge6zxrl46ny0jr7qj046ey", - "codeId": 780, + "codeId": 854, "votingThreshold": [ "6", "10" @@ -831,12 +831,12 @@ "codeId": 848 }, "sui-test2": { - "codeId": 785, + "codeId": 848, "address": "axelar126awlkwqhtvx60nekmnxd7z3slk0u9w7yuse89j9s9rj0053lh8q365zkz" }, "stellar-test2": { "address": "axelar1yekgav0alr7ptakd9uhlengvcfwals6agjceszxzmj77af825y3qs5asgx", - "codeId": 781 + "codeId": 848 }, "storeCodeProposalId": "64", "storeCodeProposalCodeHash": "2ba600ee0d162184c9387eaf6fad655f1d75db548f93e379f0565cb2042d856f" @@ -855,10 +855,10 @@ "encoder": "abi", "keyType": "ecdsa", "domainSeparator": "0xfa2912a57d663fcffbcb3d4c56334eb8babe48008b4b7458f4332e0828a12f40", - "codeId": 618, + "codeId": 855, "address": "axelar1p22kz5jr7a9ruu8ypg40smual0uagl64dwvz5xt042vu8fa7l7dsl3wx8q" }, - "lastUploadedCodeId": 786, + "lastUploadedCodeId": 855, "eth-sepolia": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", @@ -872,7 +872,7 @@ "encoder": "abi", "keyType": "ecdsa", "domainSeparator": "0xc04aba7c8ccda4059d622ac3e17bb4ef1c1e2358f25bfea5902a44d3a34d616a", - "codeId": 618, + "codeId": 855, "address": "axelar15ra7d5uvnmc6ety6sqxsvsfz4t34ud6lc5gmt39res0c5thkqp2qdwj4af" }, "optimism-sepolia": { @@ -888,7 +888,7 @@ "encoder": "abi", "keyType": "ecdsa", "domainSeparator": "0xf865bf16595139bf568a034d575ffdbdd524dd2dbf8cce1de2ddaf7b964bf8e6", - "codeId": 618, + "codeId": 855, "address": "axelar1p0yyfy7f70zdc0ludh6kffjzs8mvun5prdf7nh7s2cgq74g67nmsjcw7t4" }, "flow": { @@ -904,7 +904,8 @@ "encoder": "abi", "keyType": "ecdsa", "domainSeparator": "0xcc0a47123f218b7f10d07212f499e418080c91cda74c46373c9a0e4aeec7332e", - "address": "axelar19ukamzyhhaw4algkqch5relyg0h972smhj8zge2usjp8z7yaezrquc475f" + "address": "axelar19ukamzyhhaw4algkqch5relyg0h972smhj8zge2usjp8z7yaezrquc475f", + "codeId": 855 }, "sui-test2": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", @@ -917,7 +918,7 @@ "verifierSetDiffThreshold": 0, "encoder": "bcs", "keyType": "ecdsa", - "codeId": 786, + "codeId": 855, "domainSeparator": "0x05b8831cd87c82fadd1e4967a45eb3401dfc6bf5f74b827d8f525992c09403ef", "address": "axelar1amvmsrszflf43lhfgzcq93a22usvy3w7kqrp25uqghnws3x04jyscutk0w" }, @@ -933,11 +934,11 @@ "encoder": "stellar_xdr", "keyType": "ed25519", "address": "axelar1s8unjkst9sjc8csa8xu7sspv4maz8frl34ac2ypny0mylllyuz9qej9lfk", - "codeId": 782, + "codeId": 855, "domainSeparator": "0xe33a8ab3341e36bdcc552924ea42c85ef40dc2cfa41259eb166fb254bc3f036a" }, - "storeCodeProposalId": "77", - "storeCodeProposalCodeHash": "c20281e52b0d9121189b6567378ffb1262d1a925fb653bad7aee8c4f29610e9e" + "storeCodeProposalId": "82", + "storeCodeProposalCodeHash": "00428ef0483f103a6e1a5853c4b29466a83e5b180cc53a00d1ff9d022bc2f03a" } }, "axelarId": "axelar", From d5acac8527971d0e428d160ba0cd67c482e6e856 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Fri, 22 Nov 2024 15:32:32 -0500 Subject: [PATCH 03/20] chore: avalanche-fuji amplifier gateway, ITS upgrade --- .../info/devnet-amplifier.json | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index ccd1c83b3..8b72e77f2 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -177,14 +177,15 @@ "initialVerifierSetId": "23b68feb94699d32d762ad7264d416d5324408018f9ecd172a3aadd38a255c36", "governance": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "address": "0xF128c84c3326727c3e155168daAa4C0156B87AD1", - "implementation": "0x3c19E701ed674350DE8cAEb0B85A388499246D2d", - "implementationCodehash": "0xdb3dd6f58bf1295e87d39ec97e90a9a7cab857458af46d31e40fbe0589af2317", - "deploymentMethod": "create3", + "implementation": "0xe9ac03F10b219fbFa1bc1EAb288963e288989e58", + "implementationCodehash": "0x5dbe684f109d8834e12707c98776512805d553f6246c97ec8546d712ccf0d5ab", + "deploymentMethod": "create2", "previousSignersRetention": 15, "domainSeparator": "0xfa2912a57d663fcffbcb3d4c56334eb8babe48008b4b7458f4332e0828a12f40", "minimumRotationDelay": 0, - "salt": "AxelarGateway devnet-amplifier", - "connectionType": "amplifier" + "salt": "v6.0.4", + "connectionType": "amplifier", + "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "ConstAddressDeployer": { "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e", @@ -218,23 +219,23 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.0rc3 devnet-amplifier", + "salt": "ITS v2.0.1", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x4cE9EC3ECB34aD0284f77BF6AafdBef9d136bd24", + "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x8Be3C8bbFAFeE70AEAC14406a5F5C6dCD4D4fCb0", - "tokenManager": "0x64291364740eb10aeC672f06eCD7c7a91ea5A752", - "tokenHandler": "0x445C50CC6085ff2d35364bcc3CDce8b3FE08b27d", - "gatewayCaller": "0xFE0144B9C5B487Ec0a6Db38F7f100E99125117b3", - "implementation": "0x110D33345f031b9b630366c8399838bE445fF22d", + "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", + "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", + "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", + "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", + "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x429E1bA4EF86B684741D04a97f18B25E78b8A8f1", + "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" } } @@ -694,12 +695,6 @@ "storeCodeProposalId": "69", "storeCodeProposalCodeHash": "095c1caca4f9b7381519bd8395f3f558202fd4d4ad03f223dd8a2e991c568bd6" }, - "NexusGateway": { - "nexus": "axelar17h8uk4ct0mdv9mgkuxszt4gp2htpfr08mge20r", - "codeId": 619, - "lastUploadedCodeId": 619, - "address": "axelar1jjjr3tqs0nzjv3y9fg4xvzkww50jq06a9qp77r8kzmqyla97556sxx7702" - }, "AxelarnetGateway": { "codeId": 844, "address": "axelar1wvms3cy5hxrgl7uxhkz7yth4qzqum6aaccwkmvafq8z0mgdfxr8qrnvw0k", From fa10f1ebc2f74f76fe4b9cadcad46f416e073fd0 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Sun, 24 Nov 2024 19:09:24 -0500 Subject: [PATCH 04/20] chore: upgrade evm amplifier gateway --- .../info/devnet-amplifier.json | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 8b72e77f2..ff03b0821 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -270,14 +270,15 @@ "initialVerifierSetId": "e5283a7b64fded588737f495421f8d0bf453f6a1deee353bcb9105551a01d4ea", "governance": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "address": "0xF128c84c3326727c3e155168daAa4C0156B87AD1", - "implementation": "0x3c19E701ed674350DE8cAEb0B85A388499246D2d", - "implementationCodehash": "0x547e0c45465a734b83b4670a395d33d2acb0caeaca5f11851d08811891fa56f1", - "deploymentMethod": "create3", + "implementation": "0xD981b4a8D46b7b80dCbE245c615432c4DeF2e817", + "implementationCodehash": "0xab88cd4cdbea4754ba49d2d73b11d5f1d173bccbd4c0de6352c1d1e3dfc9db64", + "deploymentMethod": "create2", "previousSignersRetention": 15, "domainSeparator": "0xc04aba7c8ccda4059d622ac3e17bb4ef1c1e2358f25bfea5902a44d3a34d616a", "minimumRotationDelay": 0, - "salt": "AxelarGateway devnet-amplifier", - "connectionType": "amplifier" + "salt": "v6.0.4", + "connectionType": "amplifier", + "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "ConstAddressDeployer": { "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e", @@ -362,14 +363,15 @@ "initialVerifierSetId": "371d01f95380c32d6077ec54b726a7cf65e536acc860d26a6399b879f71a8e42", "governance": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "address": "0xF128c84c3326727c3e155168daAa4C0156B87AD1", - "implementation": "0x3c19E701ed674350DE8cAEb0B85A388499246D2d", - "implementationCodehash": "0x6101dacb6747d4e231d9aa697b51da66f04b32296558b90d19463d4a416dc108", - "deploymentMethod": "create3", + "implementation": "0x4228956048615Db42709e69598A34E8Ff4cf5340", + "implementationCodehash": "0xb4c38d419801884ef56047516896faea7d01c4c6c8588176eece9da22acc674e", + "deploymentMethod": "create2", "previousSignersRetention": 15, "domainSeparator": "0xf865bf16595139bf568a034d575ffdbdd524dd2dbf8cce1de2ddaf7b964bf8e6", "minimumRotationDelay": 0, - "salt": "AxelarGateway devnet-amplifier", - "connectionType": "amplifier" + "salt": "v6.0.4", + "connectionType": "amplifier", + "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "ConstAddressDeployer": { "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e", @@ -458,14 +460,15 @@ "initialVerifierSetId": "2818a9d60cf13c06b0fc9584c60444a0b0e05a6d5adc58cd1a22f3b7a1f24d35", "governance": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "address": "0xF128c84c3326727c3e155168daAa4C0156B87AD1", - "implementation": "0x3c19E701ed674350DE8cAEb0B85A388499246D2d", - "implementationCodehash": "0x4e18f2497638773ed993af44d7ddcc300ed02bc70a1ca7937de933d070402855", - "deploymentMethod": "create3", + "implementation": "0x27f40113e84E26e9D23921BE30dD750675c5c723", + "implementationCodehash": "0x63a61947de125db1f7970df81581b6f4ccf704e991ac8f8ff9dddc1befe712b2", + "deploymentMethod": "create2", "previousSignersRetention": 15, "domainSeparator": "0xcc0a47123f218b7f10d07212f499e418080c91cda74c46373c9a0e4aeec7332e", "minimumRotationDelay": 0, "connectionType": "amplifier", - "salt": "AxelarGateway devnet-amplifier" + "salt": "v6.0.4", + "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "Operators": { "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", From 4e651b522d737edbfb5a1fdfdd2e8bcb77650d01 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Sun, 24 Nov 2024 20:04:44 -0500 Subject: [PATCH 05/20] chore: ITS Hub support to EVM ITS contract --- .../info/devnet-amplifier.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index ff03b0821..84f0522e9 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -312,23 +312,23 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.0rc3 devnet-amplifier", + "salt": "ITS v2.0.1", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x4cE9EC3ECB34aD0284f77BF6AafdBef9d136bd24", + "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x8Be3C8bbFAFeE70AEAC14406a5F5C6dCD4D4fCb0", - "tokenManager": "0x64291364740eb10aeC672f06eCD7c7a91ea5A752", - "tokenHandler": "0x445C50CC6085ff2d35364bcc3CDce8b3FE08b27d", - "gatewayCaller": "0xFE0144B9C5B487Ec0a6Db38F7f100E99125117b3", - "implementation": "0x110D33345f031b9b630366c8399838bE445fF22d", + "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", + "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", + "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", + "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", + "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x429E1bA4EF86B684741D04a97f18B25E78b8A8f1", + "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" } } @@ -405,23 +405,23 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.0rc3 devnet-amplifier", + "salt": "ITS v2.0.1", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x4cE9EC3ECB34aD0284f77BF6AafdBef9d136bd24", + "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x8Be3C8bbFAFeE70AEAC14406a5F5C6dCD4D4fCb0", - "tokenManager": "0x64291364740eb10aeC672f06eCD7c7a91ea5A752", - "tokenHandler": "0x445C50CC6085ff2d35364bcc3CDce8b3FE08b27d", - "gatewayCaller": "0xFE0144B9C5B487Ec0a6Db38F7f100E99125117b3", - "implementation": "0x110D33345f031b9b630366c8399838bE445fF22d", + "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", + "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", + "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", + "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", + "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x429E1bA4EF86B684741D04a97f18B25E78b8A8f1", + "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" } } @@ -713,8 +713,8 @@ "InterchainTokenService": { "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", - "codeId": 738, - "address": "axelar10jzzmv5m7da7dn2xsfac0yqe7zamy34uedx3e28laq0p6f3f8dzqp649fp", + "codeId": 843, + "address": "axelar157hl7gpuknjmhtac2qnphuazv2yerfagva7lsu9vuj2pgn32z22qa26dk4", "axelar": { "codeId": 843, "instantiateProposalId": "61" From 5ff04917e39de1a26e849543ff649f2fb4bcccc4 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Mon, 25 Nov 2024 11:17:23 -0500 Subject: [PATCH 06/20] fix: verify contracts script fixes --- evm/verify-contract.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evm/verify-contract.js b/evm/verify-contract.js index d25dce546..5c8de0007 100644 --- a/evm/verify-contract.js +++ b/evm/verify-contract.js @@ -56,7 +56,7 @@ async function verifyAmplifierGateway(chain, contractConfig, env, wallet, verify verifyContractByName( env, chain.name, - 'AxelarGateway', + 'AxelarAmplifierGateway', implementation, [previousSignersRetention, domainSeparator, minimumRotationDelay], verifyOptions, @@ -240,7 +240,7 @@ async function processCommand(config, chain, options) { await verifyContract(env, chain.axelarId, interchainToken, [contractAddress], verifyOptions); await verifyContract(env, chain.axelarId, interchainTokenDeployer, [interchainToken], verifyOptions); await verifyContract(env, chain.axelarId, tokenManager, [contractAddress], verifyOptions); - await verifyContract(env, chain.axelarId, tokenHandler, [chain.contracts.AxelarGateway.address], verifyOptions); + await verifyContract(env, chain.axelarId, tokenHandler, [], verifyOptions); await verifyContract( env, chain.axelarId, From 8586d7e7548cd04f07e2925698653a92ba090ca4 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Tue, 26 Nov 2024 03:16:15 +0700 Subject: [PATCH 07/20] fix(evm)!: include axelar in ITS trusted address verification --- evm/its.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/evm/its.js b/evm/its.js index e9726434c..dcbfcc3c3 100644 --- a/evm/its.js +++ b/evm/its.js @@ -69,6 +69,16 @@ async function handleTx(tx, chain, contract, action, firstEvent, secondEvent) { async function getTrustedChainsAndAddresses(config, interchainTokenService) { const allChains = Object.values(config.chains).map((chain) => chain.axelarId); + + // If ITS Hub is deployed, register it as a trusted chain as well + const itsHubAddress = config.axelar?.contracts?.InterchainTokenService?.address; + if (itsHubAddress) { + if (!config.axelar?.axelarId) { + throw new Error('Axelar ID for Axelar chain is not set'); + } + + allChains.push(config.axelar?.axelarId); + } const trustedAddressesValues = await Promise.all( allChains.map(async (chainName) => await interchainTokenService.trustedAddress(chainName)), ); From 26bf5fde004d8249251149ee9696f12d357d9143 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Mon, 25 Nov 2024 15:44:45 -0500 Subject: [PATCH 08/20] fix: deploy flow ITS contract run 1 --- .../info/devnet-amplifier.json | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 84f0522e9..2a5f9f0ae 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -151,7 +151,7 @@ "name": "Avalanche Fuji", "axelarId": "avalanche-fuji", "chainId": 43113, - "rpc": "https://avalanche-fuji-c-chain-rpc.publicnode.com", + "rpc": "https://red-divine-dream.avalanche-testnet.quiknode.pro/fe8a71d7e75a6fce0f2232361b795745ae818f6a/ext/bc/C/rpc", "tokenSymbol": "AVAX", "confirmations": 1, "chainType": "evm", @@ -241,7 +241,7 @@ } }, "eth-sepolia": { - "name": "Ethereum Sepolia", + "name": "Eth Sepolia", "axelarId": "eth-sepolia", "chainId": 11155111, "rpc": "https://1rpc.io/sepolia", @@ -484,6 +484,26 @@ "address": "0xD7C77eEA2aF147D351f189eF9eC17EfDf609a3c8", "implementation": "0x4F1ccCE088244d2979128b3af64cD6C8D440bbC0", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" + }, + "InterchainTokenService": { + "salt": "ITS v2.0.1", + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "proxySalt": "ITS v1.0.0", + "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", + "interchainToken": "0xcAe7F608732B39b8BC4870d1256873dE4345e02D", + "interchainTokenDeployer": "0xC5B77a0b7d7cC19eB04774E7fe7c3427C961530D", + "tokenManager": "0xDD2A0e438aa516D902DeD600D4CC53D53090e15a", + "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", + "gatewayCaller": "0xd6f5B7bf9A71E82Cb6B922472012Ad6E135191E8", + "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", + "address": "0xDc9CDacFFBDdfe30f5694CA8BDd3669203E0BE8a" + }, + "InterchainTokenFactory": { + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "salt": "ITS Factory v1.0.0", + "implementation": "0xeFA1Ae5180d20aa24EB26912091565dcf498B096", + "address": "0x13465b5b5F264b4EE3e87BB42C7F163897739286" } }, "explorer": { From baabf6b14143b1067b9f4107a7e70f0d4037511b Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Mon, 25 Nov 2024 21:15:18 -0500 Subject: [PATCH 09/20] chore: ITS EVM contracts for core-avalanche --- .../info/devnet-amplifier.json | 20 +++++++++++++++++++ evm/its.js | 4 ---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 720711ab7..eab7f16c7 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -61,6 +61,26 @@ "address": "0x5F80274696D9414a148E9D64822a42846AFFE2DC", "implementation": "0x07988B56280B7654259e2A6E26d512517483DC02", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" + }, + "InterchainTokenService": { + "salt": "ITS v2.0.1 devnet-amplifier", + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "proxySalt": "ITS v1.0.0 devnet-amplifier", + "tokenManagerDeployer": "0xb518515e96Dd6379656C50347267949d4Ec23c43", + "interchainToken": "0x35C4ca0dB9BF62f9ed859bE45f323BE4c8FD6A81", + "interchainTokenDeployer": "0x3A499F60f8B7Fa0393855270b47db18796de28Fa", + "tokenManager": "0xbcE7bb10e201A20f1d35b5F15a7f5E1C9b4339F8", + "tokenHandler": "0x8435eE93110Ce6dEa0bFFAef8CF2DfcdCBfc8373", + "gatewayCaller": "0x324d9E8389d146Dea51ade37c1369daBD90A8B0d", + "implementation": "0x75C8F5519a25fBBd9f31a320C5bda8d1C7b1f946", + "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", + "address": "0x4FDE6E2ED0EF4642478F562f73D2F3Ff5648D55e" + }, + "InterchainTokenFactory": { + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "salt": "ITS Factory v1.0.0 devnet-amplifier", + "implementation": "0x586f8136E0F55Cec74F454CCe7bEb03294721073", + "address": "0x1dc68354c38A00e48af46BA9DADB96Aaf58A893c" } } }, diff --git a/evm/its.js b/evm/its.js index e68f7dc04..3edb2e178 100644 --- a/evm/its.js +++ b/evm/its.js @@ -74,10 +74,6 @@ async function getTrustedChainsAndAddresses(config, interchainTokenService) { const itsHubAddress = config.axelar?.contracts?.InterchainTokenService?.address; if (itsHubAddress) { - if (!config.axelar?.axelarId) { - throw new Error('Axelar ID for Axelar chain is not set'); - } - allChains.push(config.axelar?.axelarId); } From e6c9995cb64c82ff3b75cf6be22eabcd80940d92 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 09:56:17 -0500 Subject: [PATCH 10/20] chore: deploy ITS hub instance new avalanche-fuji, eth-sepolia, optimism-sepolia --- .../info/devnet-amplifier.json | 98 ++++++++----------- 1 file changed, 39 insertions(+), 59 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index eab7f16c7..2aac8bbcb 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -284,24 +284,24 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.1", + "salt": "ITS v2.0.1 devnet-amplifier2", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", - "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", - "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", - "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", - "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", - "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "proxySalt": "ITS v1.0.0 devnet-amplifier2", + "tokenManagerDeployer": "0x4Bf2315e29CacA44227E81c7484B4AF1dc7F4ED9", + "interchainToken": "0x5321CB9412D5F53d95D2B5a07861Dd45CBca2671", + "interchainTokenDeployer": "0x07DD1cE692d6D1f9DD02A81277DC06C79FFecde0", + "tokenManager": "0x4760fB5613c2818C85346805266B356000f256cC", + "tokenHandler": "0x836bF27091C254b5c8Da85408c95ED1E4A763a43", + "gatewayCaller": "0x57B8D2082E0C9a38d928F40C0B7E79e4BF8D703e", + "implementation": "0x733Ee16Fe75988b09119D698584E1d77a9FB4453", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" + "address": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", - "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" + "salt": "ITS Factory v1.0.0 devnet-amplifier2", + "implementation": "0x38a1DF03Ed0308fA545D60a458904Ad9416c8c65", + "address": "0xdB7d6A5B8d37a4f34BC1e7ce0d0B8a9DDA124871" } } }, @@ -377,24 +377,24 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.1", + "salt": "ITS v2.0.1 devnet-amplifier2", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", - "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", - "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", - "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", - "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", - "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "proxySalt": "ITS v1.0.0 devnet-amplifier2", + "tokenManagerDeployer": "0x4Bf2315e29CacA44227E81c7484B4AF1dc7F4ED9", + "interchainToken": "0x5321CB9412D5F53d95D2B5a07861Dd45CBca2671", + "interchainTokenDeployer": "0x07DD1cE692d6D1f9DD02A81277DC06C79FFecde0", + "tokenManager": "0x4760fB5613c2818C85346805266B356000f256cC", + "tokenHandler": "0x836bF27091C254b5c8Da85408c95ED1E4A763a43", + "gatewayCaller": "0x57B8D2082E0C9a38d928F40C0B7E79e4BF8D703e", + "implementation": "0x733Ee16Fe75988b09119D698584E1d77a9FB4453", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" + "address": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", - "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" + "salt": "ITS Factory v1.0.0 devnet-amplifier2", + "implementation": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff", + "address": "0xdB7d6A5B8d37a4f34BC1e7ce0d0B8a9DDA124871" } } }, @@ -470,24 +470,24 @@ "salt": "Operators devnet-amplifier" }, "InterchainTokenService": { - "salt": "ITS v2.0.1", + "salt": "ITS v2.0.1 devnet-amplifier2", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v2.0.0 devnet-amplifier", - "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", - "interchainToken": "0x34c8C8d2E212E3D5eBECAdf4769388B2e36C4561", - "interchainTokenDeployer": "0x3fa7589c491fdbdc5bA7e20C7E36a4B401C26948", - "tokenManager": "0x81d4049814211645cA8238fad1AD7d955289b87b", - "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", - "gatewayCaller": "0xCF638A4aae010d0873b82866351064bCB6f6358a", - "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "proxySalt": "ITS v1.0.0 devnet-amplifier2", + "tokenManagerDeployer": "0x4Bf2315e29CacA44227E81c7484B4AF1dc7F4ED9", + "interchainToken": "0x5321CB9412D5F53d95D2B5a07861Dd45CBca2671", + "interchainTokenDeployer": "0x07DD1cE692d6D1f9DD02A81277DC06C79FFecde0", + "tokenManager": "0x4760fB5613c2818C85346805266B356000f256cC", + "tokenHandler": "0x836bF27091C254b5c8Da85408c95ED1E4A763a43", + "gatewayCaller": "0x57B8D2082E0C9a38d928F40C0B7E79e4BF8D703e", + "implementation": "0x733Ee16Fe75988b09119D698584E1d77a9FB4453", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0x144c3d7A5f5198EF3B46A8258b35E903cf197A66" + "address": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v2.0.0 devnet-amplifier", - "implementation": "0x968BD32A558eB34EaB3480f95a58f24ef4B51920", - "address": "0x6Ae8C8498d5FDA930e6ABeB0E15E5A00471702a7" + "salt": "ITS Factory v1.0.0 devnet-amplifier2", + "implementation": "0x38a1DF03Ed0308fA545D60a458904Ad9416c8c65", + "address": "0xdB7d6A5B8d37a4f34BC1e7ce0d0B8a9DDA124871" } } }, @@ -549,26 +549,6 @@ "address": "0xD7C77eEA2aF147D351f189eF9eC17EfDf609a3c8", "implementation": "0x4F1ccCE088244d2979128b3af64cD6C8D440bbC0", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" - }, - "InterchainTokenService": { - "salt": "ITS v2.0.1", - "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v1.0.0", - "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", - "interchainToken": "0xcAe7F608732B39b8BC4870d1256873dE4345e02D", - "interchainTokenDeployer": "0xC5B77a0b7d7cC19eB04774E7fe7c3427C961530D", - "tokenManager": "0xDD2A0e438aa516D902DeD600D4CC53D53090e15a", - "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", - "gatewayCaller": "0xd6f5B7bf9A71E82Cb6B922472012Ad6E135191E8", - "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", - "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0xDc9CDacFFBDdfe30f5694CA8BDd3669203E0BE8a" - }, - "InterchainTokenFactory": { - "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v1.0.0", - "implementation": "0xeFA1Ae5180d20aa24EB26912091565dcf498B096", - "address": "0x13465b5b5F264b4EE3e87BB42C7F163897739286" } }, "explorer": { From 0359459116dcc3f7ede670b372c000e28faae8c3 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 10:03:19 -0500 Subject: [PATCH 11/20] chore: deploy ITS hub instance new avalanche-fuji, eth-sepolia, optimism-sepolia --- axelar-chains-config/info/devnet-amplifier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 2aac8bbcb..5c0f39e9f 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -393,7 +393,7 @@ "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", "salt": "ITS Factory v1.0.0 devnet-amplifier2", - "implementation": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff", + "implementation": "0x38a1DF03Ed0308fA545D60a458904Ad9416c8c65", "address": "0xdB7d6A5B8d37a4f34BC1e7ce0d0B8a9DDA124871" } } From c6a9c611ba6b2a251c3d7e002a5c66b564dd9a45 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 11:42:01 -0500 Subject: [PATCH 12/20] chore: add back flow ITS states --- .../info/devnet-amplifier.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 8a1d12727..ecd37653a 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -549,6 +549,26 @@ "address": "0xD7C77eEA2aF147D351f189eF9eC17EfDf609a3c8", "implementation": "0x4F1ccCE088244d2979128b3af64cD6C8D440bbC0", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" + }, + "InterchainTokenService": { + "salt": "ITS v2.0.1", + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "proxySalt": "ITS v1.0.0", + "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", + "interchainToken": "0xcAe7F608732B39b8BC4870d1256873dE4345e02D", + "interchainTokenDeployer": "0xC5B77a0b7d7cC19eB04774E7fe7c3427C961530D", + "tokenManager": "0xDD2A0e438aa516D902DeD600D4CC53D53090e15a", + "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", + "gatewayCaller": "0xd6f5B7bf9A71E82Cb6B922472012Ad6E135191E8", + "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", + "address": "0xDc9CDacFFBDdfe30f5694CA8BDd3669203E0BE8a" + }, + "InterchainTokenFactory": { + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "salt": "ITS Factory v1.0.0", + "implementation": "0xeFA1Ae5180d20aa24EB26912091565dcf498B096", + "address": "0x13465b5b5F264b4EE3e87BB42C7F163897739286" } }, "explorer": { From 962cd5144118da472cc901045fe57885bbd1a298 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 12:05:41 -0500 Subject: [PATCH 13/20] chore: ITS EVM contracts for consensus core-ethereum and core-optimism --- .../info/devnet-amplifier.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index ecd37653a..6f5da2cbb 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -145,6 +145,26 @@ "address": "0x5F80274696D9414a148E9D64822a42846AFFE2DC", "implementation": "0x36D0555763F6787848777AFC88c832e1ac2fC80B", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" + }, + "InterchainTokenService": { + "salt": "ITS v2.0.1 consensus devnet-amplifier2", + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "proxySalt": "ITS v1.0.0 consensus devnet-amplifier2", + "tokenManagerDeployer": "0x280f2a1e9B56c4588C09510fBeC47aBdcC4bF09F", + "interchainToken": "0x32044b6b538EC9eA6E9e9B18dCE0E0FbdE5A40BF", + "interchainTokenDeployer": "0x3e3aE0aF17f95B46e4520E8b8AC251E7c5458eF9", + "tokenManager": "0xeB5ae4405E87a559FA4a9BDA42d8c9b14f68C285", + "tokenHandler": "0x27448668C270C590b6D05F35B1d7B8d6c532eEb2", + "gatewayCaller": "0xFD02E60a566D231D97BB881BC842AF72421df96C", + "implementation": "0x34fF4642393E3AA452348e61382EcC7fcC6A4389", + "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", + "address": "0x77883201091c08570D55000AB32645b88cB96324" + }, + "InterchainTokenFactory": { + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "salt": "ITS Factory v1.0.0 consensus devnet-amplifier2", + "implementation": "0x3B1eD58362578040dd93FD978519aEcaF7129C5D", + "address": "0xD08cd727E13FAA39F4041C2f5d4D3FF89A519d5b" } } }, @@ -209,6 +229,26 @@ "address": "0x5F80274696D9414a148E9D64822a42846AFFE2DC", "implementation": "0x163223c2e74728c6BE8d57F5491E749410acB908", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" + }, + "InterchainTokenService": { + "salt": "ITS v2.0.1 consensus devnet-amplifier2", + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "proxySalt": "ITS v1.0.0 consensus devnet-amplifier2", + "tokenManagerDeployer": "0x280f2a1e9B56c4588C09510fBeC47aBdcC4bF09F", + "interchainToken": "0x32044b6b538EC9eA6E9e9B18dCE0E0FbdE5A40BF", + "interchainTokenDeployer": "0x3e3aE0aF17f95B46e4520E8b8AC251E7c5458eF9", + "tokenManager": "0xeB5ae4405E87a559FA4a9BDA42d8c9b14f68C285", + "tokenHandler": "0x27448668C270C590b6D05F35B1d7B8d6c532eEb2", + "gatewayCaller": "0x315A4b8F0866524DBf9E79525477E448455d3b33", + "implementation": "0x34fF4642393E3AA452348e61382EcC7fcC6A4389", + "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", + "address": "0x77883201091c08570D55000AB32645b88cB96324" + }, + "InterchainTokenFactory": { + "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", + "salt": "ITS Factory v1.0.0 consensus devnet-amplifier2", + "implementation": "0x3B1eD58362578040dd93FD978519aEcaF7129C5D", + "address": "0xD08cd727E13FAA39F4041C2f5d4D3FF89A519d5b" } } }, From cc4483b0f3c6469db7dcea1fa506dd030cf0a66e Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 12:15:24 -0500 Subject: [PATCH 14/20] chore: consensus ITS EVM contract core-avalanche --- .../info/devnet-amplifier.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 6f5da2cbb..6344b6420 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -63,24 +63,24 @@ "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "InterchainTokenService": { - "salt": "ITS v2.0.1 devnet-amplifier", + "salt": "ITS v2.0.1 consensus devnet-amplifier2", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v1.0.0 devnet-amplifier", - "tokenManagerDeployer": "0xb518515e96Dd6379656C50347267949d4Ec23c43", - "interchainToken": "0x35C4ca0dB9BF62f9ed859bE45f323BE4c8FD6A81", - "interchainTokenDeployer": "0x3A499F60f8B7Fa0393855270b47db18796de28Fa", - "tokenManager": "0xbcE7bb10e201A20f1d35b5F15a7f5E1C9b4339F8", - "tokenHandler": "0x8435eE93110Ce6dEa0bFFAef8CF2DfcdCBfc8373", - "gatewayCaller": "0x324d9E8389d146Dea51ade37c1369daBD90A8B0d", - "implementation": "0x75C8F5519a25fBBd9f31a320C5bda8d1C7b1f946", + "proxySalt": "ITS v1.0.0 consensus devnet-amplifier2", + "tokenManagerDeployer": "0x280f2a1e9B56c4588C09510fBeC47aBdcC4bF09F", + "interchainToken": "0x32044b6b538EC9eA6E9e9B18dCE0E0FbdE5A40BF", + "interchainTokenDeployer": "0x3e3aE0aF17f95B46e4520E8b8AC251E7c5458eF9", + "tokenManager": "0xeB5ae4405E87a559FA4a9BDA42d8c9b14f68C285", + "tokenHandler": "0x27448668C270C590b6D05F35B1d7B8d6c532eEb2", + "gatewayCaller": "0x875eD7204a245E97b7074B4E4A32ed6a39cFFd65", + "implementation": "0x34fF4642393E3AA452348e61382EcC7fcC6A4389", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0x4FDE6E2ED0EF4642478F562f73D2F3Ff5648D55e" + "address": "0x77883201091c08570D55000AB32645b88cB96324" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v1.0.0 devnet-amplifier", - "implementation": "0x586f8136E0F55Cec74F454CCe7bEb03294721073", - "address": "0x1dc68354c38A00e48af46BA9DADB96Aaf58A893c" + "salt": "ITS Factory v1.0.0 consensus devnet-amplifier2", + "implementation": "0x3B1eD58362578040dd93FD978519aEcaF7129C5D", + "address": "0xD08cd727E13FAA39F4041C2f5d4D3FF89A519d5b" } } }, From 6c575200baa29079da8e64831b77199e3ad01731 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 27 Nov 2024 14:09:33 -0500 Subject: [PATCH 15/20] chore: sui-test2 register ITS contract to hub --- axelar-chains-config/info/devnet-amplifier.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 6344b6420..3dbd10964 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -859,6 +859,10 @@ "codeId": 843, "instantiateProposalId": "61" }, + "sui-test2": { + "maxUintBits": 64, + "maxDecimalsWhenTruncating": 6 + }, "storeCodeProposalId": "58", "storeCodeProposalCodeHash": "b60d0d227c7a400a0fcc80ed52f0e6688e5da6db676a61ed8b6942823294031d", "lastUploadedCodeId": 843 From 57563419b10fa3eae19f8bd4ff9b27e681c9b768 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Mon, 2 Dec 2024 17:46:25 -0500 Subject: [PATCH 16/20] chore: migrate route v1.1.0 -> v1.2.0 --- axelar-chains-config/info/devnet-amplifier.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 3dbd10964..020ff9cfc 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -789,11 +789,15 @@ "adminAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", "codeId": 850, - "lastUploadedCodeId": 850, + "lastUploadedCodeId": 888, "address": "axelar14jjdxqhuxk803e9pq64w4fgf385y86xxhkpzswe9crmu6vxycezst0zq8y", "executeProposalId": "54", - "storeCodeProposalId": "71", - "storeCodeProposalCodeHash": "6dcf6bad5ec0e90272a015651b491e8a4e099740bdeede813ec7c947a24a9737" + "storeCodeProposalId": "101", + "storeCodeProposalCodeHash": "7368e7507f29ae9236c9c41fc1fbe5456260fb91acf1e2ff07d677bdcbca7e9f", + "axelar": { + "codeId": 888, + "address": "axelar14jjdxqhuxk803e9pq64w4fgf385y86xxhkpzswe9crmu6vxycezst0zq8y" + } }, "Multisig": { "governanceAddress": "axelar1zlr7e5qf3sz7yf890rkh9tcnu87234k6k7ytd9", From 2e4275f05457f140daa8113b317151c8bebdaafb Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Tue, 3 Dec 2024 14:51:46 -0500 Subject: [PATCH 17/20] setflowlimits --- evm/its.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evm/its.js b/evm/its.js index 3edb2e178..2eb444ae3 100644 --- a/evm/its.js +++ b/evm/its.js @@ -439,7 +439,14 @@ async function processCommand(config, chain, options) { } case 'setFlowLimits': { - const { tokenIds, flowLimits } = options; + const tokenIds = options.tokenIds.split(','); + const flowLimitsStrings = options.flowLimits.split(','); + const flowLimits = []; + + for (const flowLimit of flowLimitsStrings) { + flowLimits.push(Number(flowLimit)); + } + const tokenIdsBytes32 = []; for (const tokenId of tokenIds) { From 659bcb51cfbb0c139e7391bfd0da2d16d3cd3146 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Tue, 3 Dec 2024 17:08:35 -0500 Subject: [PATCH 18/20] chore: revert private rpc --- axelar-chains-config/info/devnet-amplifier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 020ff9cfc..e9b329e14 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -256,7 +256,7 @@ "name": "Avalanche Fuji", "axelarId": "avalanche-fuji", "chainId": 43113, - "rpc": "https://red-divine-dream.avalanche-testnet.quiknode.pro/fe8a71d7e75a6fce0f2232361b795745ae818f6a/ext/bc/C/rpc", + "rpc": "https://avalanche-fuji-c-chain-rpc.publicnode.com", "tokenSymbol": "AVAX", "confirmations": 1, "chainType": "evm", From 41878e4489d369589444b924b8ba3e2a1146a337 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 4 Dec 2024 10:11:20 -0500 Subject: [PATCH 19/20] chore: redeploy flow with correct salt --- .../info/devnet-amplifier.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index e9b329e14..4066dee6b 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -591,24 +591,24 @@ "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233" }, "InterchainTokenService": { - "salt": "ITS v2.0.1", + "salt": "ITS v2.0.1 devnet-amplifier2", "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "proxySalt": "ITS v1.0.0", - "tokenManagerDeployer": "0x2B078CC759492D1169a4d0c11E48B0388eef8C60", - "interchainToken": "0xcAe7F608732B39b8BC4870d1256873dE4345e02D", - "interchainTokenDeployer": "0xC5B77a0b7d7cC19eB04774E7fe7c3427C961530D", - "tokenManager": "0xDD2A0e438aa516D902DeD600D4CC53D53090e15a", - "tokenHandler": "0x1391457004C2647E85A2887D83609E72119eB967", - "gatewayCaller": "0xd6f5B7bf9A71E82Cb6B922472012Ad6E135191E8", - "implementation": "0x64B09264E7D54Fb665a0BaBf75D61466856a2c0b", + "proxySalt": "ITS v1.0.0 devnet-amplifier2", + "tokenManagerDeployer": "0x4Bf2315e29CacA44227E81c7484B4AF1dc7F4ED9", + "interchainToken": "0x5321CB9412D5F53d95D2B5a07861Dd45CBca2671", + "interchainTokenDeployer": "0x07DD1cE692d6D1f9DD02A81277DC06C79FFecde0", + "tokenManager": "0x4760fB5613c2818C85346805266B356000f256cC", + "tokenHandler": "0x836bF27091C254b5c8Da85408c95ED1E4A763a43", + "gatewayCaller": "0xD800E54A6476919B53a385eBa9D0dc882441aEb6", + "implementation": "0x733Ee16Fe75988b09119D698584E1d77a9FB4453", "predeployCodehash": "0x08a4a556c4db879b4f24104d13a8baf86915d58b12c81b382dfea2a82d2856cf", - "address": "0xDc9CDacFFBDdfe30f5694CA8BDd3669203E0BE8a" + "address": "0x2269B93c8D8D4AfcE9786d2940F5Fcd4386Db7ff" }, "InterchainTokenFactory": { "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233", - "salt": "ITS Factory v1.0.0", - "implementation": "0xeFA1Ae5180d20aa24EB26912091565dcf498B096", - "address": "0x13465b5b5F264b4EE3e87BB42C7F163897739286" + "salt": "ITS Factory v1.0.0 devnet-amplifier2", + "implementation": "0x38a1DF03Ed0308fA545D60a458904Ad9416c8c65", + "address": "0xdB7d6A5B8d37a4f34BC1e7ce0d0B8a9DDA124871" } }, "explorer": { From 00ff711647ec57782b9b8c25cc918757e5998a11 Mon Sep 17 00:00:00 2001 From: RiceAndmeet Date: Wed, 4 Dec 2024 10:43:25 -0500 Subject: [PATCH 20/20] chore: remove sui config to register ITS hub --- axelar-chains-config/info/devnet-amplifier.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/axelar-chains-config/info/devnet-amplifier.json b/axelar-chains-config/info/devnet-amplifier.json index 4066dee6b..3a5e22d50 100644 --- a/axelar-chains-config/info/devnet-amplifier.json +++ b/axelar-chains-config/info/devnet-amplifier.json @@ -863,10 +863,6 @@ "codeId": 843, "instantiateProposalId": "61" }, - "sui-test2": { - "maxUintBits": 64, - "maxDecimalsWhenTruncating": 6 - }, "storeCodeProposalId": "58", "storeCodeProposalCodeHash": "b60d0d227c7a400a0fcc80ed52f0e6688e5da6db676a61ed8b6942823294031d", "lastUploadedCodeId": 843