@0xobelisk/sui-client 0.5.2 → 0.5.4

package/dist/types/index.d.ts

@@ -1,6 +1,8 @@
-import { Infer } from 'superstruct';
-import { DisplayFieldsResponse, ObjectCallArg, ObjectContentFields, SharedObjectRef, SuiObjectRef, TransactionArgument, TransactionBlock, SuiTransactionBlockResponse, DevInspectResults, SuiMoveNormalizedModules } from '@mysten/sui.js';
-export type TransactionResult = TransactionArgument & TransactionArgument[];
+import { ObjectContentFields } from '@mysten/sui.js/src/types';
+import type { TransactionBlock, TransactionObjectArgument, TransactionArgument, TransactionResult } from '@mysten/sui.js/transactions';
+import type { SuiObjectRef, SuiMoveNormalizedModules, DevInspectResults, SuiTransactionBlockResponse, DisplayFieldsResponse, MoveStruct } from '@mysten/sui.js/client';
+import type { SharedObjectRef, ObjectArg } from '@mysten/sui.js/bcs';
+import type { SerializedBcs } from '@mysten/bcs';
 import { SuiMoveMoudleFuncType } from '../libs/suiContractFactory/types';
 export type ObeliskObjectData = {
     objectId: string;
@@ -9,6 +11,12 @@ export type ObeliskObjectData = {
     objectDisplay: DisplayFieldsResponse;
     objectFields: ObjectContentFields;
 };
+export type ObeliskObjectContent = {
+    dataType: 'moveObject';
+    fields: MoveStruct;
+    hasPublicTransfer: boolean;
+    type: string;
+};
 export type ObeliskParams = {
     mnemonics?: string;
     secretKey?: string;
@@ -67,7 +75,7 @@ export interface ContractQuery extends MessageMeta {
     (tx: TransactionBlock, params: SuiTxArgument[], typeArguments?: string[], isRaw?: boolean): Promise<DevInspectResults | TransactionResult>;
 }
 export interface ContractTx extends MessageMeta {
-    (tx: TransactionBlock, params: SuiTxArgument[], typeArguments?: string[], isRaw?: boolean): SuiTransactionBlockResponse | TransactionResult;
+    (tx: TransactionBlock, params: SuiTxArgument[], typeArguments?: string[], isRaw?: boolean): Promise<SuiTransactionBlockResponse | TransactionResult>;
 }
 export type MapMessageTx = Record<string, ContractTx>;
 export type MapMessageQuery = Record<string, ContractQuery>;
@@ -102,6 +110,18 @@ export type ObjectData = {
     objectDisplay: DisplayFieldsResponse;
     objectFields: ObjectContentFields;
 };
+type TransactionBlockType = InstanceType<typeof TransactionBlock>;
+export type PureCallArg = {
+    Pure: number[];
+};
+export type ObjectCallArg = {
+    Object: ObjectArg;
+};
+export type TransactionType = Parameters<TransactionBlockType['add']>;
+export type TransactionPureArgument = Extract<TransactionArgument, {
+    kind: 'Input';
+    type: 'pure';
+}>;
 export type ObjectFieldType = {
     id: {
         id: string;
@@ -114,8 +134,9 @@ export type EntityData = {
     index: string;
     key: string;
 };
-export type SuiTxArg = Infer<typeof TransactionArgument> | Infer<typeof ObjectCallArg> | string | number | bigint | boolean;
-export type SuiObjectArg = SharedObjectRef | Infer<typeof SuiObjectRef> | string | Infer<typeof ObjectCallArg> | Infer<typeof TransactionArgument>;
+export type SuiAddressArg = TransactionArgument | SerializedBcs<any> | string | PureCallArg;
+export type SuiTxArg = SuiAddressArg | number | bigint | boolean;
+export type SuiObjectArg = TransactionObjectArgument | string | SharedObjectRef | SuiObjectRef | ObjectCallArg;
 export type SuiVecTxArg = {
     value: SuiTxArg[];
     vecType: SuiInputTypes;
@@ -123,7 +144,7 @@ export type SuiVecTxArg = {
 /**
  * These are the basics types that can be used in the SUI
  */
-export type SuiBasicTypes = 'address' | 'bool' | 'u8' | 'u16' | 'u32' | 'u64' | 'u128' | 'u256';
+export type SuiBasicTypes = 'address' | 'bool' | 'u8' | 'u16' | 'u32' | 'u64' | 'u128' | 'u256' | 'signer';
 export type SuiInputTypes = 'object' | SuiBasicTypes;
 export type SuiReturnValues = {
     returnValues: [number[], string][];
@@ -140,3 +161,4 @@ export type ObjectContent = {
     hasPublicTransfer: boolean;
     dataType: string;
 };
+export {};

package/dist/utils/index.d.ts

@@ -0,0 +1,3 @@
+export declare function capitalizeFirstLetter(input: string): string;
+export declare function normalizeHexAddress(input: string): string | null;
+export declare function numberToAddressHex(num: number): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-client",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -37,39 +37,42 @@
     "src"
   ],
   "dependencies": {
-    "@mysten/bcs": "^0.7.3",
-    "@mysten/sui.js": "^0.41.0",
+    "@mysten/bcs": "^0.8.1",
+    "@mysten/sui.js": "^0.44.0",
+    "@noble/curves": "^1.2.0",
+    "@noble/hashes": "^1.3.2",
     "@scure/bip39": "^1.2.1",
-    "assert": "^2.0.0",
+    "assert": "^2.1.0",
+    "superstruct": "^1.0.3",
+    "ts-retry-promise": "^0.7.1",
+    "tweetnacl": "^1.0.3",
     "colorts": "^0.1.63",
     "husky": "^8.0.3",
     "keccak256": "^1.0.6",
     "process": "^0.11.10",
-    "superstruct": "^1.0.3",
-    "tmp": "^0.2.1",
-    "ts-retry-promise": "^0.7.0"
+    "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@mysten/sui.js": "^0.41.0"
+    "@mysten/sui.js": "^0.44.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.6.6",
-    "@commitlint/config-conventional": "^17.6.6",
-    "@commitlint/prompt-cli": "^17.6.6",
-    "@types/node": "^20.5.0",
-    "@types/tmp": "^0.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
+    "@commitlint/cli": "^18.0.0",
+    "@commitlint/config-conventional": "^18.0.0",
+    "@commitlint/prompt-cli": "^18.0.0",
+    "@types/node": "^20.8.7",
+    "@types/tmp": "^0.2.5",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.43.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "lint-staged": "^13.2.3",
+    "eslint-plugin-prettier": "^5.0.1",
+    "lint-staged": "^15.0.2",
     "prettier": "^2.8.8",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.1.0",
-    "typedoc": "^0.24.8",
+    "typedoc": "^0.25.2",
     "typescript": "^5.0.4"
   },
   "lint-staged": {

package/src/index.ts

@@ -1,9 +1,11 @@
-export * from '@mysten/sui.js';
+export * from '@mysten/sui.js/utils';
+export * from '@mysten/sui.js/transactions';
 export { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
 export { BCS, getSuiMoveConfig } from '@mysten/bcs';
 export { Obelisk } from './obelisk';
 export { SuiAccountManager } from './libs/suiAccountManager';
 export { SuiTxBlock } from './libs/suiTxBuilder';
+export { MultiSigClient } from './libs/multiSig';
 export { SuiContractFactory } from './libs/suiContractFactory';
 export { loadMetadata } from './metadata';
 export type * from './types';

package/src/libs/multiSig/client.ts

@@ -0,0 +1,44 @@
+import { MultiSigPublicKey } from '@mysten/sui.js/multisig';
+import type { PublicKey } from '@mysten/sui.js/src/cryptography';
+import { ed25519PublicKeyFromBase64 } from './publickey';
+
+export type PublicKeyWeightPair = {
+  publicKey: PublicKey;
+  weight: number;
+};
+
+export class MultiSigClient {
+  public readonly pksWeightPairs: PublicKeyWeightPair[];
+  public readonly threshold: number;
+  public readonly multiSigPublicKey: MultiSigPublicKey;
+  constructor(pks: PublicKeyWeightPair[], threshold: number) {
+    this.pksWeightPairs = pks;
+    this.threshold = threshold;
+    this.multiSigPublicKey = MultiSigPublicKey.fromPublicKeys({
+      threshold: this.threshold,
+      publicKeys: this.pksWeightPairs,
+    });
+  }
+
+  static fromRawEd25519PublicKeys(
+    rawPublicKeys: string[],
+    weights: number[],
+    threshold: number
+  ): MultiSigClient {
+    const pks = rawPublicKeys.map((rawPublicKey, i) => {
+      return {
+        publicKey: ed25519PublicKeyFromBase64(rawPublicKey),
+        weight: weights[i],
+      };
+    });
+    return new MultiSigClient(pks, threshold);
+  }
+
+  multiSigAddress(): string {
+    return this.multiSigPublicKey.toSuiAddress();
+  }
+
+  combinePartialSigs(sigs: string[]): string {
+    return this.multiSigPublicKey.combinePartialSignatures(sigs);
+  }
+}

package/src/libs/multiSig/index.ts

@@ -0,0 +1 @@
+export { MultiSigClient } from './client';

package/src/libs/multiSig/publickey.ts

@@ -0,0 +1,11 @@
+import { PublicKey } from '@mysten/sui.js/cryptography';
+import { Ed25519PublicKey } from '@mysten/sui.js/keypairs/ed25519';
+import { fromB64 } from '@mysten/sui.js/utils';
+
+export function ed25519PublicKeyFromBase64(rawPubkey: string): PublicKey {
+  let bytes = fromB64(rawPubkey);
+  // rawPubkeys should either be 32 bytes or 33 bytes (with the first byte being flag)
+  if (bytes.length !== 32 && bytes.length !== 33) throw 'invalid pubkey length';
+  bytes = bytes.length === 33 ? bytes.slice(1) : bytes;
+  return new Ed25519PublicKey(bytes);
+}

package/src/libs/suiAccountManager/index.ts

@@ -1,4 +1,4 @@
-import { Ed25519Keypair } from '@mysten/sui.js';
+import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
 import { getKeyPair } from './keypair';
 import { hexOrBase64ToUint8Array, normalizePrivateKey } from './util';
 import { generateMnemonic } from './crypto';

package/src/libs/suiAccountManager/keypair.ts

@@ -1,4 +1,4 @@
-import { Ed25519Keypair, fromB64 } from '@mysten/sui.js';
+import { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
 import type { DerivePathParams } from 'src/types';
 
 /**

package/src/libs/suiAccountManager/util.ts

@@ -1,4 +1,4 @@
-import { fromB64 } from '@mysten/sui.js';
+import { fromB64 } from '@mysten/sui.js/utils';
 
 /**
  * @description This regular expression matches any string that contains only hexadecimal digits (0-9, A-F, a-f).

package/src/libs/suiContractFactory/index.ts

@@ -1,4 +1,4 @@
-import { SuiMoveNormalizedModules} from '@mysten/sui.js';
+import type { SuiMoveNormalizedModules } from '@mysten/sui.js/client';
 import type { ContractFactoryParams, SuiMoveMoudleValueType } from './types';
 export type ApiTypes = 'promise' | 'rxjs';
 

package/src/libs/suiContractFactory/types.ts

@@ -1,7 +1,7 @@
-import {
+import type {
   SuiMoveNormalizedModules,
   SuiMoveNormalizedType,
-} from '@mysten/sui.js';
+} from '@mysten/sui.js/client';
 
 export type ContractFactoryParams = {
   packageId?: string;

package/src/libs/suiInteractor/index.ts

@@ -1,2 +1,2 @@
 export { SuiInteractor } from './suiInteractor';
-export { getDefaultConnection } from './defaultConfig';
+// export { getDefaultConnection } from './defaultConfig';

package/src/libs/suiInteractor/suiInteractor.ts

@@ -1,17 +1,11 @@
-import {
-  SuiTransactionBlockResponse,
+import { SuiClient } from '@mysten/sui.js/client';
+import type {
   SuiTransactionBlockResponseOptions,
-  JsonRpcProvider,
-  Connection,
-  getObjectDisplay,
-  getObjectFields,
-  getObjectId,
-  getObjectType,
-  getObjectVersion,
-  getSharedObjectInitialVersion,
-  DynamicFieldName,
-  SuiAddress,
-} from '@mysten/sui.js';
+  SuiTransactionBlockResponse,
+  SuiObjectDataOptions,
+  SuiObjectData,
+} from '@mysten/sui.js/client';
+import type * as RpcTypes from '@mysten/sui.js/dist/cjs/client/types/generated';
 import { requestSuiFromFaucetV0, getFaucetHost } from '@mysten/sui.js/faucet';
 import { FaucetNetworkType, NetworkType, ObjectData } from '../../types';
 import { SuiOwnedObject, SuiSharedObject } from '../suiModel';
@@ -23,24 +17,29 @@ import { delay } from './util';
  * and update the gas coin after the transaction.
  */
 export class SuiInteractor {
-  public readonly providers: JsonRpcProvider[];
-  public currentProvider: JsonRpcProvider;
+  public readonly clients: SuiClient[];
+  public currentClient: SuiClient;
+  public readonly fullNodes: string[];
+  public currentFullNode: string;
+
   public network?: NetworkType;
 
   constructor(fullNodeUrls: string[], network?: NetworkType) {
     if (fullNodeUrls.length === 0)
       throw new Error('fullNodeUrls must not be empty');
-    this.providers = fullNodeUrls.map(
-      (url) => new JsonRpcProvider(new Connection({ fullnode: url }))
-    );
-    this.currentProvider = this.providers[0];
+    this.fullNodes = fullNodeUrls;
+    this.clients = fullNodeUrls.map((url) => new SuiClient({ url }));
+    this.currentFullNode = fullNodeUrls[0];
+    this.currentClient = this.clients[0];
     this.network = network;
   }
 
-  switchToNextProvider() {
-    const currentProviderIdx = this.providers.indexOf(this.currentProvider);
-    this.currentProvider =
-      this.providers[(currentProviderIdx + 1) % this.providers.length];
+  switchToNextClient() {
+    const currentClientIdx = this.clients.indexOf(this.currentClient);
+    this.currentClient =
+      this.clients[(currentClientIdx + 1) % this.clients.length];
+    this.currentFullNode =
+      this.fullNodes[(currentClientIdx + 1) % this.clients.length];
   }
 
   async sendTx(
@@ -60,17 +59,16 @@ export class SuiInteractor {
     //   ...this.providers.slice(0, currentProviderIdx),
     // ]
 
-    for (const provider of this.providers) {
+    for (const clientIdx in this.clients) {
       try {
-        const res = await provider.executeTransactionBlock({
+        return await this.clients[clientIdx].executeTransactionBlock({
           transactionBlock,
           signature,
           options: txResOptions,
         });
-        return res;
       } catch (err) {
         console.warn(
-          `Failed to send transaction with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to send transaction with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
         await delay(2000);
       }
@@ -78,46 +76,33 @@ export class SuiInteractor {
     throw new Error('Failed to send transaction with all fullnodes');
   }
 
-  async getObjects(ids: string[]) {
-    const options = {
+  async getObjects(
+    ids: string[],
+    options?: SuiObjectDataOptions
+  ): Promise<SuiObjectData[]> {
+    const opts: SuiObjectDataOptions = options ?? {
       showContent: true,
       showDisplay: true,
       showType: true,
       showOwner: true,
     };
 
-    // const currentProviderIdx = this.providers.indexOf(this.currentProvider);
-    // const providers = [
-    //   ...this.providers.slice(currentProviderIdx, this.providers.length),
-    //   ...this.providers.slice(0, currentProviderIdx),
-    // ]
-
-    for (const provider of this.providers) {
+    for (const clientIdx in this.clients) {
       try {
-        const objects = await provider.multiGetObjects({ ids, options });
-        const parsedObjects = objects.map((object) => {
-          const objectId = getObjectId(object);
-          const objectType = getObjectType(object);
-          const objectVersion = getObjectVersion(object);
-          const objectDigest = object.data ? object.data.digest : undefined;
-          const initialSharedVersion = getSharedObjectInitialVersion(object);
-          const objectFields = getObjectFields(object);
-          const objectDisplay = getObjectDisplay(object);
-          return {
-            objectId,
-            objectType,
-            objectVersion,
-            objectDigest,
-            objectFields,
-            objectDisplay,
-            initialSharedVersion,
-          };
+        const objects = await this.clients[clientIdx].multiGetObjects({
+          ids,
+          options: opts,
         });
-        return parsedObjects as ObjectData[];
+        const parsedObjects = objects
+          .map((object) => {
+            return object.data;
+          })
+          .filter((object) => object !== null && object !== undefined);
+        return parsedObjects as SuiObjectData[];
       } catch (err) {
         await delay(2000);
         console.warn(
-          `Failed to get objects with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get objects with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
@@ -129,48 +114,20 @@ export class SuiInteractor {
     return objects[0];
   }
 
-  // async getEntitiesObjects(ids: string[]) {
-  //   const options = {
-  //     showContent: true,
-  //     showType: true,
-  //   };
-
-  //   for (const provider of this.providers) {
-  //     try {
-  //       const objects = await provider.multiGetObjects({ ids, options });
-  //       const parsedObjects = objects.map((object) => {
-  //         const objectId = getObjectId(object);
-  //         const objectFields = getObjectFields(object) as ObjectFieldType;
-  //         const index = objectFields.name;
-  //         const key = objectFields.value;
-  //         return {
-  //           objectId,
-  //           index,
-  //           key,
-  //         };
-  //       });
-  //       return parsedObjects as EntityData[];
-  //     } catch (err) {
-  //       await delay(2000);
-  //       console.warn(
-  //         `Failed to get EntitiesObjects with fullnode ${provider.connection.fullnode}: ${err}`
-  //       );
-  //     }
-  //   }
-  //   throw new Error('Failed to get EntitiesObjects with all fullnodes');
-  // }
-
   async getDynamicFieldObject(
     parentId: string,
-    name: string | DynamicFieldName
+    name: RpcTypes.DynamicFieldName
   ) {
-    for (const provider of this.providers) {
+    for (const clientIdx in this.clients) {
       try {
-        return provider.getDynamicFieldObject({ parentId, name });
+        return await this.clients[clientIdx].getDynamicFieldObject({
+          parentId,
+          name,
+        });
       } catch (err) {
         await delay(2000);
         console.warn(
-          `Failed to get DynamicFieldObject with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get DynamicFieldObject with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
@@ -178,27 +135,59 @@ export class SuiInteractor {
   }
 
   async getDynamicFields(parentId: string, cursor?: string, limit?: number) {
-    for (const provider of this.providers) {
+    for (const clientIdx in this.clients) {
       try {
-        return provider.getDynamicFields({ parentId, cursor, limit });
+        return await this.clients[clientIdx].getDynamicFields({
+          parentId,
+          cursor,
+          limit,
+        });
       } catch (err) {
         await delay(2000);
         console.warn(
-          `Failed to get DynamicFields with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get DynamicFields with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
     throw new Error('Failed to get DynamicFields with all fullnodes');
   }
 
-  async getOwnedObjects(owner: SuiAddress, cursor?: string, limit?: number) {
-    for (const provider of this.providers) {
+  async getTxDetails(digest: string) {
+    for (const clientIdx in this.clients) {
       try {
-        return await provider.getOwnedObjects({ owner, cursor, limit });
+        const txResOptions: SuiTransactionBlockResponseOptions = {
+          showEvents: true,
+          showEffects: true,
+          showObjectChanges: true,
+          showBalanceChanges: true,
+        };
+
+        return await this.clients[clientIdx].getTransactionBlock({
+          digest,
+          options: txResOptions,
+        });
       } catch (err) {
         await delay(2000);
         console.warn(
-          `Failed to get OwnedObjects with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get TransactionBlocks with fullnode ${this.fullNodes[clientIdx]}: ${err}`
+        );
+      }
+    }
+    throw new Error('Failed to get TransactionBlocks with all fullnodes');
+  }
+
+  async getOwnedObjects(owner: string, cursor?: string, limit?: number) {
+    for (const clientIdx in this.clients) {
+      try {
+        return await this.clients[clientIdx].getOwnedObjects({
+          owner,
+          cursor,
+          limit,
+        });
+      } catch (err) {
+        await delay(2000);
+        console.warn(
+          `Failed to get OwnedObjects with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
@@ -206,15 +195,15 @@ export class SuiInteractor {
   }
 
   async getNormalizedMoveModulesByPackage(packageId: string) {
-    for (const provider of this.providers) {
+    for (const clientIdx in this.clients) {
       try {
-        return provider.getNormalizedMoveModulesByPackage({
+        return await this.clients[clientIdx].getNormalizedMoveModulesByPackage({
           package: packageId,
         });
       } catch (err) {
         await delay(2000);
         console.warn(
-          `Failed to get NormalizedMoveModules with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get NormalizedMoveModules with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
@@ -230,13 +219,22 @@ export class SuiInteractor {
     const objects = await this.getObjects(objectIds);
     for (const object of objects) {
       const suiObject = suiObjects.find(
-        (obj) => obj.objectId === object.objectId
+        (obj) => obj.objectId === object?.objectId
       );
       if (suiObject instanceof SuiSharedObject) {
-        suiObject.initialSharedVersion = object.initialSharedVersion;
+        if (
+          object.owner &&
+          typeof object.owner === 'object' &&
+          'Shared' in object.owner
+        ) {
+          suiObject.initialSharedVersion =
+            object.owner.Shared.initial_shared_version;
+        } else {
+          suiObject.initialSharedVersion = undefined;
+        }
       } else if (suiObject instanceof SuiOwnedObject) {
-        suiObject.version = object.objectVersion;
-        suiObject.digest = object.objectDigest;
+        suiObject.version = object?.version;
+        suiObject.digest = object?.digest;
       }
     }
   }
@@ -259,9 +257,9 @@ export class SuiInteractor {
     }[] = [];
     let totalAmount = 0;
     let hasNext = true,
-      nextCursor: string | null = null;
+      nextCursor: string | null | undefined = null;
     while (hasNext && totalAmount < amount) {
-      const coins = await this.currentProvider.getCoins({
+      const coins = await this.currentClient.getCoins({
         owner: addr,
         coinType: coinType,
         cursor: nextCursor,
@@ -290,13 +288,10 @@ export class SuiInteractor {
     return selectedCoins;
   }
 
-  async requestFaucet(address: SuiAddress, network: FaucetNetworkType) {
+  async requestFaucet(address: string, network: FaucetNetworkType) {
     await requestSuiFromFaucetV0({
       host: getFaucetHost(network),
       recipient: address,
     });
-    // let params = {
-    //   owner: address
-    // } as GetBalanceParams;
   }
 }

package/src/libs/suiModel/suiOwnedObject.ts

@@ -1,14 +1,9 @@
-import { Infer } from 'superstruct';
-import {
-  getObjectChanges,
-  SuiTransactionBlockResponse,
-  ObjectCallArg,
-  ObjectId,
-} from '@mysten/sui.js';
+import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
+import type { CallArg } from '@mysten/sui.js/bcs';
 
 export class SuiOwnedObject {
   public readonly objectId: string;
-  public version?: number | string;
+  public version?: string;
   public digest?: string;
 
   constructor(param: { objectId: string; version?: string; digest?: string }) {
@@ -26,7 +21,7 @@ export class SuiOwnedObject {
     return !!this.version && !!this.digest;
   }
 
-  asCallArg(): Infer<typeof ObjectCallArg> | Infer<typeof ObjectId> {
+  asCallArg(): CallArg | string {
     if (!this.version || !this.digest) {
       return this.objectId;
     }
@@ -46,7 +41,7 @@ export class SuiOwnedObject {
    * @param txResponse
    */
   updateFromTxResponse(txResponse: SuiTransactionBlockResponse) {
-    const changes = getObjectChanges(txResponse);
+    const changes = txResponse.objectChanges;
     if (!changes) {
       throw new Error('Bad transaction response!');
     }