From 28148168264b6a99def5974e385becffdab54c61 Mon Sep 17 00:00:00 2001
From: Talal Ashraf <talal@interoplabs.io>
Date: Fri, 9 Aug 2024 15:08:51 -0400
Subject: [PATCH 1/7] feat: amplifier testnet (#334)

---
 axelar-chains-config/info/testnet.json | 307 ++++++++++++++++++++++++-
 1 file changed, 303 insertions(+), 4 deletions(-)

diff --git a/axelar-chains-config/info/testnet.json b/axelar-chains-config/info/testnet.json
index 21f7734b..61df485c 100644
--- a/axelar-chains-config/info/testnet.json
+++ b/axelar-chains-config/info/testnet.json
@@ -1,5 +1,166 @@
 {
   "chains": {
+    "test-avalanche": {
+      "name": "test-avalanche",
+      "id": "test-avalanche",
+      "axelarId": "test-avalanche",
+      "chainId": 43113,
+      "rpc": "https://api.avax-test.network/ext/bc/C/rpc",
+      "tokenSymbol": "AVAX",
+      "contracts": {
+        "AxelarGateway": {
+          "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "operator": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "proxyDeploymentArgs": [
+            "0x04D1909cB6Bb5Ec57ab67Ac7aC5FE952758E368D",
+            "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+            "0x000000000000000000000000ba76c6980428a0b10cfc5d8ccb61949677a612330000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000e10e0800000000000000000000000000000000000000000000000000000000000000150000000000000000000000000e3c1ac746bd5d47fa44f77a6e3a700eadd9e1bc00000000000000000000000000000000000000000000000000000000000000010000000000000000000000001f2eb0420e6aac6e25154639a37587bbc4b256d6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020aecd082d8788639f2a4afb8563f62aee2183f2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000024449d80a8c616cff227b37a1461ebd059529d140000000000000000000000000000000000000000000000000000000000000001000000000000000000000000380dda1ce71d1922b37db6079ca6e26b2b65da4b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000414b06d536092988aa828a3209a0331be53a126f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000004acc331501a4cde2bea4a3703ccf328f2833182500000000000000000000000000000000000000000000000000000000000000010000000000000000000000005cdf30e201017cb3aaab487949af41e7225e2d1600000000000000000000000000000000000000000000000000000000000000010000000000000000000000006ff6e6fb7f3804fee29aa2ff75dd889c8e09eb7e000000000000000000000000000000000000000000000000000000000000000100000000000000000000000070a97c7328a22e012d6e7c7f0615a19f6761b617000000000000000000000000000000000000000000000000000000000000000100000000000000000000000083313ac5d1e023cbca79a18b9ec5ab7875746335000000000000000000000000000000000000000000000000000000000000000100000000000000000000000092ec015a988cf083c6ad0627f37df05937687e7900000000000000000000000000000000000000000000000000000000000000010000000000000000000000009ce4f02aab880308bc8db8cc6e4ec9a2a8cded5b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b00e4c94faa6698ad2c3b64af7c94071d5eeb2d00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b9f5ea2331ef8224b56576db506afc88f8b070480000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c4db1d3fcf418d4baf61f173eef18c6fb40132fb0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c89566ef25f70cbf3507d5b3c6605129ef9d508c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cbfa786fbdbb8779063fd7580a22da8f306eb8240000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cee3d5699cbfd940b7ee9ac71518120d5f8f67570000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e19404210888776d57780666d0a435298da6d7cf0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e6a16d54e432883da61ce9130b1cd0240025ce620000000000000000000000000000000000000000000000000000000000000001"
+          ],
+          "initialVerifierSetId": "9ee4d8e004ec3787a714dc4afe022af53001f12211b02b8002c917f109cd5858",
+          "address": "0x14213B104d2D897cFeE3767F24277771C8e6B702",
+          "implementation": "0x04D1909cB6Bb5Ec57ab67Ac7aC5FE952758E368D",
+          "implementationCodehash": "0x57136a25800d320fa818f1688aecf8ad807141d240b39028852f7bf7bdca48ea",
+          "deploymentMethod": "create3",
+          "previousSignersRetention": 15,
+          "domainSeparator": "0xc62f68d52873fff0ee62d39771c681ed8e889f8cd452b31cb389106430f69fca",
+          "minimumRotationDelay": 3600,
+          "salt": "Amplifier Test Temporary"
+        },
+        "AxelarGasService": {
+          "collector": "0x6D37Ca166d05132e632C78882391031a3B5b6cE8",
+          "salt": "Amplifier Test Temporary",
+          "address": "0xbcfcF78b4a695c9f9569f7EfFD9B759A7a82F25E",
+          "implementation": "0x1384583EFFE9eaDB758D02e7440B9c393B0250c4",
+          "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233"
+        },
+        "AxelarDepositService": {},
+        "ConstAddressDeployer": {
+          "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e"
+        },
+        "Create3Deployer": {
+          "salt": "Create3Deployer",
+          "address": "0x6513Aedb4D1593BA12e50644401D976aebDc90d8",
+          "deployer": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05",
+          "deploymentMethod": "create2",
+          "codehash": "0xf0ad66defbe082df243d4d274e626f557f97579c5c9e19f33d8093d6160808b7",
+          "predeployCodehash": "0x73fc31262c4bad113c79439fd231281201c7c7d45b50328bd86bccf37684bf92"
+        },
+        "Operators": {
+          "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "address": "0x6D37Ca166d05132e632C78882391031a3B5b6cE8",
+          "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "deploymentMethod": "create2",
+          "codehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb",
+          "predeployCodehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb",
+          "salt": "Amplifier Test Temporary"
+        },
+        "Multisig": {
+          "threshold": 2,
+          "signers": [
+            "0x15837c1318AB83d99b19392Fd4811813f520d843",
+            "0x64247a441CeF0b7A46614AC34d046c0fdfe35954",
+            "0xEE64c8eb48437DbD2D5B8598dc4A3E8a6c8CEaD9"
+          ],
+          "address": "0xCC940AE49C78F20E3F13F3cF37e996b98Ac3EC68",
+          "deployer": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05",
+          "deploymentMethod": "create3",
+          "codehash": "0x912095d5076ee40a9dd49c0f9d61d61334c47a78c7512852791652baef26c296",
+          "predeployCodehash": "0x912095d5076ee40a9dd49c0f9d61d61334c47a78c7512852791652baef26c296",
+          "salt": "Multisig v5.5"
+        }
+      },
+      "explorer": {
+        "name": "Snowtrace",
+        "url": "https://testnet.snowtrace.io",
+        "api": "https://api.routescan.io/v2/network/testnet/evm/43113/etherscan"
+      },
+      "finality": "finalized",
+      "approxFinalityWaitTime": 40
+    },
+    "test-sepolia": {
+      "name": "test-Sepolia",
+      "id": "test-sepolia",
+      "axelarId": "test-sepolia",
+      "chainId": 11155111,
+      "rpc": "https://rpc.ankr.com/eth_sepolia",
+      "tokenSymbol": "ETH",
+      "confirmations": 2,
+      "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": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "operator": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "proxyDeploymentArgs": [
+            "0x04D1909cB6Bb5Ec57ab67Ac7aC5FE952758E368D",
+            "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+            "0x000000000000000000000000ba76c6980428a0b10cfc5d8ccb61949677a612330000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000b0000000000000000000000000000000000000000000000000000000000e10e0a00000000000000000000000000000000000000000000000000000000000000150000000000000000000000000e3c1ac746bd5d47fa44f77a6e3a700eadd9e1bc00000000000000000000000000000000000000000000000000000000000000010000000000000000000000001f2eb0420e6aac6e25154639a37587bbc4b256d6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000020aecd082d8788639f2a4afb8563f62aee2183f2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000024449d80a8c616cff227b37a1461ebd059529d140000000000000000000000000000000000000000000000000000000000000001000000000000000000000000380dda1ce71d1922b37db6079ca6e26b2b65da4b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000414b06d536092988aa828a3209a0331be53a126f00000000000000000000000000000000000000000000000000000000000000010000000000000000000000004acc331501a4cde2bea4a3703ccf328f2833182500000000000000000000000000000000000000000000000000000000000000010000000000000000000000005cdf30e201017cb3aaab487949af41e7225e2d1600000000000000000000000000000000000000000000000000000000000000010000000000000000000000006ff6e6fb7f3804fee29aa2ff75dd889c8e09eb7e000000000000000000000000000000000000000000000000000000000000000100000000000000000000000070a97c7328a22e012d6e7c7f0615a19f6761b617000000000000000000000000000000000000000000000000000000000000000100000000000000000000000083313ac5d1e023cbca79a18b9ec5ab7875746335000000000000000000000000000000000000000000000000000000000000000100000000000000000000000092ec015a988cf083c6ad0627f37df05937687e7900000000000000000000000000000000000000000000000000000000000000010000000000000000000000009ce4f02aab880308bc8db8cc6e4ec9a2a8cded5b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b00e4c94faa6698ad2c3b64af7c94071d5eeb2d00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000b9f5ea2331ef8224b56576db506afc88f8b070480000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c4db1d3fcf418d4baf61f173eef18c6fb40132fb0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c89566ef25f70cbf3507d5b3c6605129ef9d508c0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cbfa786fbdbb8779063fd7580a22da8f306eb8240000000000000000000000000000000000000000000000000000000000000001000000000000000000000000cee3d5699cbfd940b7ee9ac71518120d5f8f67570000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e19404210888776d57780666d0a435298da6d7cf0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e6a16d54e432883da61ce9130b1cd0240025ce620000000000000000000000000000000000000000000000000000000000000001"
+          ],
+          "initialVerifierSetId": "cc68545e4e2d498cacfeb25de6bbcbd65e1833ad6936ab4cce25f8813300dd4f",
+          "address": "0x14213B104d2D897cFeE3767F24277771C8e6B702",
+          "implementation": "0x04D1909cB6Bb5Ec57ab67Ac7aC5FE952758E368D",
+          "implementationCodehash": "0xbc2fdadb4de59bd089652e16210dc2b3631399acf267187ae07e56d0e4b78ba6",
+          "deploymentMethod": "create3",
+          "previousSignersRetention": 15,
+          "domainSeparator": "0xba2c562b33e107ee4817b6d9f9a160fed81afb7712cd379293731cfe1b65d8a4",
+          "minimumRotationDelay": 3600,
+          "salt": "Amplifier Test Temporary"
+        },
+        "Multisig": {
+          "threshold": 2,
+          "signers": [
+            "0x15837c1318AB83d99b19392Fd4811813f520d843",
+            "0x64247a441CeF0b7A46614AC34d046c0fdfe35954",
+            "0xEE64c8eb48437DbD2D5B8598dc4A3E8a6c8CEaD9"
+          ],
+          "address": "0xCC940AE49C78F20E3F13F3cF37e996b98Ac3EC68",
+          "deployer": "0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05",
+          "deploymentMethod": "create3",
+          "codehash": "0x912095d5076ee40a9dd49c0f9d61d61334c47a78c7512852791652baef26c296",
+          "predeployCodehash": "0x912095d5076ee40a9dd49c0f9d61d61334c47a78c7512852791652baef26c296",
+          "salt": "Multisig v5.5"
+        },
+        "Operators": {
+          "owner": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "address": "0x6D37Ca166d05132e632C78882391031a3B5b6cE8",
+          "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233",
+          "deploymentMethod": "create2",
+          "codehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb",
+          "predeployCodehash": "0xc561dc32ef670c929db9d7fbf6b5f6c074a62a30602481ba3b88912ca6d79feb",
+          "salt": "Amplifier Test Temporary"
+        },
+        "AxelarGasService": {
+          "collector": "0x6D37Ca166d05132e632C78882391031a3B5b6cE8",
+          "salt": "Amplifier Test Temporary",
+          "address": "0xbcfcF78b4a695c9f9569f7EfFD9B759A7a82F25E",
+          "implementation": "0x76e77A2510FABbE4b204028b0583f5864620Fab5",
+          "deployer": "0xba76c6980428A0b10CFC5d8ccb61949677A61233"
+        }
+      },
+      "explorer": {
+        "explorer": "Sepoliascan",
+        "url": "https://sepolia.etherscan.io",
+        "api": "https://api-sepolia.etherscan.io/api"
+      },
+      "gasOptions": {
+        "gasLimit": 8000000
+      },
+      "finality": "finalized",
+      "approxFinalityWaitTime": 40
+    },
     "ethereum-sepolia": {
       "name": "Ethereum-Sepolia",
       "id": "ethereum-sepolia",
@@ -2154,13 +2315,151 @@
     "contracts": {}
   },
   "axelar": {
+    "contracts": {
+      "ServiceRegistry": {
+        "governanceAccount": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+        "storeCodeProposalId": "102",
+        "storeCodeProposalCodeHash": "aa762ada72f295c0890c7beca089b13498b95d04f59262cea4bdf64b07d9edc7",
+        "codeId": 7,
+        "address": "axelar1rpj2jjrv3vpugx9ake9kgk3s2kgwt0y60wtkmcgfml5m3et0mrls6nct9m",
+        "executeProposalId": "112"
+      },
+      "Router": {
+        "adminAddress": "axelar12f2qn005d4vl03ssjq07quz6cja72w5ukuchv7",
+        "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+        "storeCodeProposalId": "100",
+        "storeCodeProposalCodeHash": "c89ad7b98afcafea866ff9b9064ade1dc865a0b4a257cbd0a80fae433c916eab",
+        "codeId": 5,
+        "address": "axelar1d9atnamjjhtc46zmzyc202llqs0rhtxnphs6mkjurekath3mkgtq7hsk93",
+        "executeProposalId": "114"
+      },
+      "NexusGateway": {
+        "nexus": "axelar17h8uk4ct0mdv9mgkuxszt4gp2htpfr08mge20r",
+        "storeCodeProposalId": "101",
+        "storeCodeProposalCodeHash": "3f0fd354823ec5d85f051a7c54bd020498a2e37866cbf480e0c107aceae1b84d",
+        "codeId": 6,
+        "address": "axelar14x5fqsezmzame904gkydguycsuqy5f8lp5knkzanccy8g8nz3yus65wveg"
+      },
+      "Rewards": {
+        "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+        "storeCodeProposalCodeHash": "0e3cd88efc3125537e3c0b3db97b9e7d8fcb51431293077a2be109b384f26ff1",
+        "rewardsDenom": "uaxl",
+        "storeCodeProposalId": "103",
+        "params": {
+          "epoch_duration": "14400",
+          "rewards_per_epoch": "10000000",
+          "participation_threshold": [
+            "7",
+            "10"
+          ]
+        },
+        "codeId": 8,
+        "address": "axelar1harq5xe68lzl2kx4e5ch4k8840cgqnry567g0fgw7vt2atcuugrqfa7j5z"
+      },
+      "Coordinator": {
+        "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+        "storeCodeProposalId": "109",
+        "storeCodeProposalCodeHash": "1c058dec7e9c294f4e7401bd9611d2e811e0cf3a41917c4dd22766ea40b95fa2",
+        "codeId": 13,
+        "address": "axelar1rwy79m8u76q2pm3lrxednlgtqjd8439l7hmctdxvjsv2shsu9meq8ntlvx"
+      },
+      "Multisig": {
+        "adminAddress": "axelar12f2qn005d4vl03ssjq07quz6cja72w5ukuchv7",
+        "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+        "blockExpiry": 10,
+        "storeCodeProposalId": "104",
+        "storeCodeProposalCodeHash": "a01cfc3c3a6e5fb22ea5818f2de8a453e0f37b9a54380d76eb4d4ea8d8b6de94",
+        "codeId": 9,
+        "address": "axelar14a4ar5jh7ue4wg28jwsspf23r8k68j7g5d6d3fsttrhp42ajn4xq6zayy5",
+        "executeProposalId": "115"
+      },
+      "MultisigProver": {
+        "test-avalanche": {
+          "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+          "adminAddress": "axelar17qafmnc4hrfa96cq37wg5l68sxh354pj6eky35",
+          "signingThreshold": [
+            "51",
+            "100"
+          ],
+          "serviceName": "amplifier",
+          "verifierSetDiffThreshold": 0,
+          "encoder": "abi",
+          "keyType": "ecdsa",
+          "domainSeparator": "0xc62f68d52873fff0ee62d39771c681ed8e889f8cd452b31cb389106430f69fca",
+          "address": "axelar1l5k8wlzmkmtnvjvs9x77wdcfweucwgums9e8fh0d8cy76ymqc5aqzguqnn"
+        },
+        "test-sepolia": {
+          "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+          "adminAddress": "axelar17qafmnc4hrfa96cq37wg5l68sxh354pj6eky35",
+          "signingThreshold": [
+            "51",
+            "100"
+          ],
+          "serviceName": "amplifier",
+          "verifierSetDiffThreshold": 0,
+          "encoder": "abi",
+          "keyType": "ecdsa",
+          "domainSeparator": "0xba2c562b33e107ee4817b6d9f9a160fed81afb7712cd379293731cfe1b65d8a4",
+          "address": "axelar1u7qt6kz34ljjx6c94444e2v57uzt2tdlgxc6qjkvu4c5phncca8qakejex"
+        },
+        "storeCodeProposalId": "107",
+        "storeCodeProposalCodeHash": "6c4d2f520d62bcd7edd4de772257e74b48a8dfba39f853a9c12ff51ca9ea1e83",
+        "codeId": 12
+      },
+      "Gateway": {
+        "test-avalanche": {
+          "address": "axelar16mek8sdcsq78jltfue35zhm5ds0cxpl0dfnrel8kck3jwtecdtnqcejdav"
+        },
+        "test-sepolia": {
+          "address": "axelar17hcsrrluv5zsrrt725wmscs3ma98hrg5f0t0ukmjxuyt2k7cwr3saxuwjc"
+        },
+        "storeCodeProposalId": "106",
+        "storeCodeProposalCodeHash": "eae97caf40ae6b5eea1e145eec27a59e73aa6f9de389fa9ca0cfc9354a3b68ac",
+        "codeId": 11
+      },
+      "VotingVerifier": {
+        "test-avalanche": {
+          "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+          "serviceName": "amplifier",
+          "sourceGatewayAddress": "0x14213B104d2D897cFeE3767F24277771C8e6B702",
+          "votingThreshold": [
+            "51",
+            "100"
+          ],
+          "blockExpiry": 10,
+          "confirmationHeight": 1,
+          "msgIdFormat": "hex_tx_hash_and_event_index",
+          "addressFormat": "eip55",
+          "address": "axelar1hupk5du59cgu4ps5s637rhakwsq0060ycdp57j2ccevna7wqqzrqnfrr0p"
+        },
+        "test-sepolia": {
+          "governanceAddress": "axelar10d07y265gmmuvt4z0w9aw880jnsr700j7v9daj",
+          "serviceName": "amplifier",
+          "sourceGatewayAddress": "0x14213B104d2D897cFeE3767F24277771C8e6B702",
+          "votingThreshold": [
+            "51",
+            "100"
+          ],
+          "blockExpiry": 10,
+          "confirmationHeight": 100000,
+          "msgIdFormat": "hex_tx_hash_and_event_index",
+          "addressFormat": "eip55",
+          "address": "axelar1r4rmvn83vrfj4evy5l8cv2nat2v0whm36ds3crn2mhlq8ufmhvts9467zz"
+        },
+        "storeCodeProposalId": "105",
+        "storeCodeProposalCodeHash": "e256445185284a52fc0ca4163c5ffd02d7f605890fb5882d01d540966957465b",
+        "codeId": 10
+      }
+    },
     "id": "Axelarnet",
     "axelarId": "Axelarnet",
     "chainId": "axelar-testnet-lisbon-3",
-    "rpc": "https://rpc-axelar-testnet.imperator.co:443",
-    "lcd": "https://lcd-axelar-testnet.imperator.co:443",
-    "grpc": "grpc-axelar-testnet.imperator.co:2062",
+    "rpc": "https://tm.axelar-testnet.lava.build:443",
+    "lcd": "https://rest.axelar-testnet.lava.build",
+    "grpc": "grpc.axelar-testnet.lava.build:443",
     "tokenSymbol": "AXL",
-    "axelarscanApi": "https://testnet.api.axelarscan.io"
+    "axelarscanApi": "https://testnet.api.axelarscan.io",
+    "gasPrice": "0.007uaxl",
+    "gasLimit": "auto"
   }
 }

