Merge branch 'feat/sui-operators' of github.com:axelarnetwork/axelar-…

…contract-deployments into feat/sui-operators

sui/README.md

@@ -109,6 +109,30 @@ Deploy the Operators package:
 node sui/deploy-contract.js deploy Operators
 ```
 
+Deploy the Abi package:
+
+```bash
+node sui/deploy-contract.js deploy Abi
+```
+
+Deploy the Governance package (requires `abi` and `axelar_gateway`):
+
+```bash
+node sui/deploy-contract.js deploy Governance
+```
+
+Deploy the ITS package (requires `abi`, `axelar_gateway` and `goverannce`):
+
+```bash
+node sui/deploy-contract.js deploy ITS
+```
+
+Deploy the Squid package (requires `abi`, `axelar_gateway`, `goverannce` and `its`):
+
+```bash
+node sui/deploy-contract.js deploy Squid
+```
+
 Call Contract:
 
 ```bash

sui/deploy-contract.js

@@ -19,7 +19,9 @@ const {
     suiPackageAddress,
     suiClockAddress,
     readMovePackageName,
-    getChannelId,
+    getSingletonChannelId,
+    getItsChannelId,
+    getSquidChannelId,
 } = require('./utils');
 
 /**
@@ -35,7 +37,7 @@ const {
  * 2. Ensure the corresponding folder exists in the specified path
  *
  */
