feat: update sui sdk to newest version (#80)

Co-authored-by: npty <[email protected]> Co-authored-by: Milap Sheth <[email protected]>
axelarnetwork · Jul 19, 2024 · 5e28d52 · 5e28d52
1 parent 5c829ce
commit 5e28d52
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 94 deletions.
diff --git a/.changeset/weak-kings-marry.md b/.changeset/weak-kings-marry.md
@@ -0,0 +1,5 @@
+---
+'@axelar-network/axelar-cgp-sui': minor
+---
+
+Update to the new Sui SDK
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,13 +37,13 @@
   },
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.32.2",
-    "@mysten/sui.js": "^0.54.1",
+    "@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",
-    "@types/tmp": "^0.2.6"
+    "tmp": "^0.2.1"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.6",

diff --git a/src/bcs.ts b/src/bcs.ts
@@ -1,4 +1,4 @@
-import { bcs } from '@mysten/sui.js/bcs';
+import { bcs } from '@mysten/sui/bcs';
 
 function getAxelarStructs() {
     const Bytes32 = bcs.Address;

diff --git a/src/tx-builder.ts b/src/tx-builder.ts
@@ -8,9 +8,9 @@ import {
     SuiObjectChange,
     SuiTransactionBlockResponse,
     SuiTransactionBlockResponseOptions,
-} from '@mysten/sui.js/client';
-import { Keypair } from '@mysten/sui.js/dist/cjs/cryptography';
-import { TransactionBlock, TransactionObjectInput, TransactionResult } from '@mysten/sui.js/transactions';
+} from '@mysten/sui/client';
+import { Keypair } from '@mysten/sui/dist/cjs/cryptography';
+import { Transaction, TransactionObjectInput, TransactionResult } from '@mysten/sui/transactions';
 import { Bytes, utils as ethersUtils } from 'ethers';
 import tmp from 'tmp';
 import { updateMoveToml } from './utils';
@@ -32,7 +32,7 @@ function updateCache(objectChanges: SuiObjectChange[]) {
     }
 }
 
-function getObject(tx: TransactionBlock, object: TransactionObjectInput): TransactionObjectInput {
+function getObject(tx: Transaction, object: TransactionObjectInput): TransactionObjectInput {
     if (Array.isArray(object)) {
         object = hexlify(object);
     }
@@ -78,7 +78,7 @@ function getTypeName(type: SuiMoveNormalizedType): string {
     return (type as string).toLowerCase();
 }
 
-function getNestedStruct(tx: TransactionBlock, type: SuiMoveNormalizedType, arg: TransactionObjectInput): null | TransactionObjectInput {
+function getNestedStruct(tx: Transaction, type: SuiMoveNormalizedType, arg: TransactionObjectInput): null | TransactionObjectInput {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let inside = type as any;
 
@@ -105,12 +105,12 @@ function getNestedStruct(tx: TransactionBlock, type: SuiMoveNormalizedType, arg:
     const typeName = getTypeName((type as { Vector: SuiMoveNormalizedType }).Vector);
     return tx.makeMoveVec({
         type: typeName,
-        objects: nested,
+        elements: nested,
     });
 }
 
 function serialize(
-    tx: TransactionBlock,
+    tx: Transaction,
     type: SuiMoveNormalizedType,
     arg: TransactionObjectInput,
 ):
@@ -199,10 +199,10 @@ function isString(parameter: SuiMoveNormalizedType): boolean {
 
 export class TxBuilder {
     client: SuiClient;
-    tx: TransactionBlock;
+    tx: Transaction;
     constructor(client: SuiClient) {
         this.client = client;
-        this.tx = new TransactionBlock();
+        this.tx = new Transaction();
     }
 
     async moveCall(moveCallInfo: {
@@ -283,8 +283,8 @@ export class TxBuilder {
     }
 
     async signAndExecute(keypair: Keypair, options: SuiTransactionBlockResponseOptions): Promise<SuiTransactionBlockResponse> {
-        let result = await this.client.signAndExecuteTransactionBlock({
-            transactionBlock: this.tx,
+        let result = await this.client.signAndExecuteTransaction({
+            transaction: this.tx,
             signer: keypair,
             options: {
                 showEffects: true,

diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,4 @@
-const { bcs } = require('@mysten/sui.js/bcs');
+const { bcs } = require('@mysten/sui/bcs');
 const { fromHEX, toHEX } = require('@mysten/bcs');
 
 export const UID = bcs.fixedArray(32, bcs.u8()).transform({

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { getFullnodeUrl } from '@mysten/sui.js/client';
+import { getFullnodeUrl } from '@mysten/sui/client';
 
 export function getModuleNameFromSymbol(symbol: string) {
     function isNumber(char: string) {

diff --git a/test/axelar-gateway.js b/test/axelar-gateway.js
@@ -1,7 +1,7 @@
-const { SuiClient, getFullnodeUrl } = require('@mysten/sui.js/client');
-const { Ed25519Keypair } = require('@mysten/sui.js/keypairs/ed25519');
-const { Secp256k1Keypair } = require('@mysten/sui.js/keypairs/secp256k1');
-const { requestSuiFromFaucetV0, getFaucetHost } = require('@mysten/sui.js/faucet');
+const { SuiClient, getFullnodeUrl } = require('@mysten/sui/client');
+const { Ed25519Keypair } = require('@mysten/sui/keypairs/ed25519');
+const { Secp256k1Keypair } = require('@mysten/sui/keypairs/secp256k1');
+const { requestSuiFromFaucetV0, getFaucetHost } = require('@mysten/sui/faucet');
 const { publishPackage, getRandomBytes32, expectRevert, expectEvent } = require('./utils');
 const { TxBuilder } = require('../dist/tx-builder');
 const {