From ecc82441f04a9e16141bdd52815ea1b991463f37 Mon Sep 17 00:00:00 2001
From: eguajardo <edwin@axelar.network>
Date: Thu, 15 Aug 2024 10:51:56 -0600
Subject: [PATCH 2/7] feat(amplifier): allow custom instance labels (#335)

---
 cosmwasm/deploy-contract.js |  1 +
 cosmwasm/submit-proposal.js |  2 ++
 cosmwasm/utils.js           | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cosmwasm/deploy-contract.js b/cosmwasm/deploy-contract.js
index 92a19e79..8e68223b 100644
--- a/cosmwasm/deploy-contract.js
+++ b/cosmwasm/deploy-contract.js
@@ -137,6 +137,7 @@ const programHandler = () => {
         ),
     );
     program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
+    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
     program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
     program.addOption(new Option('-y, --yes', 'skip deployment prompt confirmation').env('YES'));
 
diff --git a/cosmwasm/submit-proposal.js b/cosmwasm/submit-proposal.js
index ccbd21ac..ebde299e 100644
--- a/cosmwasm/submit-proposal.js
+++ b/cosmwasm/submit-proposal.js
@@ -248,6 +248,7 @@ const programHandler = () => {
 
     program.name('submit-proposal').description('Submit governance proposals');
 
+    // TODO: combine deploy-contract and submit-proposal options to remove duplicates
     program.addOption(
         new Option('-e, --env <env>', 'environment')
             .choices(['local', 'devnet', 'devnet-amplifier', 'devnet-verifiers', 'stagenet', 'testnet', 'mainnet'])
@@ -267,6 +268,7 @@ const programHandler = () => {
         ),
     );
     program.addOption(new Option('--instantiate2', 'use instantiate2 for constant address deployment'));
+    program.addOption(new Option('-l, --label <label>', 'contract instance label'));
     program.addOption(new Option('--aarch64', 'aarch64').env('AARCH64').default(false));
     program.addOption(new Option('-y, --yes', 'skip prompt confirmation').env('YES'));
 
diff --git a/cosmwasm/utils.js b/cosmwasm/utils.js
index 884e82fd..41bfe995 100644
--- a/cosmwasm/utils.js
+++ b/cosmwasm/utils.js
@@ -50,6 +50,8 @@ const calculateDomainSeparator = (chain, router, network) => keccak256(Buffer.fr
 
 const getSalt = (salt, contractName, chainNames) => fromHex(getSaltFromKey(salt || contractName.concat(chainNames)));
 
+const getLabel = ({ contractName, label }) => label || contractName;
+
 const readWasmFile = ({ artifactPath, contractName, aarch64 }) =>
     readFileSync(`${artifactPath}/${pascalToSnake(contractName)}${aarch64 ? '-aarch64' : ''}.wasm`);
 
@@ -94,7 +96,9 @@ const uploadContract = async (client, wallet, config, options) => {
         });
 };
 