-const PACKAGE_DIRS = ['gas_service', 'test', 'axelar_gateway', 'operators'];
+const PACKAGE_DIRS = ['gas_service', 'test', 'axelar_gateway', 'operators', 'abi', 'governance', 'its', 'squid'];
 
 /**
  * Package Mapping Object for Command Options and Post-Deployment Functions
@@ -46,12 +48,20 @@ const PACKAGE_CONFIGS = {
         GasService: () => [],
         Test: () => [],
         Operators: () => [],
+        Abi: () => [],
+        Governance: () => [],
+        ITS: () => [],
+        Squid: () => [],
     },
     postDeployFunctions: {
         AxelarGateway: postDeployAxelarGateway,
         GasService: postDeployGasService,
         Test: postDeployTest,
         Operators: postDeployOperators,
+        Abi: {},
+        Governance: {},
+        ITS: postDeployIts,
+        Squid: postDeploySquid,
     },
 };
 
@@ -94,7 +104,7 @@ async function postDeployTest(published, keypair, client, config, chain, options
     const relayerDiscovery = config.sui.contracts.AxelarGateway?.objects?.RelayerDiscovery;
 
     const [singletonObjectId] = getObjectIdsByObjectTypes(published.publishTxn, [`${published.packageId}::test::Singleton`]);
-    const channelId = await getChannelId(client, singletonObjectId);
+    const channelId = await getSingletonChannelId(client, singletonObjectId);
     chain.contracts.Test.objects = { Singleton: singletonObjectId, ChannelId: channelId };
 
     const tx = new Transaction();
@@ -191,6 +201,42 @@ async function postDeployAxelarGateway(published, keypair, client, config, chain
     };
 }
 
+async function postDeployIts(published, keypair, client, config, chain, options) {
+    const relayerDiscovery = config.sui.contracts.AxelarGateway?.objects?.RelayerDiscovery;
+
+    const [itsObjectId] = getObjectIdsByObjectTypes(published.publishTxn, [`${published.packageId}::its::ITS`]);
+    const channelId = await getItsChannelId(client, itsObjectId);
+    chain.contracts.ITS.objects = { ITS: itsObjectId, ChannelId: channelId };
+
+    const tx = new Transaction();
+    tx.moveCall({
+        target: `${published.packageId}::discovery::register_transaction`,
+        arguments: [tx.object(itsObjectId), tx.object(relayerDiscovery)],
+    });
+
+    const registerTx = await broadcast(client, keypair, tx);
+
+    printInfo('Register transaction', registerTx.digest);
+}
+
+async function postDeploySquid(published, keypair, client, config, chain, options) {
+    const relayerDiscovery = config.sui.contracts.AxelarGateway?.objects?.RelayerDiscovery;
+
+    const [squidObjectId] = getObjectIdsByObjectTypes(published.publishTxn, [`${published.packageId}::squid::Squid`]);
+    const channelId = await getSquidChannelId(client, squidObjectId);
+    chain.contracts.Squid.objects = { Squid: squidObjectId, ChannelId: channelId };
+
+    const tx = new Transaction();
+    tx.moveCall({
+        target: `${published.packageId}::discovery::register_transaction`,
+        arguments: [tx.object(squidObjectId), tx.object(chain.contracts.ITS.objects.ITS), tx.object(relayerDiscovery)],
+    });
+
+    const registerTx = await broadcast(client, keypair, tx);
+
+    printInfo('Register transaction', registerTx.digest);
+}
+
 async function deploy(keypair, client, supportedContract, config, chain, options) {
     const { packageDir, packageName } = supportedContract;
 
@@ -282,7 +328,6 @@ const GATEWAY_CMD_OPTIONS = [
 const addDeployOptions = (program) => {
     // Get the package name from the program name
     const packageName = program.name();
-
     // Find the corresponding options for the package
     const options = PACKAGE_CONFIGS.cmdOptions[packageName]();
 

sui/deploy-test.js

@@ -7,7 +7,7 @@ const { addBaseOptions } = require('./cli-utils');
 const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
 
 // Parse bcs bytes from singleton object to get channel id
-async function getChannelId(client, singletonObjectId) {
+async function getSingletonChannelId(client, singletonObjectId) {
     const bcsBytes = await getBcsBytesByObjectId(client, singletonObjectId);
     const data = singletonStruct.parse(bcsBytes);
     return '0x' + data.channel.id;
@@ -45,7 +45,7 @@ async function processCommand(config, chain, options) {
 
     await broadcast(client, keypair, tx);
 
-    const channelId = await getChannelId(client, singleton.objectId);
+    const channelId = await getSingletonChannelId(client, singleton.objectId);
 
     chain.contracts.test.address = published.packageId;
     chain.contracts.test.objects = { singleton: singleton.objectId, channelId };

sui/types-utils.js

@@ -83,15 +83,45 @@ const discoveryStruct = bcs.struct('Discovery', {
     fields: discoveryTable,
 });
 
-const bagStruct = bcs.struct('Bags', {
-    id: UID,
-    size: bcs.u64(),
+const bagStruct = bcs.struct('Bag', {
+  id: UID,
+  size: bcs.U64,
 });
 
 const operatorsStruct = bcs.struct('Operators', {
-  id: UID,
-  operators: bcs.vector(addressStruct),
-  caps: bagStruct,
+    id: UID,
+    operators: bcs.vector(addressStruct),
+    caps: bagStruct,
+});
+
+const tableStruct = bcs.struct('Table', {
+    id: UID,
+    size: bcs.U64,
+});
+
+const interchainAddressTrackerStruct = bcs.struct('InterchainAddressTracker', {
+    trusted_addresses: tableStruct,
+});
+
+const itsStruct = bcs.struct('ITS', {
+    id: UID,
+    channel: channelStruct,
+    address_tracker: interchainAddressTrackerStruct,
+    unregistered_coin_types: tableStruct,
+    unregistered_coin_info: bagStruct,
+    registered_coin_types: tableStruct,
+    registered_coins: bagStruct,
+    relayer_discovery_id: UID,
+});
+
+const coinBagStrcut = bcs.struct('CoinBag', {
+    bag: bagStruct,
+});
+
+const squidStruct = bcs.struct('Squid', {
+    id: UID,
+    channel: channelStruct,
+    coin_bag: coinBagStrcut,
 });
 
 module.exports = {
@@ -108,4 +138,6 @@ module.exports = {
     channelStruct,
     singletonStruct,
     discoveryStruct,
+    itsStruct,
+    squidStruct,
 };

sui/utils.js

@@ -12,7 +12,7 @@ const fs = require('fs');
 const { fromB64 } = require('@mysten/bcs');
 const { CosmWasmClient } = require('@cosmjs/cosmwasm-stargate');
 const { updateMoveToml, copyMovePackage, TxBuilder } = require('@axelar-network/axelar-cgp-sui');
-const { singletonStruct } = require('./types-utils');
+const { singletonStruct, itsStruct, squidStruct } = require('./types-utils');
 
 const suiPackageAddress = '0x2';
 const suiClockAddress = '0x6';
@@ -97,12 +97,24 @@ const getObjectIdsByObjectTypes = (txn, objectTypes) =>
     });
 
 // Parse bcs bytes from singleton object which is created when the Test contract is deployed
-const getChannelId = async (client, singletonObjectId) => {
+const getSingletonChannelId = async (client, singletonObjectId) => {
     const bcsBytes = await getBcsBytesByObjectId(client, singletonObjectId);
     const data = singletonStruct.parse(bcsBytes);
     return '0x' + data.channel.id;
 };
 
+const getItsChannelId = async (client, itsObjectId) => {
+    const bcsBytes = await getBcsBytesByObjectId(client, itsObjectId);
+    const data = itsStruct.parse(bcsBytes);
+    return '0x' + data.channel.id;
+};
+
+const getSquidChannelId = async (client, squidObjectId) => {
+    const bcsBytes = await getBcsBytesByObjectId(client, squidObjectId);
+    const data = squidStruct.parse(bcsBytes);
+    return '0x' + data.channel.id;
+};
+
 const getSigners = async (keypair, config, chain, options) => {
     if (options.signers === 'wallet') {
         const pubKey = keypair.getPublicKey().toRawBytes();
@@ -142,6 +154,8 @@ module.exports = {
     findPublishedObject,
     readMovePackageName,
     getObjectIdsByObjectTypes,
-    getChannelId,
+    getSingletonChannelId,
+    getItsChannelId,
+    getSquidChannelId,
     getSigners,
 };