@scallop-io/sui-kit 0.38.2 → 0.42.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export { TransactionBlock, SUI_CLOCK_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_ID, } from '@mysten/sui.js';
+export * from '@mysten/sui.js/utils';
+export * from '@mysten/sui.js/transactions';
 export { SuiKit } from './suiKit';
 export { SuiAccountManager } from './libs/suiAccountManager';
 export { SuiTxBlock } from './libs/suiTxBuilder';

package/dist/index.js

@@ -15,29 +15,29 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  SUI_CLOCK_OBJECT_ID: () => import_sui10.SUI_CLOCK_OBJECT_ID,
-  SUI_SYSTEM_STATE_OBJECT_ID: () => import_sui10.SUI_SYSTEM_STATE_OBJECT_ID,
   SuiAccountManager: () => SuiAccountManager,
   SuiKit: () => SuiKit,
-  SuiTxBlock: () => SuiTxBlock,
-  TransactionBlock: () => import_sui10.TransactionBlock
+  SuiTxBlock: () => SuiTxBlock
 });
 module.exports = __toCommonJS(src_exports);
-var import_sui10 = require("@mysten/sui.js");
+__reExport(src_exports, require("@mysten/sui.js/utils"), module.exports);
+__reExport(src_exports, require("@mysten/sui.js/transactions"), module.exports);
 
 // src/suiKit.ts
-var import_sui9 = require("@mysten/sui.js");
+var import_client2 = require("@mysten/sui.js/client");
+var import_transactions2 = require("@mysten/sui.js/transactions");
 
 // src/libs/suiAccountManager/index.ts
-var import_sui3 = require("@mysten/sui.js");
+var import_ed255192 = require("@mysten/sui.js/keypairs/ed25519");
 
 // src/libs/suiAccountManager/keypair.ts
