feat(sui): support utils contract deployment

.github/workflows/test-sui.yaml

@@ -107,6 +107,9 @@ jobs:
 
       ###### Command: Deploy Contract ######
 
+      - name: Deploy Utils
+        run: node sui/deploy-contract deploy Utils
+
       - name: Deploy AxelarGateway
         run: node sui/deploy-contract deploy AxelarGateway --signers wallet
 
@@ -204,7 +207,7 @@ jobs:
 
       - name: Generate Unsigned Tx File
         run: |
-          node sui/deploy-contract.js upgrade AxelarGateway any_upgrade --offline --txFilePath ./tx-upgrade.json --sender $MULTISIG_ADDRESS
+          node sui/deploy-contract.js upgrade AxelarGateway any_upgrade --offline --txFilePath ./tx-upgrade.json --sender $MULTISIG_ADDRESS --packageDependencies Utils
 
       - name: Sign Tx File with Multisig Signer
         run: |

common/utils.js

@@ -400,7 +400,7 @@ async function getDomainSeparator(config, chain, options) {
     }
 
     printInfo(`Retrieving domain separator for ${chain.name} from Axelar network`);
-    const domainSeparator = hexlify((await getContractConfig(config, chain.axelarId)).domain_separator);
+    const domainSeparator = hexlify((await getContractConfig(config, chain.axelarId)).domainSeparator);
 
     if (domainSeparator !== expectedDomainSeparator) {
         throw new Error(`unexpected domain separator (want ${expectedDomainSeparator}, got ${domainSeparator})`);

package.json

@@ -24,7 +24,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.6.1",
+    "@axelar-network/axelar-cgp-sui": "^0.6.3",
     "@axelar-network/axelar-gmp-sdk-solidity": "5.10.0",
     "@axelar-network/interchain-token-service": "1.2.4",
     "@cosmjs/cosmwasm-stargate": "^0.32.1",

sui/README.md

@@ -53,6 +53,7 @@ node sui/faucet.js
 
 Deploy the gateway package:
 
+>   Before deploying the gateway package, make sure to deploy the Utils package.
 -   By querying the signer set from the Amplifier contract (this only works if Amplifier contracts have been setup):
 
 ```bash
@@ -91,6 +92,12 @@ policy should be one of the following:
 
 Provide `--txFilePath` with `--offline` to generate tx data file for offline signing.
 
+Deploy the Utils package:
+
+```bash
+node sui/deploy-contract.js deploy Utils
+```
+
 Deploy the Gas Service package:
 
 ```bash

sui/deploy-contract.js

@@ -41,7 +41,7 @@ const {
  * 2. Ensure the corresponding folder exists in the specified path
  *
  */
-const PACKAGE_DIRS = ['gas_service', 'example', 'axelar_gateway', 'operators', 'abi', 'governance', 'its', 'squid'];
+const PACKAGE_DIRS = ['utils', 'gas_service', 'example', 'axelar_gateway', 'operators', 'abi', 'governance', 'its', 'squid'];
 
 /**
  * Package Mapping Object for Command Options and Post-Deployment Functions
@@ -56,14 +56,13 @@ const PACKAGE_CONFIGS = {
         Governance: () => [],
         ITS: () => [],
         Squid: () => [],
+        Utils: () => [],
     },
     postDeployFunctions: {
         AxelarGateway: postDeployAxelarGateway,
         GasService: postDeployGasService,
         Example: postDeployExample,
         Operators: postDeployOperators,
-        Abi: {},
-        Governance: {},
         ITS: postDeployIts,
         Squid: postDeploySquid,
     },
@@ -251,7 +250,10 @@ async function deploy(keypair, client, supportedContract, config, chain, options
 
     // Execute post-deployment function
     const executePostDeploymentFn = PACKAGE_CONFIGS.postDeployFunctions[packageName];
-    await executePostDeploymentFn(published, keypair, client, config, chain, options);
+
+    if (executePostDeploymentFn) {
+        await executePostDeploymentFn(published, keypair, client, config, chain, options);
+    }
 
     printInfo(`${packageName} Configuration Updated`, JSON.stringify(chain.contracts[packageName], null, 2));
 }
@@ -269,16 +271,17 @@ async function upgrade(keypair, client, supportedPackage, policy, config, chain,
     const contractConfig = contractsConfig?.[packageName];
 
     validateParameters({ isNonEmptyString: { packageName } });
+    const moveDir = `${__dirname}/move`;
 
     if (packageDependencies) {
         for (const dependencies of packageDependencies) {
             const packageId = contractsConfig[dependencies]?.address;
-            updateMoveToml(dependencies, packageId);
+            updateMoveToml(dependencies.toLowerCase(), packageId, moveDir);
         }
     }
 
     const builder = new TxBuilder(client);
-    await upgradePackage(client, keypair, supportedPackage, contractConfig, builder, options);
+    await upgradePackage(client, keypair, supportedPackage, contractConfig, builder, moveDir, options);
 }
 
 async function mainProcessor(args, options, processor) {
@@ -372,6 +375,7 @@ if (require.main === module) {
             .addOption(new Option('--sender <sender>', 'transaction sender'))
             .addOption(new Option('--digest <digest>', 'digest hash for upgrade'))
             .addOption(new Option('--offline', 'store tx block for sign'))
+            .addOption(new Option('--packageDependencies [packageDependencies...]', 'package dependencies'))
             .addOption(new Option('--txFilePath <file>', 'unsigned transaction will be stored'))
             .action((policy, options) => {
                 mainProcessor([supportedPackage, policy], options, upgrade);

sui/utils/upgrade-utils.js

@@ -20,9 +20,9 @@ function getUpgradePolicyId(policy) {
     }
 }
 
-async function upgradePackage(client, keypair, packageToUpgrade, contractConfig, builder, options) {
+async function upgradePackage(client, keypair, packageToUpgrade, contractConfig, builder, moveDir, options) {
     const { packageDir, packageName } = packageToUpgrade;
-    const { modules, dependencies, digest } = await builder.getContractBuild(packageDir);
+    const { modules, dependencies, digest } = await builder.getContractBuild(packageDir, moveDir);
     const { offline } = options;
     const sender = options.sender || keypair.toSuiAddress();
     const upgradeCap = contractConfig.objects?.UpgradeCap;