-const instantiateContract = (client, wallet, initMsg, config, { contractName, salt, instantiate2, chainNames, admin }) => {
+const instantiateContract = (client, wallet, initMsg, config, options) => {
+    const { contractName, salt, instantiate2, chainNames, admin } = options;
+
     return wallet
         .getAccounts()
         .then(([account]) => {
@@ -105,17 +109,19 @@ const instantiateContract = (client, wallet, initMsg, config, { contractName, sa
             } = config;
             const initFee = gasLimit === 'auto' ? 'auto' : calculateFee(gasLimit, GasPrice.fromString(gasPrice));
 
+            const contractLabel = getLabel(options);
+
             return instantiate2
                 ? client.instantiate2(
                       account.address,
                       contractConfig.codeId,
                       getSalt(salt, contractName, chainNames),
                       initMsg,
-                      contractName,
+                      contractLabel,
                       initFee,
                       { admin },
                   )
-                : client.instantiate(account.address, contractConfig.codeId, initMsg, contractName, initFee, {
+                : client.instantiate(account.address, contractConfig.codeId, initMsg, contractLabel, initFee, {
                       admin,
                   });
         })
@@ -573,12 +579,12 @@ const getStoreCodeParams = (options) => {
 };
 
 const getStoreInstantiateParams = (config, options, msg) => {
-    const { contractName, admin } = options;
+    const { admin } = options;
 
     return {
         ...getStoreCodeParams(options),
         admin,
-        label: contractName,
+        label: getLabel(options),
         msg: Buffer.from(JSON.stringify(msg)),
     };
 };
@@ -592,7 +598,7 @@ const getInstantiateContractParams = (config, options, msg) => {
         ...getSubmitProposalParams(options),
         admin,
         codeId: contractConfig.codeId,
-        label: contractName,
+        label: getLabel(options),
         msg: Buffer.from(JSON.stringify(msg)),
     };
 };

From 2b8ff97474fd09d7883cad2ed35fac3fb645d0a2 Mon Sep 17 00:00:00 2001
From: Kane Armstrong <kane.armstrong@outlook.com>
Date: Fri, 16 Aug 2024 09:09:36 +1200
Subject: [PATCH 3/7] chore: partially deploy deposit service in stagenet
 (#337)

Co-authored-by: Milap Sheth <milap@interoplabs.io>
---
 axelar-chains-config/info/stagenet.json | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/axelar-chains-config/info/stagenet.json b/axelar-chains-config/info/stagenet.json
index 3640b293..4bd1708c 100644
--- a/axelar-chains-config/info/stagenet.json
+++ b/axelar-chains-config/info/stagenet.json
@@ -29,7 +29,12 @@
           "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "AxelarDepositService": {
-          "wrappedSymbol": "WAVAX"
+          "wrappedSymbol": "WAVAX",
+          "refundIssuer": "0x2517bA7a3E2cef54c1CD8618e7B0B661A7623817",
+          "salt": "AxelarDepositService",
+          "address": "0x405407133E2783aEb56F2cA9d8e6025465De0B9f",
+          "implementation": "0x523ee715a997bd471BfbE1B66acCF0d47D1fD812",
+          "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "ConstAddressDeployer": {
           "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e"
@@ -132,7 +137,12 @@
           "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "AxelarDepositService": {
-          "wrappedSymbol": "WFTM"
+          "wrappedSymbol": "WFTM",
+          "refundIssuer": "0x2517bA7a3E2cef54c1CD8618e7B0B661A7623817",
+          "salt": "AxelarDepositService",
+          "address": "0x405407133E2783aEb56F2cA9d8e6025465De0B9f",
+          "implementation": "0x523ee715a997bd471BfbE1B66acCF0d47D1fD812",
+          "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "ConstAddressDeployer": {
           "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e"
@@ -235,7 +245,12 @@
           "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "AxelarDepositService": {
-          "wrappedSymbol": "WDEV"
+          "wrappedSymbol": "WDEV",
+          "refundIssuer": "0x2517bA7a3E2cef54c1CD8618e7B0B661A7623817",
+          "salt": "AxelarDepositService",
+          "address": "0x405407133E2783aEb56F2cA9d8e6025465De0B9f",
+          "implementation": "0x20fee12E3d138b783aa9238467BDFDDECA407EF9",
+          "deployer": "0xBeF25f4733b9d451072416360609e5A4c115293E"
         },
         "ConstAddressDeployer": {
           "address": "0x98B2920D53612483F91F12Ed7754E51b4A77919e"

From f2d771b9ff2d944562283f924ca1a4716f6d46f0 Mon Sep 17 00:00:00 2001
From: re1ro <rma4ok@gmail.com>
Date: Fri, 16 Aug 2024 09:09:51 -0400
Subject: [PATCH 4/7] feat(sui): new operators script (#272)

Co-authored-by: npty <nptytn2@gmail.com>
Co-authored-by: npty <78221556+npty@users.noreply.github.com>
---
 package-lock.json  |  63 +++++++-----
 package.json       |   2 +-
 sui/README.md      |  18 ++++
 sui/cli-utils.js   |   2 -
 sui/gas-service.js |   2 +-
 sui/operators.js   | 234 +++++++++++++++++++++++++++++++++++++++++++++
 sui/types-utils.js |  11 ++-
 sui/utils.js       |  41 ++++++++
 8 files changed, 342 insertions(+), 31 deletions(-)
 create mode 100644 sui/operators.js

diff --git a/package-lock.json b/package-lock.json
index 503d6de1..c391dc6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@axelar-network/axelar-cgp-solidity": "6.3.1",
-        "@axelar-network/axelar-cgp-sui": "0.3.0",
+        "@axelar-network/axelar-cgp-sui": "^0.0.0-snapshot.218635e",
         "@axelar-network/axelar-gmp-sdk-solidity": "5.10.0",
         "@axelar-network/interchain-token-service": "1.2.4",
         "@cosmjs/cosmwasm-stargate": "^0.32.1",
@@ -42,6 +42,38 @@
         "node": ">=18"
       }
     },
+    "../axelar-cgp-sui": {
+      "version": "0.3.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cosmjs/cosmwasm-stargate": "^0.32.2",
+        "@mysten/sui": "^1.3.0",
+        "ethers": "^5.0.0",
+        "secp256k1": "^5.0.0",
+        "tmp": "^0.2.1",
+        "typescript": "^5.3.3"
+      },
+      "devDependencies": {
+        "@changesets/cli": "^2.27.6",
+        "@ianvs/prettier-plugin-sort-imports": "^4.2.1",
+        "@types/node": "^20.14.11",
+        "@types/tmp": "^0.2.6",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
+        "@typescript-eslint/parser": "^7.13.1",
+        "chai": "^4.3.7",
+        "dotenv": "^16.3.1",
+        "eslint": "^8.57.0",
+        "eslint-config-richardpringle": "^2.0.0",
+        "mocha": "^10.4.0",
+        "prettier": "^2.8.7",
+        "prettier-plugin-sort-imports": "^1.8.5",
+        "typescript": "^5.5.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@0no-co/graphql.web": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.0.7.tgz",
@@ -144,19 +176,16 @@
       }
     },
     "node_modules/@axelar-network/axelar-cgp-sui": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@axelar-network/axelar-cgp-sui/-/axelar-cgp-sui-0.3.0.tgz",
-      "integrity": "sha512-zHhtmT4L1WmOEhL8gjsZKAE+b7EGC+OIIMZTVoXVrK/NRldEoPW6356hGvyGIaWM6UzyxNh2o+JU2jj0C/avaw==",
-      "hasInstallScript": true,
+      "version": "0.0.0-snapshot.218635e",
+      "resolved": "https://registry.npmjs.org/@axelar-network/axelar-cgp-sui/-/axelar-cgp-sui-0.0.0-snapshot.218635e.tgz",
+      "integrity": "sha512-+k72piOoq6oz/NFMX57keooSP/OZ7FG8IMPbx5Y8BBIKzxusQzMovZ0inz+StJFfd4i+Ho+FlN98m8tPIqLypg==",
       "dependencies": {
         "@cosmjs/cosmwasm-stargate": "^0.32.2",
         "@mysten/sui": "^1.3.0",
-        "@types/tmp": "^0.2.6",
-        "child_process": "^1.0.2",
         "ethers": "^5.0.0",
-        "fs": "^0.0.1-security",
         "secp256k1": "^5.0.0",
-        "tmp": "^0.2.1"
+        "tmp": "^0.2.1",
+        "typescript": "^5.3.3"
       },
       "engines": {
         "node": ">=18"
@@ -2594,11 +2623,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA=="
-    },
     "node_modules/@types/w3c-web-usb": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/@types/w3c-web-usb/-/w3c-web-usb-1.0.10.tgz",
@@ -3551,11 +3575,6 @@
         "node": "*"
       }
     },
-    "node_modules/child_process": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
-      "integrity": "sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g=="
-    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -5688,11 +5707,6 @@
       "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==",
       "dev": true
     },