-var import_sui = require("@mysten/sui.js");
+var import_ed25519 = require("@mysten/sui.js/keypairs/ed25519");
 var getDerivePathForSUI = (derivePathParams = {}) => {
   const {
     accountIndex = 0,
@@ -48,11 +48,11 @@ var getDerivePathForSUI = (derivePathParams = {}) => {
 };
 var getKeyPair = (mnemonics, derivePathParams = {}) => {
   const derivePath = getDerivePathForSUI(derivePathParams);
-  return import_sui.Ed25519Keypair.deriveKeypair(mnemonics, derivePath);
+  return import_ed25519.Ed25519Keypair.deriveKeypair(mnemonics, derivePath);
 };
 
 // src/libs/suiAccountManager/util.ts
-var import_sui2 = require("@mysten/sui.js");
+var import_utils = require("@mysten/sui.js/utils");
 var isHex = (str) => /^0x[0-9a-fA-F]+$|^[0-9a-fA-F]+$/.test(str);
 var isBase64 = (str) => /^[a-zA-Z0-9+/]+={0,2}$/g.test(str);
 var fromHEX = (hexStr) => {
@@ -69,7 +69,7 @@ var hexOrBase64ToUint8Array = (str) => {
   if (isHex(str)) {
     return fromHEX(str);
   } else if (isBase64(str)) {
-    return (0, import_sui2.fromB64)(str);
+    return (0, import_utils.fromB64)(str);
   } else {
     throw new Error("The string is not a valid hex or base64 string.");
   }
@@ -112,7 +112,7 @@ var SuiAccountManager = class {
     if (!this.mnemonics && !this.secretKey) {
       this.mnemonics = generateMnemonic(24);
     }
-    this.currentKeyPair = this.secretKey ? import_sui3.Ed25519Keypair.fromSecretKey(
+    this.currentKeyPair = this.secretKey ? import_ed255192.Ed25519Keypair.fromSecretKey(
       normalizePrivateKey(hexOrBase64ToUint8Array(this.secretKey))
     ) : getKeyPair(this.mnemonics);
     this.currentAddress = this.currentKeyPair.getPublicKey().toSuiAddress();
@@ -150,10 +150,11 @@ var SuiAccountManager = class {
 };
 
 // src/libs/suiTxBuilder/index.ts
-var import_sui5 = require("@mysten/sui.js");
+var import_transactions = require("@mysten/sui.js/transactions");
+var import_utils3 = require("@mysten/sui.js/utils");
 
 // src/libs/suiTxBuilder/util.ts
-var import_sui4 = require("@mysten/sui.js");
+var import_utils2 = require("@mysten/sui.js/utils");
 var getDefaultSuiInputType = (value) => {
   if (typeof value === "string" && value.startsWith("0x")) {
     return "object";
@@ -171,7 +172,7 @@ function makeVecParam(txBlock, args, type) {
   const defaultSuiType = getDefaultSuiInputType(args[0]);
   if (type === "object" || !type && defaultSuiType === "object") {
     const objects = args.map(
-      (arg) => typeof arg === "string" ? txBlock.object((0, import_sui4.normalizeSuiObjectId)(arg)) : arg
+      (arg) => typeof arg === "string" ? txBlock.object((0, import_utils2.normalizeSuiObjectId)(arg)) : arg
     );
     return txBlock.makeMoveVec({ objects });
   } else {
@@ -187,7 +188,7 @@ function isMoveVecArg(arg) {
 function convertArgs(txBlock, args) {
   return args.map((arg) => {
     if (typeof arg === "string" && arg.startsWith("0x")) {
-      return txBlock.object((0, import_sui4.normalizeSuiObjectId)(arg));
+      return txBlock.object((0, import_utils2.normalizeSuiObjectId)(arg));
     } else if (isMoveVecArg(arg)) {
       const vecType = arg.vecType || void 0;
       return vecType ? makeVecParam(txBlock, arg.value, vecType) : makeVecParam(txBlock, arg);
@@ -202,9 +203,15 @@ function convertArgs(txBlock, args) {
 // src/libs/suiTxBuilder/index.ts
 var SuiTxBlock = class {
   constructor(transaction) {
-    this.txBlock = new import_sui5.TransactionBlock(transaction);
+    this.txBlock = new import_transactions.TransactionBlock(transaction);
+  }
+  /* Directly wrap methods and properties of TransactionBlock */
+  get gas() {
+    return this.txBlock.gas;
+  }
+  get blockData() {
+    return this.txBlock.blockData;
   }
-  //======== override methods of TransactionBlock ============
   address(value) {
     return this.txBlock.pure(value, "address");
   }
@@ -241,24 +248,28 @@ var SuiTxBlock = class {
   setGasPayment(payments) {
     return this.txBlock.setGasPayment(payments);
   }
-  add(transaction) {
-    return this.txBlock.add(transaction);
-  }
   serialize() {
     return this.txBlock.serialize();
   }
-  build(params = {}) {
+  build(params) {
     return this.txBlock.build(params);
   }
-  getDigest({ provider } = {}) {
-    return this.txBlock.getDigest({ provider });
+  getDigest(params = {}) {
+    return this.txBlock.getDigest(params);
   }
-  get gas() {
-    return this.txBlock.gas;
+  add(...args) {
+    return this.txBlock.add(...args);
   }
-  get blockData() {
-    return this.txBlock.blockData;
+  publish(...args) {
+    return this.txBlock.publish(...args);
+  }
+  upgrade(...args) {
+    return this.txBlock.upgrade(...args);
   }
+  makeMoveVec(...args) {
+    return this.txBlock.makeMoveVec(...args);
+  }
+  /* Override methods of TransactionBlock */
   transferObjects(objects, recipient) {
     const tx = this.txBlock;
     tx.transferObjects(convertArgs(this.txBlock, objects), tx.pure(recipient));
@@ -278,15 +289,6 @@ var SuiTxBlock = class {
     const sourceObjects = convertArgs(this.txBlock, sources);
     return this.txBlock.mergeCoins(destinationObject, sourceObjects);
   }
-  publish(...args) {
-    return this.txBlock.publish(...args);
-  }
-  upgrade(...args) {
-    return this.txBlock.upgrade(...args);
-  }
-  makeMoveVec(...args) {
-    return this.txBlock.makeMoveVec(...args);
-  }
   /**
    * @description Move call
    * @param target `${string}::${string}::${string}`, e.g. `0x3::sui_system::request_add_stake`
@@ -308,7 +310,7 @@ var SuiTxBlock = class {
       typeArguments: typeArgs
     });
   }
-  //======== enhance methods ============
+  /* Enhance methods of TransactionBlock */
   transferSuiToMany(recipients, amounts) {
     if (recipients.length !== amounts.length) {
       throw new Error(
@@ -384,7 +386,7 @@ var SuiTxBlock = class {
     tx.moveCall({
       target: "0x3::sui_system::request_add_stake",
       arguments: [
-        tx.object(import_sui5.SUI_SYSTEM_STATE_OBJECT_ID),
+        tx.object(import_utils3.SUI_SYSTEM_STATE_OBJECT_ID),
         stakeCoin,
         tx.pure(validatorAddr)
       ]
@@ -394,10 +396,9 @@ var SuiTxBlock = class {
 };
 
 // src/libs/suiInteractor/suiInteractor.ts
-var import_sui7 = require("@mysten/sui.js");
+var import_client = require("@mysten/sui.js/client");
 
 // src/libs/suiModel/suiOwnedObject.ts
-var import_sui6 = require("@mysten/sui.js");
 var SuiOwnedObject = class {
   constructor(param) {
     this.objectId = param.objectId;
@@ -431,7 +432,7 @@ var SuiOwnedObject = class {
    * @param txResponse
    */
   updateFromTxResponse(txResponse) {
-    const changes = (0, import_sui6.getObjectChanges)(txResponse);
+    const changes = txResponse.objectChanges;
     if (!changes) {
       throw new Error("Bad transaction response!");
     }
@@ -476,14 +477,15 @@ var SuiInteractor = class {
   constructor(fullNodeUrls) {
     if (fullNodeUrls.length === 0)
       throw new Error("fullNodeUrls must not be empty");
-    this.providers = fullNodeUrls.map(
-      (url) => new import_sui7.JsonRpcProvider(new import_sui7.Connection({ fullnode: url }))
-    );
-    this.currentProvider = this.providers[0];
+    this.fullNodes = fullNodeUrls;
+    this.clients = fullNodeUrls.map((url) => new import_client.SuiClient({ url }));
+    this.currentFullNode = fullNodeUrls[0];
+    this.currentClient = this.clients[0];
   }
-  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(transactionBlock, signature) {
     const txResOptions = {
@@ -492,63 +494,50 @@ var SuiInteractor = class {
       showObjectChanges: true,
       showBalanceChanges: true
     };
-    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(2e3);
       }
     }
     throw new Error("Failed to send transaction with all fullnodes");
   }
-  async getObjects(ids) {
-    const options = {
+  async getObjects(ids, options) {
+    const opts = options ?? {
       showContent: true,
       showDisplay: true,
       showType: true,
       showOwner: true
     };
-    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 = (0, import_sui7.getObjectId)(object);
-          const objectType = (0, import_sui7.getObjectType)(object);
-          const objectVersion = (0, import_sui7.getObjectVersion)(object);
-          const objectDigest = object.data ? object.data.digest : void 0;
-          const initialSharedVersion = (0, import_sui7.getSharedObjectInitialVersion)(object);
-          const objectFields = (0, import_sui7.getObjectFields)(object);
-          const objectDisplay = (0, import_sui7.getObjectDisplay)(object);
-          return {
-            objectId,
-            objectType,
-            objectVersion,
-            objectDigest,
-            objectFields,
-            objectDisplay,
-            initialSharedVersion
-          };
+        const objects = await this.clients[clientIdx].multiGetObjects({
+          ids,
+          options: opts
         });
+        const parsedObjects = objects.map((object) => {
+          return object.data;
+        }).filter((object) => object !== null && object !== void 0);
         return parsedObjects;
       } catch (err) {
         await delay(2e3);
         console.warn(
-          `Failed to get objects with fullnode ${provider.connection.fullnode}: ${err}`
+          `Failed to get objects with fullnode ${this.fullNodes[clientIdx]}: ${err}`
         );
       }
     }
     throw new Error("Failed to get objects with all fullnodes");
   }
-  async getObject(id) {
-    const objects = await this.getObjects([id]);
+  async getObject(id, options) {
+    const objects = await this.getObjects([id], options);
     return objects[0];
   }
   /**
@@ -560,13 +549,17 @@ var SuiInteractor = class {
     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 = void 0;
+        }
       } else if (suiObject instanceof SuiOwnedObject) {
-        suiObject.version = object.objectVersion;
-        suiObject.digest = object.objectDigest;
+        suiObject.version = object?.version;
+        suiObject.digest = object?.digest;
       }
     }
   }
@@ -581,7 +574,7 @@ var SuiInteractor = class {
     let totalAmount = 0;
     let hasNext = true, nextCursor = null;
     while (hasNext && totalAmount < amount) {
-      const coins = await this.currentProvider.getCoins({
+      const coins = await this.currentClient.getCoins({
         owner: addr,
         coinType,
         cursor: nextCursor
@@ -608,24 +601,6 @@ var SuiInteractor = class {
   }
 };
 
-// src/libs/suiInteractor/defaultConfig.ts
-var import_sui8 = require("@mysten/sui.js");
-var defaultGasBudget = 10 ** 8;
-var getDefaultConnection = (networkType = "devnet") => {
-  switch (networkType) {
-    case "localnet":
-      return import_sui8.localnetConnection;
-    case "devnet":
-      return import_sui8.devnetConnection;
-    case "testnet":
-      return import_sui8.testnetConnection;
-    case "mainnet":
-      return import_sui8.mainnetConnection;
-    default:
-      return import_sui8.devnetConnection;
-  }
-};
-
 // src/suiKit.ts
 var SuiKit = class {
   /**
@@ -636,7 +611,7 @@ var SuiKit = class {
    *
    * @param mnemonics, 12 or 24 mnemonics words, separated by space
    * @param secretKey, base64 or hex string, when mnemonics is provided, secretKey will be ignored
-   * @param networkType, 'testnet' | 'mainnet' | 'devnet' | 'localnet', default is 'devnet'
+   * @param networkType, 'testnet' | 'mainnet' | 'devnet' | 'localnet', default is 'mainnet'
    * @param fullnodeUrl, the fullnode url, default is the preconfig fullnode url for the given network type
    */
   constructor({
@@ -646,18 +621,17 @@ var SuiKit = class {
     fullnodeUrls
   } = {}) {
     this.accountManager = new SuiAccountManager({ mnemonics, secretKey });
-    fullnodeUrls = fullnodeUrls || [getDefaultConnection(networkType).fullnode];
+    fullnodeUrls = fullnodeUrls || [(0, import_client2.getFullnodeUrl)(networkType ?? "mainnet")];
     this.suiInteractor = new SuiInteractor(fullnodeUrls);
   }
   /**
-   * if derivePathParams is not provided or mnemonics is empty, it will return the currentSigner.
+   * if derivePathParams is not provided or mnemonics is empty, it will return the keypair.
    * else:
    * it will generate signer from the mnemonic with the given derivePathParams.
    * @param derivePathParams, such as { accountIndex: 2, isExternal: false, addressIndex: 10 }, comply with the BIP44 standard
    */
-  getSigner(derivePathParams) {
-    const keyPair = this.accountManager.getKeyPair(derivePathParams);
-    return new import_sui9.RawSigner(keyPair, this.suiInteractor.currentProvider);
+  getKeypair(derivePathParams) {
+    return this.accountManager.getKeyPair(derivePathParams);
   }
   /**
    * @description Switch the current account with the given derivePathParams
@@ -676,15 +650,15 @@ var SuiKit = class {
   currentAddress() {
     return this.accountManager.currentAddress;
   }
-  provider() {
-    return this.suiInteractor.currentProvider;
-  }
   async getBalance(coinType, derivePathParams) {
     const owner = this.accountManager.getAddress(derivePathParams);
-    return this.suiInteractor.currentProvider.getBalance({ owner, coinType });
+    return this.suiInteractor.currentClient.getBalance({ owner, coinType });
+  }
+  client() {
+    return this.suiInteractor.currentClient;
   }
-  async getObjects(objectIds) {
-    return this.suiInteractor.getObjects(objectIds);
+  async getObjects(objectIds, options) {
+    return this.suiInteractor.getObjects(objectIds, options);
   }
   /**
    * @description Update objects in a batch
@@ -694,16 +668,14 @@ var SuiKit = class {
     return this.suiInteractor.updateObjects(suiObjects);
   }
   async signTxn(tx, derivePathParams) {
-    tx = tx instanceof SuiTxBlock ? tx.txBlock : tx;
-    const signer = this.getSigner(derivePathParams);
-    return signer.signTransactionBlock({ transactionBlock: tx });
+    const txBlock = tx instanceof SuiTxBlock ? tx.txBlock : tx;
+    const txBytes = txBlock instanceof import_transactions2.TransactionBlock ? await txBlock.build({ client: this.client() }) : txBlock;
+    const keyPair = this.getKeypair(derivePathParams);
+    return await keyPair.signTransactionBlock(txBytes);
   }
   async signAndSendTxn(tx, derivePathParams) {
-    const { transactionBlockBytes, signature } = await this.signTxn(
-      tx,
-      derivePathParams
-    );
-    return this.suiInteractor.sendTx(transactionBlockBytes, signature);
+    const { bytes, signature } = await this.signTxn(tx, derivePathParams);
+    return this.suiInteractor.sendTx(bytes, signature);
   }
   /**
    * Transfer the given amount of SUI to the recipient
@@ -805,20 +777,19 @@ var SuiKit = class {
    * @returns the effects and events of the transaction, such as object changes, gas cost, event emitted.
    */
   async inspectTxn(tx, derivePathParams) {
-    tx = tx instanceof SuiTxBlock ? tx.txBlock : tx;
-    return this.suiInteractor.currentProvider.devInspectTransactionBlock({
-      transactionBlock: tx,
+    const txBlock = tx instanceof SuiTxBlock ? tx.txBlock : tx;
+    return this.suiInteractor.currentClient.devInspectTransactionBlock({
+      transactionBlock: txBlock,
       sender: this.getAddress(derivePathParams)
     });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  SUI_CLOCK_OBJECT_ID,
-  SUI_SYSTEM_STATE_OBJECT_ID,
   SuiAccountManager,
   SuiKit,
   SuiTxBlock,
-  TransactionBlock
+  ...require("@mysten/sui.js/utils"),
+  ...require("@mysten/sui.js/transactions")
 });
 //# sourceMappingURL=index.js.map