chore: wrap hot potato pattern into a helper function

axelarnetwork · Aug 15, 2024 · b4e1965 · b4e1965
1 parent 44a1ebf
commit b4e1965
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 92 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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.4.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/operators.js b/sui/operators.js
@@ -1,81 +1,58 @@
 const { Command, Option } = require('commander');
 const { Transaction } = require('@mysten/sui/transactions');
-const { bcs } = require('@mysten/sui/bcs');
 const { printInfo, printError, loadConfig } = require('../common/utils');
 const { operatorsStruct } = require('./types-utils');
 const { addBaseOptions, addOptionsToCommands, parseSuiUnitAmount } = require('./cli-utils');
 const { getWallet, printWalletInfo, broadcast } = require('./sign-utils');
-const { getBcsBytesByObjectId, findOwnedObjectId } = require('./utils');
+const { getBcsBytesByObjectId, findOwnedObjectId, getBagContentId } = require('./utils');
 
 async function getGasCollectorCapId(client, gasServiceConfig, contractConfig) {
-    const operatorId = contractConfig.objects.Operators;
-
     // Get and parse operator data
-    const operatorBytes = await getBcsBytesByObjectId(client, operatorId);
+    const operatorBytes = await getBcsBytesByObjectId(client, contractConfig);
     const parsedOperator = operatorsStruct.parse(operatorBytes);
 
     // Get the capabilities bag ID
     const bagId = parsedOperator.caps.id;
 
-    // Find the GasCollectorCap bag ID
-    const bagResult = await client.getDynamicFields({
-        parentId: bagId,
-        name: 'caps',
-    });
-    const gasCollectorBagId = bagResult.data.find(
-        (cap) => cap.objectType === `${gasServiceConfig.address}::gas_service::GasCollectorCap`,
-    )?.objectId;
-
-    if (!gasCollectorBagId) {
-        throw new Error('GasCollectorCap not found in the operator capabilities bag');
-    }
-
-    // Get the actual cap ID from the bag ID
-    const gasCollectorCapObject = await client.getObject({
-        id: gasCollectorBagId,
-        options: {
-            showContent: true,
-        },
-    });
-
-    // Extract and return the gas collector cap ID
-    const gasCollectorCapId = gasCollectorCapObject.data.content.fields.value.fields.id.id;
-    return gasCollectorCapId;
+    return getBagContentId(client, `${gasServiceConfig.address}::gas_service::GasCollectorCap`, bagId, 'caps');
 }
 
-async function collectGas(keypair, client, gasServiceConfig, contractConfig, args, options) {
-    const [amount] = args;
-    const receiver = options.receiver || keypair.toSuiAddress();
-
+function operatorMoveCall(contractConfig, gasServiceConfig, operatorCapId, moveCall) {
     const operatorId = contractConfig.objects.Operators;
-    const gasCollectorCapId = await getGasCollectorCapId(client, gasServiceConfig, contractConfig);
-    const operatorCapId = await findOwnedObjectId(client, keypair.toSuiAddress(), `${contractConfig.address}::operators::OperatorCap`);
+    const gasCollectorCapId = gasServiceConfig.objects.GasCollectorCap;
 
     const tx = new Transaction();
 
     const [cap, loanedCap] = tx.moveCall({
         target: `${contractConfig.address}::operators::loan_cap`,
-        arguments: [tx.object(operatorId), tx.object(operatorCapId), tx.pure(bcs.Address.serialize(gasCollectorCapId).toBytes())],
+        arguments: [tx.object(operatorId), tx.object(operatorCapId), tx.object(gasCollectorCapId)],
         typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
     });
 
-    tx.moveCall({
-        target: `${gasServiceConfig.address}::gas_service::collect_gas`,
-        arguments: [tx.object(gasServiceConfig.objects.GasService), cap, tx.pure.address(receiver), tx.pure.u64(amount)],
-    });
+    moveCall(tx, cap);
 
     tx.moveCall({
         target: `${contractConfig.address}::operators::restore_cap`,
-        arguments: [
-            tx.object(operatorId),
-            tx.object(operatorCapId),
-            tx.pure(bcs.Address.serialize(gasCollectorCapId).toBytes()),
-            cap,
-            loanedCap,
-        ],
+        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 = 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);
@@ -85,48 +62,19 @@ async function refund(keypair, client, gasServiceConfig, contractConfig, args, o
     const [messageId] = args;
     const amount = options.amount;
     const receiver = options.receiver || keypair.toSuiAddress();
-
-    if (!gasServiceConfig) {
-        throw new Error('Gas service package not found.');
-    }
-
-    if (!contractConfig) {
-        throw new Error('Operators package not found.');
-    }
-
-    const operatorId = contractConfig.objects.Operators;
-    const gasCollectorCapId = await getGasCollectorCapId(client, gasServiceConfig, contractConfig);
     const operatorCapId = await findOwnedObjectId(client, keypair.toSuiAddress(), `${contractConfig.address}::operators::OperatorCap`);
 
-    const tx = new Transaction();
-
-    const [cap, loanedCap] = tx.moveCall({
-        target: `${contractConfig.address}::operators::loan_cap`,
-        arguments: [tx.object(operatorId), tx.object(operatorCapId), tx.pure(bcs.Address.serialize(gasCollectorCapId).toBytes())],
-        typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
-    });
-
-    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),
-        ],
-    });
-
-    tx.moveCall({
-        target: `${contractConfig.address}::operators::restore_cap`,
-        arguments: [
-            tx.object(operatorId),
-            tx.object(operatorCapId),
-            tx.pure(bcs.Address.serialize(gasCollectorCapId).toBytes()),
-            cap,
-            loanedCap,
-        ],
-        typeArguments: [`${gasServiceConfig.address}::gas_service::GasCollectorCap`],
+    const tx = 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);

diff --git a/sui/utils.js b/sui/utils.js
@@ -162,6 +162,28 @@ const findOwnedObjectId = async (client, ownerAddress, 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,
@@ -176,4 +198,5 @@ module.exports = {
     getItsChannelId,
     getSquidChannelId,
     getSigners,
+    getBagContentId,
 };