-    "node_modules/fs": {
-      "version": "0.0.1-security",
-      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
-      "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w=="
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -10333,7 +10347,6 @@
       "version": "5.5.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
       "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/package.json b/package.json
index 37d24349..d03692fc 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/axelarnetwork/axelar-contract-deployments#readme",
   "dependencies": {
     "@axelar-network/axelar-cgp-solidity": "6.3.1",
-    "@axelar-network/axelar-cgp-sui": "0.3.0",
+    "@axelar-network/axelar-cgp-sui": "^0.0.0-snapshot.218635e",
     "@axelar-network/axelar-gmp-sdk-solidity": "5.10.0",
     "@axelar-network/interchain-token-service": "1.2.4",
     "@cosmjs/cosmwasm-stargate": "^0.32.1",
diff --git a/sui/README.md b/sui/README.md
index 9df6c507..d0b0e283 100644
--- a/sui/README.md
+++ b/sui/README.md
@@ -147,6 +147,24 @@ The syntax is `node sui/gas-service.js payGas --amount <amount> <destinationChai
 node sui/gas-service.js payGas --amount 0.1 ethereum 0x6f24A47Fc8AE5441Eb47EFfC3665e70e69Ac3F05 0xba76c6980428A0b10CFC5d8ccb61949677A61233 0x1234
 ```
 
+Collect gas:
+
+Conditions:
+- The `GasCollectorCap` object id is read from the chain config, under gas service objects.
+```bash
+# store GasCollectorCap to the Operators contract
+node sui/operators.js storeCap
+```
+- The sender must be a whitelisted operator and hold the `OperatorCap` capability.
+```bash
+# execute the following command from the owner account
+node sui/operators add <operator address>
+```
+
+```bash
+node sui/gas-service.js collectGas --amount 0.1 --receiver <receiver address>
+```
+
 Approve messages:
 
 If the gateway was deployed using the wallet, you can submit a message approval with it
diff --git a/sui/cli-utils.js b/sui/cli-utils.js
index d36d9712..8cf95622 100644
--- a/sui/cli-utils.js
+++ b/sui/cli-utils.js
@@ -60,8 +60,6 @@ const addOptionsToCommands = (program, optionMethod, options) => {
             optionMethod(command, options);
         });
     }
-
-    optionMethod(program, options);
 };
 
 // Custom option processing for amount. https://github.com/tj/commander.js?tab=readme-ov-file#custom-option-processing
diff --git a/sui/gas-service.js b/sui/gas-service.js
index 4b81be71..0d4b64b6 100644
--- a/sui/gas-service.js
+++ b/sui/gas-service.js
@@ -176,7 +176,7 @@ if (require.main === module) {
         .description('Pay gas for the new contract call.')
         .option('--refundAddress <refundAddress>', 'Refund address. Default is the sender address.')
         .requiredOption('--amount <amount>', 'Amount to pay gas', parseSuiUnitAmount)
-        .option('--params <params>', 'Params. Default is empty.')
+        .option('--params <params>', 'Params. Default is empty.', '0x')
         .action((destinationChain, destinationAddress, channelId, payload, options) => {
             mainProcessor(options, [destinationChain, destinationAddress, channelId, payload], processCommand, payGas);
         });
diff --git a/sui/operators.js b/sui/operators.js
new file mode 100644
index 00000000..d7dd6188
--- /dev/null
+++ b/sui/operators.js
@@ -0,0 +1,234 @@
+const { Command, Option } = require('commander');
+const { Transaction } = require('@mysten/sui/transactions');
+const { printInfo, printError, loadConfig } = require('../common/utils');
+const { addBaseOptions, addOptionsToCommands, parseSuiUnitAmount } = require('./cli-utils');
+const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
+const { findOwnedObjectId } = require('./utils');
+
+function operatorMoveCall(contractConfig, gasServiceConfig, operatorCapId, tx, moveCall) {
+    const operatorId = contractConfig.objects.Operators;
+    const gasCollectorCapId = gasServiceConfig.objects.GasCollectorCap;
+
+    const [cap, loanedCap] = tx.moveCall({
+        target: `${contractConfig.address}::operators::loan_cap`,
+        arguments: [tx.object(operatorId), tx.object(operatorCapId), tx.object(gasCollectorCapId)],
+        typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
+    });
+
+    moveCall(cap);
+
+    tx.moveCall({
+        target: `${contractConfig.address}::operators::restore_cap`,
+        arguments: [tx.object(operatorId), tx.object(operatorCapId), tx.object(gasCollectorCapId), cap, loanedCap],
+        typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
+    });
+
+    return tx;
+}
+
+async function collectGas(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [amount] = args;
+    const receiver = options.receiver || keypair.toSuiAddress();
+
+    const operatorCapId = await findOwnedObjectId(client, keypair.toSuiAddress(), `${contractConfig.address}::operators::OperatorCap`);
+    const tx = new Transaction();
+
+    operatorMoveCall(contractConfig, gasServiceConfig, operatorCapId, tx, (cap) => {
+        tx.moveCall({
+            target: `${gasServiceConfig.address}::gas_service::collect_gas`,
+            arguments: [tx.object(gasServiceConfig.objects.GasService), cap, tx.pure.address(receiver), tx.pure.u64(amount)],
+        });
+    });
+
+    const receipt = await broadcast(client, keypair, tx);
+
+    printInfo('Gas collected', receipt.digest);
+}
+
+async function refund(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [messageId] = args;
+    const amount = options.amount;
+    const receiver = options.receiver || keypair.toSuiAddress();
+    const operatorCapId = await findOwnedObjectId(client, keypair.toSuiAddress(), `${contractConfig.address}::operators::OperatorCap`);
+
+    const tx = new Transaction();
+
+    operatorMoveCall(contractConfig, gasServiceConfig, operatorCapId, tx, (cap) => {
+        tx.moveCall({
+            target: `${gasServiceConfig.address}::gas_service::refund`,
+            arguments: [
+                tx.object(gasServiceConfig.objects.GasService),
+                cap,
+                tx.pure.string(messageId),
+                tx.pure.address(receiver),
+                tx.pure.u64(amount),
+            ],
+        });
+    });
+
+    const receipt = await broadcast(client, keypair, tx);
+
+    printInfo('Gas refunded', receipt.digest);
+}
+
+async function storeCap(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [capId] = args;
+    const gasCollectorCapId = capId || gasServiceConfig.objects.GasCollectorCap;
+    const ownerCapId = contractConfig.objects.OwnerCap;
+    const operatorId = contractConfig.objects.Operators;
+
+    const tx = new Transaction();
+
+    tx.moveCall({
+        target: `${contractConfig.address}::operators::store_cap`,
+        arguments: [tx.object(operatorId), tx.object(ownerCapId), tx.object(gasCollectorCapId)],
+        typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
+    });
+
+    const receipt = await broadcast(client, keypair, tx);
+
+    printInfo('Capability stored', receipt.digest);
+}
+
+async function addOperator(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [newOperatorAddress] = args;
+
+    const operatorsObjectId = contractConfig.objects.Operators;
+    const ownerCapObjectId = options.ownerCapId || contractConfig.objects.OwnerCap;
+
+    const tx = new Transaction();
+
+    tx.moveCall({
+        target: `${contractConfig.address}::operators::add_operator`,
+        arguments: [tx.object(operatorsObjectId), tx.object(ownerCapObjectId), tx.pure.address(newOperatorAddress)],
+    });
+
+    const receipt = await broadcast(client, keypair, tx);
+
+    printInfo('Operator Added', receipt.digest);
+}
+
+async function removeCap(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [capId] = args;
+
+    const gasServiceAddress = gasServiceConfig.address;
+    const operatorsObjectId = contractConfig.objects.Operators;
+    const ownerCapObjectId = options.ownerCapId || contractConfig.objects.OwnerCap;
+    const capReceiver = options.receiver || keypair.toSuiAddress();
+
+    const tx = new Transaction();
+
+    const cap = tx.moveCall({
+        target: `${contractConfig.address}::operators::remove_cap`,
+        arguments: [tx.object(operatorsObjectId), tx.object(ownerCapObjectId), tx.object(capId)],
+        typeArguments: [`${gasServiceAddress}::gas_service::GasCollectorCap`],
+    });
+
+    tx.transferObjects([cap], capReceiver);
+
+    try {
+        const receipt = await broadcast(client, keypair, tx);
+
+        printInfo('Capability Removed', receipt.digest);
+    } catch (e) {
+        printError('RemoveCap Error', e.message);
+    }
+}
+
+async function removeOperator(keypair, client, gasServiceConfig, contractConfig, args, options) {
+    const [operatorAddress] = args;
+
+    const operatorsObjectId = contractConfig.objects.Operators;
+    const ownerCapObjectId = options.ownerCapId || contractConfig.objects.OwnerCap;
+
+    const tx = new Transaction();
+
+    tx.moveCall({
+        target: `${contractConfig.address}::operators::remove_operator`,
+        arguments: [tx.object(operatorsObjectId), tx.object(ownerCapObjectId), tx.pure.address(operatorAddress)],
+    });
+
+    const receipt = await broadcast(client, keypair, tx);
+
+    printInfo('Operator Removed', receipt.digest);
+}
+
+async function mainProcessor(processor, args, options) {
+    const config = loadConfig(options.env);
+
+    const contractConfig = config.sui.contracts.Operators;
+    const gasServiceConfig = config.sui.contracts.GasService;
+
+    if (!contractConfig) {
+        throw new Error('Operators package not found.');
+    }
+
+    if (!gasServiceConfig) {
+        throw new Error('Gas service package not found.');
+    }
+
+    const [keypair, client] = getWallet(config.sui, options);
+    await printWalletInfo(keypair, client, config.sui, options);
+    await processor(keypair, client, gasServiceConfig, contractConfig, args, options);
+}
+
+if (require.main === module) {
+    const program = new Command('operators');
+
+    program.description('Operators contract operations.');
+
+    program.addCommand(
+        new Command('add')
+            .command('add <newOperatorAddress>')
+            .description('Add an operator')
+            .addOption(new Option('--ownerCap <ownerCapId>', 'ID of the owner capability'))
+            .action((newOperatorAddress, options) => mainProcessor(addOperator, [newOperatorAddress], options)),
+    );
+
+    program.addCommand(
+        new Command('remove')
+            .command('remove <operatorAddress>')
+            .description('Remove an operator')
+            .addOption(new Option('--ownerCap <ownerCapId>', 'ID of the owner capability'))
+            .action((operatorAddress, options) => mainProcessor(removeOperator, [operatorAddress], options)),
+    );
+
+    program.addCommand(
+        new Command('collectGas')
+            .command('collectGas')
+            .description('Collect gas from the gas service')
+            .addOption(new Option('--receiver <receiver>', 'Address of the receiver'))
+            .requiredOption('--amount <amount>', 'Amount to add gas', parseSuiUnitAmount)
+            .action((options) => mainProcessor(collectGas, [options.amount], options)),
+    );
+
+    program.addCommand(
+        new Command('storeCap')
+            .command('storeCap')
+            .description('Store a capability')
+            .addOption(new Option('--capId <capId>', 'ID of the capability to store'))
+            .action((options) => mainProcessor(storeCap, [], options)),
+    );
+
+    program.addCommand(
+        new Command('removeCap')
+            .command('removeCap <capId>')
+            .description('Remove a capability')
+            .addOption(new Option('--ownerCap <ownerCapId>', 'ID of the owner capability'))
+            .addOption(new Option('--receiver <receiver>', 'The removed cap receiver address'))
+            .action((capId, options) => mainProcessor(removeCap, [capId], options)),
+    );
+
+    program.addCommand(
+        new Command('refund')
+            .command('refund <messageId>')
+            .description('Refund gas from the gas service')
+            .addOption(new Option('--receiver <receiver>', 'Address of the receiver'))
+            .requiredOption('--amount <amount>', 'Amount to refund', parseSuiUnitAmount)
+            .action((messageId, options) => mainProcessor(refund, [messageId], options)),
+    );
+
+    addOptionsToCommands(program, addBaseOptions);
+
+    program.parse();
+}
diff --git a/sui/types-utils.js b/sui/types-utils.js
index cd90d4ff..afa87595 100644
--- a/sui/types-utils.js
+++ b/sui/types-utils.js
@@ -83,12 +83,18 @@ const discoveryStruct = bcs.struct('Discovery', {
     fields: discoveryTable,
 });
 
-const tableStruct = bcs.struct('Table', {
+const bagStruct = bcs.struct('Bag', {
     id: UID,
     size: bcs.U64,
 });
 
-const bagStruct = bcs.struct('Bag', {
+const operatorsStruct = bcs.struct('Operators', {
+    id: UID,
+    operators: bcs.vector(addressStruct),
+    caps: bagStruct,
+});
+
+const tableStruct = bcs.struct('Table', {
     id: UID,
     size: bcs.U64,
 });
@@ -123,6 +129,7 @@ module.exports = {
     signerStruct,
     bytes32Struct,
     signersStruct,
+    operatorsStruct,
     messageToSignStruct,
     messageStruct,
     approvedMessageStruct,
diff --git a/sui/utils.js b/sui/utils.js
index 1ef47c8c..8c7ab88c 100644
--- a/sui/utils.js
+++ b/sui/utils.js
@@ -145,9 +145,49 @@ const getSigners = async (keypair, config, chain, options) => {
     return getAmplifierSigners(config, chain);
 };
 
+const findOwnedObjectId = async (client, ownerAddress, objectType) => {
+    const ownedObjects = await client.getOwnedObjects({
+        owner: ownerAddress,
+        options: {
+            showContent: true,
+        },
+    });
+
+    const targetObject = ownedObjects.data.find(({ data }) => data.content.type === objectType);
+
+    if (!targetObject) {
+        throw new Error(`No object found for type: ${objectType}`);
+    }
+
+    return targetObject.data.content.fields.id.id;
+};
+
+const getBagContentId = async (client, objectType, bagId, bagName) => {
+    const result = await client.getDynamicFields({
+        parentId: bagId,
+        name: bagName,
+    });
+
+    const objectId = result.data.find((cap) => cap.objectType === objectType)?.objectId;
+
+    if (!objectId) {
+        throw new Error(`${objectType} not found in the capabilities bag`);
+    }
+
+    const objectDetails = await client.getObject({
+        id: objectId,
+        options: {
+            showContent: true,
+        },
+    });
+
+    return objectDetails.data.content.fields.value.fields.id.id;
+};
+
 module.exports = {
     suiPackageAddress,
     suiClockAddress,
+    findOwnedObjectId,
     getAmplifierSigners,
     getBcsBytesByObjectId,
     deployPackage,
@@ -158,4 +198,5 @@ module.exports = {
     getItsChannelId,
     getSquidChannelId,
     getSigners,
+    getBagContentId,
 };

From ca64dd9485150b297cb32bdff9c7b532be3840c5 Mon Sep 17 00:00:00 2001
From: npty <78221556+npty@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:57:12 +0700
Subject: [PATCH 5/7] chore: cleanup and refactor (#338)

---
 sui/deploy-contract.js                        | 13 +++-
 sui/deploy-test.js                            | 75 -------------------
 sui/faucet.js                                 |  5 +-
 sui/gas-service.js                            | 20 +++--
 sui/gateway.js                                | 20 +++--
 sui/generate-keypair.js                       |  3 +-
 sui/gmp.js                                    | 20 +++--
 sui/multisig.js                               |  6 +-
 sui/operators.js                              | 12 ++-
 sui/transfer-object.js                        |  6 +-
 sui/{ => utils}/amount-utils.js               |  0
 sui/{ => utils}/cli-utils.js                  |  0
 sui/utils/index.js                            |  8 ++
 sui/{ => utils}/sign-utils.js                 |  2 +-
 sui/{ => utils}/types-utils.js                |  0
 .../upgrade-utils.js}                         |  2 +-
 sui/{ => utils}/utils.js                      |  9 ++-
 17 files changed, 79 insertions(+), 122 deletions(-)
 delete mode 100644 sui/deploy-test.js
 rename sui/{ => utils}/amount-utils.js (100%)
 rename sui/{ => utils}/cli-utils.js (100%)
 create mode 100644 sui/utils/index.js
 rename sui/{ => utils}/sign-utils.js (99%)
 rename sui/{ => utils}/types-utils.js (100%)
 rename sui/{deploy-utils.js => utils/upgrade-utils.js} (97%)
 rename sui/{ => utils}/utils.js (95%)

diff --git a/sui/deploy-contract.js b/sui/deploy-contract.js
index af3e6fad..6a2da820 100644
--- a/sui/deploy-contract.js
+++ b/sui/deploy-contract.js
@@ -8,11 +8,16 @@ const {
     utils: { arrayify },
 } = ethers;
 const { saveConfig, printInfo, validateParameters, writeJSON, getDomainSeparator, loadConfig } = require('../common');
-const { addBaseOptions, addOptionsToCommands } = require('./cli-utils');
-const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
-const { bytes32Struct, signersStruct } = require('./types-utils');
-const { upgradePackage, UPGRADE_POLICIES } = require('./deploy-utils');
 const {
+    addBaseOptions,
+    addOptionsToCommands,
+    getWallet,
+    printWalletInfo,
+    broadcast,
+    bytes32Struct,
+    signersStruct,
+    upgradePackage,
+    UPGRADE_POLICIES,
     getSigners,
     deployPackage,
     getObjectIdsByObjectTypes,
diff --git a/sui/deploy-test.js b/sui/deploy-test.js
deleted file mode 100644
index 407f2823..00000000
--- a/sui/deploy-test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-const { loadConfig, saveConfig, prompt, printInfo } = require('../common/utils');
-const { Command } = require('commander');
-const { deployPackage, getBcsBytesByObjectId } = require('./utils');
-const { singletonStruct } = require('./types-utils');
-const { Transaction } = require('@mysten/sui/transactions');
-const { addBaseOptions } = require('./cli-utils');
-const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
-
-// Parse bcs bytes from singleton object to get channel id
-async function getSingletonChannelId(client, singletonObjectId) {
-    const bcsBytes = await getBcsBytesByObjectId(client, singletonObjectId);
-    const data = singletonStruct.parse(bcsBytes);
-    return '0x' + data.channel.id;
-}
-
-async function processCommand(config, chain, options) {
-    const [keypair, client] = getWallet(chain, options);
-
-    await printWalletInfo(keypair, client, chain, options);
-
-    if (!chain.contracts.test) {
-        chain.contracts.test = {};
-    }
-
-    const relayerDiscovery = config.sui.contracts.axelar_gateway?.objects?.relayerDiscovery;
-
-    if (!relayerDiscovery) {
-        throw new Error('Relayer discovery object not found');
-    }
-
-    if (prompt(`Proceed with deployment on ${chain.name}?`, options.yes)) {
-        return;
-    }
-
-    const published = await deployPackage('test', client, keypair);
-
-    const singleton = published.publishTxn.objectChanges.find((change) => change.objectType === `${published.packageId}::test::Singleton`);
-
-    const tx = new Transaction();
-
-    tx.moveCall({
-        target: `${published.packageId}::test::register_transaction`,
-        arguments: [tx.object(relayerDiscovery), tx.object(singleton.objectId)],
-    });
-
-    await broadcast(client, keypair, tx);
-
-    const channelId = await getSingletonChannelId(client, singleton.objectId);
-
-    chain.contracts.test.address = published.packageId;
-    chain.contracts.test.objects = { singleton: singleton.objectId, channelId };
-
-    printInfo('Test package deployed', JSON.stringify(chain.contracts.test, null, 2));
-}
-
-async function mainProcessor(options, processor) {
-    const config = loadConfig(options.env);
-
-    await processor(config, config.sui, options);
-    saveConfig(config, options.env);
-}
-
-if (require.main === module) {
-    const program = new Command();
-
-    program.name('deploy-test').description('Deploys/publishes the test module');
-
-    addBaseOptions(program);
-
-    program.action((options) => {
-        mainProcessor(options, processCommand);
-    });
-
-    program.parse();
-}
diff --git a/sui/faucet.js b/sui/faucet.js
index 0bdb52b5..a52acdb1 100644
--- a/sui/faucet.js
+++ b/sui/faucet.js
@@ -1,10 +1,9 @@
 'use strict';
 
-const { addBaseOptions } = require('./cli-utils');
 const { requestSuiFromFaucetV0, getFaucetHost } = require('@mysten/sui/faucet');
-const { getWallet, printWalletInfo } = require('./sign-utils');
-const { Command } = require('commander');
 const { saveConfig, loadConfig, printInfo } = require('../common/utils');
+const { getWallet, printWalletInfo, addBaseOptions } = require('./utils');
+const { Command } = require('commander');
 
 async function processCommand(config, chain, options) {
     const [keypair, client] = getWallet(chain, options);
diff --git a/sui/gas-service.js b/sui/gas-service.js
index 0d4b64b6..eedcf82e 100644
--- a/sui/gas-service.js
+++ b/sui/gas-service.js
@@ -1,18 +1,22 @@
-const { saveConfig, printInfo, printError } = require('../common/utils');
 const { Command } = require('commander');
 const { Transaction } = require('@mysten/sui/transactions');
 const { bcs } = require('@mysten/sui/bcs');
-const { loadConfig } = require('../common/utils');
-const { gasServiceStruct } = require('./types-utils');
-const { getBcsBytesByObjectId } = require('./utils');
 const { ethers } = require('hardhat');
-const { getFormattedAmount } = require('./amount-utils');
 const {
     utils: { arrayify },
 } = ethers;
-
-const { addOptionsToCommands, addBaseOptions, parseSuiUnitAmount } = require('./cli-utils');
-const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
+const { saveConfig, loadConfig, printInfo, printError } = require('../common/utils');
+const {
+    getWallet,
+    printWalletInfo,
+    broadcast,
+    gasServiceStruct,
+    getBcsBytesByObjectId,
+    getFormattedAmount,
+    addOptionsToCommands,
+    addBaseOptions,
+    parseSuiUnitAmount,
+} = require('./utils');
 
 async function payGas(keypair, client, gasServiceConfig, args, options) {
     const walletAddress = keypair.toSuiAddress();
diff --git a/sui/gateway.js b/sui/gateway.js
index d46721de..f83a25fb 100644
--- a/sui/gateway.js
+++ b/sui/gateway.js
@@ -1,4 +1,3 @@
-const { saveConfig, printInfo } = require('../common/utils');
 const { Command, Option } = require('commander');
 const { Transaction } = require('@mysten/sui/transactions');
 const { bcs } = require('@mysten/sui/bcs');
@@ -8,11 +7,20 @@ const {
     constants: { HashZero },
 } = ethers;
 
-const { loadConfig } = require('../common/utils');
-const { addBaseOptions } = require('./cli-utils');
-const { getWallet, printWalletInfo, getRawPrivateKey, broadcast } = require('./sign-utils');
-const { bytes32Struct, signersStruct, messageToSignStruct, messageStruct, proofStruct } = require('./types-utils');
-const { getSigners } = require('./deploy-gateway');
+const { saveConfig, printInfo, loadConfig } = require('../common/utils');
+const {
+    bytes32Struct,
+    signersStruct,
+    messageToSignStruct,
+    messageStruct,
+    proofStruct,
+    addBaseOptions,
+    getSigners,
+    getWallet,
+    printWalletInfo,
+    getRawPrivateKey,
+    broadcast,
+} = require('./utils');
 const secp256k1 = require('secp256k1');
 
 const COMMAND_TYPE_APPROVE_MESSAGES = 0;
diff --git a/sui/generate-keypair.js b/sui/generate-keypair.js
index e9a76322..6fdec693 100644
--- a/sui/generate-keypair.js
+++ b/sui/generate-keypair.js
@@ -1,8 +1,7 @@
 'use strict';
 
-const { addBaseOptions } = require('./cli-utils');
-const { generateKeypair, getRawPrivateKey } = require('./sign-utils');
 const { Command, Option } = require('commander');
+const { addBaseOptions, generateKeypair, getRawPrivateKey } = require('./utils');
 const { saveConfig, loadConfig, printInfo } = require('../common/utils');
 
 const { ethers } = require('hardhat');
diff --git a/sui/gmp.js b/sui/gmp.js
index 5c3ab2a5..b007a39e 100644
--- a/sui/gmp.js
+++ b/sui/gmp.js
@@ -1,19 +1,23 @@
-const { saveConfig, printInfo } = require('../common/utils');
 const { Command } = require('commander');
 const { Transaction } = require('@mysten/sui/transactions');
 const { bcs } = require('@mysten/sui/bcs');
-const { getBcsBytesByObjectId } = require('./utils');
-const { loadConfig } = require('../common/utils');
+const { saveConfig, printInfo } = require('../common/utils');
+const {
+    loadConfig,
+    getBcsBytesByObjectId,
+    addBaseOptions,
+    addOptionsToCommands,
+    getUnitAmount,
+    getWallet,
+    printWalletInfo,
+    discoveryStruct,
+    broadcast,
+} = require('./utils');
 const { ethers } = require('hardhat');
 const {
     utils: { arrayify },
 } = ethers;
 
-const { addBaseOptions, addOptionsToCommands } = require('./cli-utils');
-const { getUnitAmount } = require('./amount-utils.js');
-const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
-const { discoveryStruct } = require('./types-utils.js');
-
 async function sendCommand(keypair, client, contracts, args, options) {
     const [destinationChain, destinationAddress, feeAmount, payload] = args;
     const params = options.params;
diff --git a/sui/multisig.js b/sui/multisig.js
index 2571ac8d..c09fef3a 100644
--- a/sui/multisig.js
+++ b/sui/multisig.js
@@ -1,10 +1,8 @@
 const { Command, Option } = require('commander');
 const { fromB64 } = require('@mysten/bcs');
-const { addBaseOptions } = require('./cli-utils');
-const { getWallet, getMultisig, signTransactionBlockBytes, broadcastSignature } = require('./sign-utils');
+const { loadConfig, printInfo, validateParameters } = require('../common/utils');
 const { getSignedTx, storeSignedTx } = require('../evm/sign-utils');
-const { loadConfig } = require('../common/utils');
-const { printInfo, validateParameters } = require('../common/utils');
+const { addBaseOptions, getWallet, getMultisig, signTransactionBlockBytes, broadcastSignature } = require('./utils');
 
 async function signTx(keypair, client, options) {
     const txFileData = getSignedTx(options.txBlockPath);
diff --git a/sui/operators.js b/sui/operators.js
index d7dd6188..d6468e04 100644
--- a/sui/operators.js
+++ b/sui/operators.js
@@ -1,9 +1,15 @@
 const { Command, Option } = require('commander');
 const { Transaction } = require('@mysten/sui/transactions');
 const { printInfo, printError, loadConfig } = require('../common/utils');
-const { addBaseOptions, addOptionsToCommands, parseSuiUnitAmount } = require('./cli-utils');
-const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
-const { findOwnedObjectId } = require('./utils');
+const {
+    addBaseOptions,
+    addOptionsToCommands,
+    parseSuiUnitAmount,
+    getWallet,
+    printWalletInfo,
+    broadcast,
+    findOwnedObjectId,
+} = require('./utils');
 
 function operatorMoveCall(contractConfig, gasServiceConfig, operatorCapId, tx, moveCall) {
     const operatorId = contractConfig.objects.Operators;
diff --git a/sui/transfer-object.js b/sui/transfer-object.js
index 10919e00..2d786127 100644
--- a/sui/transfer-object.js
+++ b/sui/transfer-object.js
@@ -1,9 +1,7 @@
 const { Transaction } = require('@mysten/sui/transactions');
 const { Command, Option } = require('commander');
-const { printInfo, validateParameters } = require('../common/utils');
-const { addExtendedOptions } = require('./cli-utils');
-const { getWallet, printWalletInfo } = require('./sign-utils');
-const { loadConfig } = require('../common/utils');
+const { loadConfig, printInfo, validateParameters } = require('../common/utils');
+const { getWallet, printWalletInfo, addExtendedOptions } = require('./utils');
 
 async function processCommand(chain, options) {
     const [keypair, client] = getWallet(chain, options);
diff --git a/sui/amount-utils.js b/sui/utils/amount-utils.js
similarity index 100%
rename from sui/amount-utils.js
rename to sui/utils/amount-utils.js
diff --git a/sui/cli-utils.js b/sui/utils/cli-utils.js
similarity index 100%
rename from sui/cli-utils.js
rename to sui/utils/cli-utils.js
diff --git a/sui/utils/index.js b/sui/utils/index.js
new file mode 100644
index 00000000..4c19b535
--- /dev/null
+++ b/sui/utils/index.js
@@ -0,0 +1,8 @@
+module.exports = {
+    ...require('./amount-utils'),
+    ...require('./sign-utils'),
+    ...require('./types-utils'),
+    ...require('./utils'),
+    ...require('./upgrade-utils'),
+    ...require('./cli-utils'),
+};
diff --git a/sui/sign-utils.js b/sui/utils/sign-utils.js
similarity index 99%
rename from sui/sign-utils.js
rename to sui/utils/sign-utils.js
index c8aeee4c..83aaebc6 100644
--- a/sui/sign-utils.js
+++ b/sui/utils/sign-utils.js
@@ -8,7 +8,7 @@ const { Secp256k1Keypair, Secp256k1PublicKey } = require('@mysten/sui/keypairs/s
 const { Secp256r1Keypair, Secp256r1PublicKey } = require('@mysten/sui/keypairs/secp256r1');
 const { SuiClient, getFullnodeUrl } = require('@mysten/sui/client');
 const { fromB64, fromHEX } = require('@mysten/bcs');
-const { printInfo } = require('../common/utils');
+const { printInfo } = require('../../common/utils');
 const { ethers } = require('hardhat');
 const {
     utils: { hexlify },
diff --git a/sui/types-utils.js b/sui/utils/types-utils.js
similarity index 100%
rename from sui/types-utils.js
rename to sui/utils/types-utils.js
diff --git a/sui/deploy-utils.js b/sui/utils/upgrade-utils.js
similarity index 97%
rename from sui/deploy-utils.js
rename to sui/utils/upgrade-utils.js
index 0dd21568..ee5f3606 100644
--- a/sui/deploy-utils.js
+++ b/sui/utils/upgrade-utils.js
@@ -1,6 +1,6 @@
 const { bcs } = require('@mysten/bcs');
 const { fromB64 } = require('@mysten/bcs');
-const { printInfo, validateParameters } = require('../common/utils');
+const { printInfo, validateParameters } = require('../../common/utils');
 const { getObjectIdsByObjectTypes, suiPackageAddress } = require('./utils');
 const UPGRADE_POLICIES = {
     code_upgrade: 'only_additive_upgrades',
diff --git a/sui/utils.js b/sui/utils/utils.js
similarity index 95%
rename from sui/utils.js
rename to sui/utils/utils.js
index 8c7ab88c..d9febec4 100644
--- a/sui/utils.js
+++ b/sui/utils/utils.js
@@ -2,7 +2,7 @@
 
 const { ethers } = require('hardhat');
 const toml = require('toml');
-const { printInfo, printError } = require('../common/utils');
+const { printInfo, printError } = require('../../common/utils');
 const {
     BigNumber,
     utils: { arrayify, hexlify, toUtf8Bytes, keccak256 },
@@ -53,7 +53,7 @@ const getBcsBytesByObjectId = async (client, objectId) => {
 };
 
 const deployPackage = async (packageName, client, keypair, options = {}) => {
-    const compileDir = `${__dirname}/move`;
+    const compileDir = `${__dirname}/../move`;
 
     copyMovePackage(packageName, null, compileDir);
 
@@ -74,7 +74,10 @@ const findPublishedObject = (published, packageDir, contractName) => {
 
 const readMovePackageName = (moveDir) => {
     try {
-        const moveToml = fs.readFileSync(`${__dirname}/../node_modules/@axelar-network/axelar-cgp-sui/move/${moveDir}/Move.toml`, 'utf8');
+        const moveToml = fs.readFileSync(
+            `${__dirname}/../../node_modules/@axelar-network/axelar-cgp-sui/move/${moveDir}/Move.toml`,
+            'utf8',
+        );
 
         const { package: movePackage } = toml.parse(moveToml);
 

From 2e1ad027b1aa8c318832da5554ada273aa4a33c3 Mon Sep 17 00:00:00 2001
From: jcs47 <11947034+jcs47@users.noreply.github.com>
Date: Mon, 19 Aug 2024 22:52:53 +0100
Subject: [PATCH 6/7] chore(cosmwasm): remove `params` field from Rewards
 contract instantiation (#340)

---
 cosmwasm/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cosmwasm/utils.js b/cosmwasm/utils.js
index 41bfe995..7a897da6 100644
--- a/cosmwasm/utils.js
+++ b/cosmwasm/utils.js
@@ -173,7 +173,7 @@ const makeMultisigInstantiateMsg = ({ adminAddress, governanceAddress, blockExpi
     };
 };
 
-const makeRewardsInstantiateMsg = ({ governanceAddress, rewardsDenom, params }) => {
+const makeRewardsInstantiateMsg = ({ governanceAddress, rewardsDenom }) => {
     if (!validateAddress(governanceAddress)) {
         throw new Error('Missing or invalid Rewards.governanceAddress in axelar info');
     }
@@ -182,7 +182,7 @@ const makeRewardsInstantiateMsg = ({ governanceAddress, rewardsDenom, params })
         throw new Error('Missing or invalid Rewards.rewardsDenom in axelar info');
     }
 
-    return { governance_address: governanceAddress, rewards_denom: rewardsDenom, params };
+    return { governance_address: governanceAddress, rewards_denom: rewardsDenom };
 };
 
 const makeRouterInstantiateMsg = ({ adminAddress, governanceAddress }, { NexusGateway: { address: nexusGateway } }) => {

From 9d9d9af922a596649d2632702be746cfdd13e211 Mon Sep 17 00:00:00 2001
From: npty <78221556+npty@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:03:33 +0700
Subject: [PATCH 7/7] feat(sui): modify gmp send-call to send more params
 (#331)

---
 package-lock.json |  2 +-
 package.json      |  2 +-
 sui/gmp.js        | 27 +++++++--------------------
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c391dc6f..a9f2d8e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@axelar-network/axelar-cgp-solidity": "6.3.1",
-        "@axelar-network/axelar-cgp-sui": "^0.0.0-snapshot.218635e",
+        "@axelar-network/axelar-cgp-sui": "0.0.0-snapshot.218635e",
         "@axelar-network/axelar-gmp-sdk-solidity": "5.10.0",
         "@axelar-network/interchain-token-service": "1.2.4",
         "@cosmjs/cosmwasm-stargate": "^0.32.1",
diff --git a/package.json b/package.json
index d03692fc..d136354b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "homepage": "https://github.com/axelarnetwork/axelar-contract-deployments#readme",
   "dependencies": {
     "@axelar-network/axelar-cgp-solidity": "6.3.1",
-    "@axelar-network/axelar-cgp-sui": "^0.0.0-snapshot.218635e",
+    "@axelar-network/axelar-cgp-sui": "0.0.0-snapshot.218635e",
     "@axelar-network/axelar-gmp-sdk-solidity": "5.10.0",
     "@axelar-network/interchain-token-service": "1.2.4",
     "@cosmjs/cosmwasm-stargate": "^0.32.1",
diff --git a/sui/gmp.js b/sui/gmp.js
index b007a39e..6aa5ccf2 100644
--- a/sui/gmp.js
+++ b/sui/gmp.js
@@ -23,9 +23,8 @@ async function sendCommand(keypair, client, contracts, args, options) {
     const params = options.params;
 
     const [testConfig, gasServiceConfig] = contracts;
-    const gasServicePackageId = gasServiceConfig.address;
-    const singletonObjectId = testConfig.objects.singleton;
-    const channelId = testConfig.objects.channelId;
+    const gasServiceObjectId = gasServiceConfig.objects.GasService;
+    const singletonObjectId = testConfig.objects.Singleton;
 
     const unitAmount = getUnitAmount(feeAmount);
     const walletAddress = keypair.toSuiAddress();
@@ -38,28 +37,16 @@ async function sendCommand(keypair, client, contracts, args, options) {
         target: `${testConfig.address}::test::send_call`,
         arguments: [
             tx.object(singletonObjectId),
+            tx.object(gasServiceObjectId),
             tx.pure(bcs.string().serialize(destinationChain).toBytes()),
             tx.pure(bcs.string().serialize(destinationAddress).toBytes()),
             tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(payload)).toBytes()),
+            tx.pure.address(refundAddress),
+            coin,
+            tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(params)).toBytes()),
         ],
     });
 
-    if (gasServiceConfig) {
-        tx.moveCall({
-            target: `${gasServicePackageId}::gas_service::pay_gas`,
-            arguments: [
-                tx.object(gasServiceConfig.objects.GasService),
-                coin, // Coin<SUI>
-                tx.pure.address(channelId), // Channel address
-                tx.pure(bcs.string().serialize(destinationChain).toBytes()), // Destination chain
-                tx.pure(bcs.string().serialize(destinationAddress).toBytes()), // Destination address
-                tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(payload)).toBytes()), // Payload
-                tx.pure.address(refundAddress), // Refund address
-                tx.pure(bcs.vector(bcs.u8()).serialize(arrayify(params)).toBytes()), // Params
-            ],
-        });
-    }
-
     const receipt = await broadcast(client, keypair, tx);
 
     printInfo('Call sent', receipt.digest);
@@ -164,7 +151,7 @@ async function processCommand(command, chain, args, options) {
 
     await printWalletInfo(keypair, client, chain, options);
 
-    const contracts = [chain.contracts.test, chain.contracts.GasService, chain.contracts.axelar_gateway];
+    const contracts = [chain.contracts.Test, chain.contracts.GasService, chain.contracts.AxelarGateway];
 
     await command(keypair, client, contracts, args, options);
 }