@0xobelisk/sui-client 0.5.16 → 0.5.18

package/dist/index.mjs

@@ -13,25 +13,29 @@ var __privateAdd = (obj, member, value) => {
 };
 
 // src/index.ts
-export * from "@mysten/sui.js/client";
-export * from "@mysten/sui.js/utils";
-export * from "@mysten/sui.js/transactions";
-export * from "@mysten/sui.js/keypairs/ed25519";
-export * from "@mysten/sui.js/keypairs/secp256k1";
-export * from "@mysten/sui.js/keypairs/secp256r1";
-import { BCS as BCS2, getSuiMoveConfig as getSuiMoveConfig2 } from "@mysten/bcs";
+export * from "@mysten/sui/client";
+export * from "@mysten/sui/utils";
+export * from "@mysten/sui/transactions";
+export * from "@mysten/sui/bcs";
+export * from "@mysten/sui/keypairs/ed25519";
+export * from "@mysten/sui/keypairs/secp256k1";
+export * from "@mysten/sui/keypairs/secp256r1";
+import { bcs as bcs3, BcsType } from "@mysten/bcs";
 
 // src/obelisk.ts
-import { getFullnodeUrl } from "@mysten/sui.js/client";
-import {
-  TransactionBlock as TransactionBlock2
-} from "@mysten/sui.js/transactions";
+import keccak256 from "keccak256";
+import { getFullnodeUrl } from "@mysten/sui/client";
+import { Transaction as Transaction2 } from "@mysten/sui/transactions";
 
 // src/libs/suiAccountManager/index.ts
-import { Ed25519Keypair as Ed25519Keypair2 } from "@mysten/sui.js/keypairs/ed25519";
+import { Ed25519Keypair as Ed25519Keypair2 } from "@mysten/sui/keypairs/ed25519";
+import {
+  SUI_PRIVATE_KEY_PREFIX,
+  decodeSuiPrivateKey
+} from "@mysten/sui/cryptography";
 
 // src/libs/suiAccountManager/keypair.ts
-import { Ed25519Keypair } from "@mysten/sui.js/keypairs/ed25519";
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
 var getDerivePathForSUI = (derivePathParams = {}) => {
   const {
     accountIndex = 0,
@@ -46,7 +50,7 @@ var getKeyPair = (mnemonics, derivePathParams = {}) => {
 };
 
 // src/libs/suiAccountManager/util.ts
-import { fromB64 } from "@mysten/sui.js/utils";
+import { fromB64 } from "@mysten/sui/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) => {
@@ -98,7 +102,7 @@ var SuiAccountManager = class {
    * If none of them is provided, will generate a random mnemonics with 24 words.
    *
    * @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 secretKey, base64 or hex string or Bech32 string, when mnemonics is provided, secretKey will be ignored
    */
   constructor({ mnemonics, secretKey } = {}) {
     this.mnemonics = mnemonics || "";
@@ -106,11 +110,23 @@ var SuiAccountManager = class {
     if (!this.mnemonics && !this.secretKey) {
       this.mnemonics = generateMnemonic(24);
     }
-    this.currentKeyPair = this.secretKey ? Ed25519Keypair2.fromSecretKey(
-      normalizePrivateKey(hexOrBase64ToUint8Array(this.secretKey))
-    ) : getKeyPair(this.mnemonics);
+    this.currentKeyPair = this.secretKey ? this.parseSecretKey(this.secretKey) : getKeyPair(this.mnemonics);
     this.currentAddress = this.currentKeyPair.getPublicKey().toSuiAddress();
   }
+  /**
+   * Check if the secretKey starts with bench32 format
+   */
+  parseSecretKey(secretKey) {
+    if (secretKey.startsWith(SUI_PRIVATE_KEY_PREFIX)) {
+      const { secretKey: uint8ArraySecretKey } = decodeSuiPrivateKey(secretKey);
+      return Ed25519Keypair2.fromSecretKey(
+        normalizePrivateKey(uint8ArraySecretKey)
+      );
+    }
+    return Ed25519Keypair2.fromSecretKey(
+      normalizePrivateKey(hexOrBase64ToUint8Array(secretKey))
+    );
+  }
   /**
    * if derivePathParams is not provided or mnemonics is empty, it will return the currentKeyPair.
    * else:
@@ -144,8 +160,8 @@ var SuiAccountManager = class {
 };
 
 // src/libs/suiTxBuilder/index.ts
-import { TransactionBlock } from "@mysten/sui.js/transactions";
-import { SUI_SYSTEM_STATE_OBJECT_ID } from "@mysten/sui.js/utils";
+import { Transaction } from "@mysten/sui/transactions";
+import { SUI_SYSTEM_STATE_OBJECT_ID } from "@mysten/sui/utils";
 
 // src/libs/suiTxBuilder/util.ts
 import {
@@ -153,10 +169,10 @@ import {
   normalizeSuiAddress,
   isValidSuiObjectId,
   isValidSuiAddress
-} from "@mysten/sui.js/utils";
-import { Inputs } from "@mysten/sui.js/transactions";
-import { isPureArg } from "@mysten/sui.js/bcs";
+} from "@mysten/sui/utils";
+import { Inputs } from "@mysten/sui/transactions";
 import { isSerializedBcs } from "@mysten/bcs";
+import { bcs } from "@mysten/sui/bcs";
 var getDefaultSuiInputType = (value) => {
   if (typeof value === "string" && isValidSuiObjectId(value)) {
     return "object";
@@ -168,7 +184,10 @@ var getDefaultSuiInputType = (value) => {
     return void 0;
   }
 };
-function makeVecParam(txBlock, args, type) {
+function isPureArg(arg) {
+  return arg.Pure !== void 0;
+}
+function makeVecParam(tx, args, type) {
   if (args.length === 0)
     throw new Error("Transaction builder error: Empty array is not allowed");
   const defaultSuiType = getDefaultSuiInputType(args[0]);
@@ -176,17 +195,33 @@ function makeVecParam(txBlock, args, type) {
   const STRUCT_REGEX = /^([^:]+)::([^:]+)::([^<]+)(<(.+)>)?/;
   type = type || defaultSuiType;
   if (type === "object") {
-    const objects = args.map(
-      (arg) => typeof arg === "string" && isValidSuiObjectId(arg) ? txBlock.object(normalizeSuiObjectId(arg)) : convertObjArg(txBlock, arg)
+    const elements = args.map(
+      (arg) => typeof arg === "string" && isValidSuiObjectId(arg) ? tx.object(normalizeSuiObjectId(arg)) : convertObjArg(tx, arg)
     );
-    return txBlock.makeMoveVec({ objects });
+    return tx.makeMoveVec({ elements });
   } else if (typeof type === "string" && !VECTOR_REGEX.test(type) && !STRUCT_REGEX.test(type)) {
-    return txBlock.pure(args, `vector<${type}>`);
+    if (type === "address") {
+      return tx.pure(bcs.vector(bcs.Address).serialize(args));
+    } else if (type === "bool") {
+      return tx.pure(bcs.vector(bcs.Bool).serialize(args));
+    } else if (type === "u8") {
+      return tx.pure(bcs.vector(bcs.U8).serialize(args));
+    } else if (type === "u16") {
+      return tx.pure(bcs.vector(bcs.U16).serialize(args));
+    } else if (type === "u32") {
+      return tx.pure(bcs.vector(bcs.U32).serialize(args));
+    } else if (type === "u64") {
+      return tx.pure(bcs.vector(bcs.U64).serialize(args));
+    } else if (type === "u128") {
+      return tx.pure(bcs.vector(bcs.U128).serialize(args));
+    } else if (type === "u256") {
+      return tx.pure(bcs.vector(bcs.U256).serialize(args));
+    } else {
+      return tx.pure(bcs.vector(bcs.U8).serialize(args));
+    }
   } else {
-    const objects = args.map(
-      (arg) => convertObjArg(txBlock, arg)
-    );
-    return txBlock.makeMoveVec({ objects, type });
+    const elements = args.map((arg) => convertObjArg(tx, arg));
+    return tx.makeMoveVec({ elements, type });
   }
 }
 function isMoveVecArg(arg) {
@@ -197,48 +232,65 @@ function isMoveVecArg(arg) {
   }
   return false;
 }
-function convertArgs(txBlock, args) {
+function convertArgs(tx, args) {
   return args.map((arg) => {
     if (typeof arg === "string" && isValidSuiObjectId(arg)) {
-      return txBlock.object(normalizeSuiObjectId(arg));
+      return tx.object(normalizeSuiObjectId(arg));
     } else if (typeof arg == "object" && !isSerializedBcs(arg) && !isPureArg(arg) && !isMoveVecArg(arg)) {
-      return convertObjArg(txBlock, arg);
+      return convertObjArg(tx, arg);
     } else if (isMoveVecArg(arg)) {
       const vecType = "vecType" in arg;
-      return vecType ? makeVecParam(txBlock, arg.value, arg.vecType) : makeVecParam(txBlock, arg);
+      return vecType ? makeVecParam(tx, arg.value, arg.vecType) : makeVecParam(tx, arg);
     } else if (isSerializedBcs(arg)) {
       return arg;
     } else {
-      return txBlock.pure(arg);
+      let argType = getDefaultSuiInputType(arg);
+      if (argType === "address") {
+        return tx.pure.address(arg);
+      } else if (argType === "u64") {
+        return tx.pure.u64(arg);
+      } else if (argType === "bool") {
+        return tx.pure.bool(arg);
+      } else {
+        return tx.pure.u64(arg);
+      }
     }
   });
 }
-function convertAddressArg(txBlock, arg) {
+function convertAddressArg(tx, arg) {
   if (typeof arg === "string" && isValidSuiAddress(arg)) {
-    return txBlock.pure.address(normalizeSuiAddress(arg));
+    return tx.pure.address(normalizeSuiAddress(arg));
   } else if (typeof arg == "object" && !isSerializedBcs(arg) && !isPureArg(arg)) {
-    return convertObjArg(txBlock, arg);
+    return convertObjArg(tx, arg);
   } else if (isPureArg(arg)) {
-    return txBlock.pure(arg);
+    return tx.pure(Uint8Array.from(arg.Pure));
   } else {
     return arg;
   }
 }
-function convertObjArg(txb, arg) {
+function convertObjArg(tx, arg) {
   if (typeof arg === "string") {
-    return txb.object(arg);
+    return tx.object(arg);
   }
   if ("digest" in arg && "version" in arg && "objectId" in arg) {
-    return txb.objectRef(arg);
+    return tx.objectRef(arg);
   }
   if ("objectId" in arg && "initialSharedVersion" in arg && "mutable" in arg) {
-    return txb.sharedObjectRef(arg);
+    return tx.sharedObjectRef(arg);
   }
   if ("Object" in arg) {
-    if ("ImmOrOwned" in arg.Object) {
-      return txb.object(Inputs.ObjectRef(arg.Object.ImmOrOwned));
-    } else if ("Shared" in arg.Object) {
-      return txb.object(Inputs.SharedObjectRef(arg.Object.Shared));
+    if ("ImmOrOwnedObject" in arg.Object) {
+      return tx.object(
+        Inputs.ObjectRef(arg.Object.ImmOrOwnedObject)
+      );
+    } else if ("SharedObject" in arg.Object) {
+      return tx.object(
+        Inputs.SharedObjectRef(
+          arg.Object.SharedObject
+        )
+      );
+    } else if ("Receiving" in arg.Object) {
+      return tx.object(Inputs.ReceivingRef(arg.Object.Receiving));
     } else {
       throw new Error("Invalid argument type");
     }
@@ -250,108 +302,123 @@ function convertObjArg(txb, arg) {
 }
 
 // src/libs/suiTxBuilder/index.ts
-var SuiTxBlock = class {
+var SuiTx = class {
   constructor(transaction) {
-    this.txBlock = new TransactionBlock(transaction);
+    if (transaction !== void 0) {
+      this.tx = Transaction.from(transaction);
+    } else {
+      this.tx = new Transaction();
+    }
   }
   /* Directly wrap methods and properties of TransactionBlock */
   get gas() {
-    return this.txBlock.gas;
+    return this.tx.gas;
   }
   get blockData() {
-    return this.txBlock.blockData;
+    return this.tx.blockData;
+  }
+  autoPure(value, type) {
+    if (type === void 0) {
+      return convertArgs(this.tx, [value]);
+    }
+    return;
   }
   address(value) {
-    return this.txBlock.pure(value, "address");
+    return this.tx.pure.address(value);
   }
-  pure(value, type) {
-    return this.txBlock.pure(value, type);
+  pure(value) {
+    return this.tx.pure(value);
   }
   object(value) {
-    return this.txBlock.object(value);
+    return this.tx.object(value);
   }
   objectRef(ref) {
-    return this.txBlock.objectRef(ref);
+    return this.tx.objectRef(ref);
   }
   sharedObjectRef(ref) {
-    return this.txBlock.sharedObjectRef(ref);
+    return this.tx.sharedObjectRef(ref);
   }
   setSender(sender) {
-    return this.txBlock.setSender(sender);
+    return this.tx.setSender(sender);
   }
   setSenderIfNotSet(sender) {
-    return this.txBlock.setSenderIfNotSet(sender);
+    return this.tx.setSenderIfNotSet(sender);
   }
   setExpiration(expiration) {
-    return this.txBlock.setExpiration(expiration);
+    return this.tx.setExpiration(expiration);
   }
   setGasPrice(price) {
-    return this.txBlock.setGasPrice(price);
+    return this.tx.setGasPrice(price);
   }
   setGasBudget(budget) {
-    return this.txBlock.setGasBudget(budget);
+    return this.tx.setGasBudget(budget);
   }
   setGasOwner(owner) {
-    return this.txBlock.setGasOwner(owner);
+    return this.tx.setGasOwner(owner);
   }
   setGasPayment(payments) {
-    return this.txBlock.setGasPayment(payments);
+    return this.tx.setGasPayment(payments);
   }
   serialize() {
-    return this.txBlock.serialize();
+    return this.tx.serialize();
   }
   sign(params) {
-    return this.txBlock.sign(params);
+    return this.tx.sign(params);
   }
   build(params = {}) {
-    return this.txBlock.build(params);
+    return this.tx.build(params);
   }
   getDigest(params = {}) {
-    return this.txBlock.getDigest(params);
+    return this.tx.getDigest(params);
   }
   add(...args) {
-    return this.txBlock.add(...args);
+    return this.tx.add(...args);
   }
   publish({
     modules,
     dependencies
   }) {
-    return this.txBlock.publish({ modules, dependencies });
+    return this.tx.publish({ modules, dependencies });
   }
   upgrade({
     modules,
     dependencies,
-    packageId,
+    package: packageId,
     ticket
   }) {
-    return this.txBlock.upgrade({ modules, dependencies, packageId, ticket });
+    return this.tx.upgrade({
+      modules,
+      dependencies,
+      package: packageId,
+      ticket
+    });
   }
   makeMoveVec({
-    objects,
+    elements,
     type
   }) {
-    return this.txBlock.makeMoveVec({ objects, type });
+    return this.tx.makeMoveVec({ elements, type });
   }
   /* Override methods of TransactionBlock */
   transferObjects(objects, address) {
-    return this.txBlock.transferObjects(
-      objects.map((object) => convertObjArg(this.txBlock, object)),
-      convertAddressArg(this.txBlock, address)
+    return this.tx.transferObjects(
+      objects.map((object) => convertObjArg(this.tx, object)),
+      convertAddressArg(this.tx, address)
     );
   }
   splitCoins(coin, amounts) {
-    const res = this.txBlock.splitCoins(
-      convertObjArg(this.txBlock, coin),
-      convertArgs(this.txBlock, amounts)
+    const res = this.tx.splitCoins(
+      convertObjArg(this.tx, coin),
+      convertArgs(this.tx, amounts)
     );
     return amounts.map((_, i) => res[i]);
   }
   mergeCoins(destination, sources) {
-    const destinationObject = convertObjArg(this.txBlock, destination);
+    const destinationObject = convertObjArg(this.tx, destination);
     const sourceObjects = sources.map(
-      (source) => convertObjArg(this.txBlock, source)
+      (source) => convertObjArg(this.tx, source)
     );
-    return this.txBlock.mergeCoins(destinationObject, sourceObjects);
+    return this.tx.mergeCoins(destinationObject, sourceObjects);
   }
   /**
    * @description Move call
@@ -366,8 +433,8 @@ var SuiTxBlock = class {
       throw new Error(
         "Invalid target format. Expected `${string}::${string}::${string}`"
       );
-    const convertedArgs = convertArgs(this.txBlock, args);
-    return this.txBlock.moveCall({
+    const convertedArgs = convertArgs(this.tx, args);
+    return this.tx.moveCall({
       target,
       arguments: convertedArgs,
       typeArguments: typeArgs
@@ -380,15 +447,15 @@ var SuiTxBlock = class {
         "transferSuiToMany: recipients.length !== amounts.length"
       );
     }
-    const coins = this.txBlock.splitCoins(
-      this.txBlock.gas,
-      convertArgs(this.txBlock, amounts)
+    const coins = this.tx.splitCoins(
+      this.tx.gas,
+      convertArgs(this.tx, amounts)
     );
     const recipientObjects = recipients.map(
-      (recipient) => convertAddressArg(this.txBlock, recipient)
+      (recipient) => convertAddressArg(this.tx, recipient)
     );
     recipientObjects.forEach((address, index) => {
-      this.txBlock.transferObjects([coins[index]], address);
+      this.tx.transferObjects([coins[index]], address);
     });
     return this;
   }
@@ -396,32 +463,29 @@ var SuiTxBlock = class {
     return this.transferSuiToMany([address], [amount]);
   }
   takeAmountFromCoins(coins, amount) {
-    const coinObjects = coins.map((coin) => convertObjArg(this.txBlock, coin));
+    const coinObjects = coins.map((coin) => convertObjArg(this.tx, coin));
     const mergedCoin = coinObjects[0];
     if (coins.length > 1) {
-      this.txBlock.mergeCoins(mergedCoin, coinObjects.slice(1));
+      this.tx.mergeCoins(mergedCoin, coinObjects.slice(1));
     }
-    const [sendCoin] = this.txBlock.splitCoins(
+    const [sendCoin] = this.tx.splitCoins(
       mergedCoin,
-      convertArgs(this.txBlock, [amount])
+      convertArgs(this.tx, [amount])
     );
     return [sendCoin, mergedCoin];
   }
   splitSUIFromGas(amounts) {
-    return this.txBlock.splitCoins(
-      this.txBlock.gas,
-      convertArgs(this.txBlock, amounts)
-    );
+    return this.tx.splitCoins(this.tx.gas, convertArgs(this.tx, amounts));
   }
   splitMultiCoins(coins, amounts) {
-    const coinObjects = coins.map((coin) => convertObjArg(this.txBlock, coin));
+    const coinObjects = coins.map((coin) => convertObjArg(this.tx, coin));
     const mergedCoin = coinObjects[0];
     if (coins.length > 1) {
-      this.txBlock.mergeCoins(mergedCoin, coinObjects.slice(1));
+      this.tx.mergeCoins(mergedCoin, coinObjects.slice(1));
     }
-    const splitedCoins = this.txBlock.splitCoins(
+    const splitedCoins = this.tx.splitCoins(
       mergedCoin,
-      convertArgs(this.txBlock, amounts)
+      convertArgs(this.tx, amounts)
     );
     return { splitedCoins, mergedCoin };
   }
@@ -431,45 +495,42 @@ var SuiTxBlock = class {
         "transferSuiToMany: recipients.length !== amounts.length"
       );
     }
-    const coinObjects = coins.map((coin) => convertObjArg(this.txBlock, coin));
+    const coinObjects = coins.map((coin) => convertObjArg(this.tx, coin));
     const { splitedCoins, mergedCoin } = this.splitMultiCoins(
       coinObjects,
       amounts
     );
     const recipientObjects = recipients.map(
-      (recipient) => convertAddressArg(this.txBlock, recipient)
+      (recipient) => convertAddressArg(this.tx, recipient)
     );
     recipientObjects.forEach((address, index) => {
-      this.txBlock.transferObjects([splitedCoins[index]], address);
+      this.tx.transferObjects([splitedCoins[index]], address);
     });
-    this.txBlock.transferObjects(
-      [mergedCoin],
-      convertAddressArg(this.txBlock, sender)
-    );
+    this.tx.transferObjects([mergedCoin], convertAddressArg(this.tx, sender));
     return this;
   }
   transferCoin(coins, sender, recipient, amount) {
     return this.transferCoinToMany(coins, sender, [recipient], [amount]);
   }
   stakeSui(amount, validatorAddr) {
-    const [stakeCoin] = this.txBlock.splitCoins(
-      this.txBlock.gas,
-      convertArgs(this.txBlock, [amount])
+    const [stakeCoin] = this.tx.splitCoins(
+      this.tx.gas,
+      convertArgs(this.tx, [amount])
     );
-    return this.txBlock.moveCall({
+    return this.tx.moveCall({
       target: "0x3::sui_system::request_add_stake",
-      arguments: convertArgs(this.txBlock, [
+      arguments: convertArgs(this.tx, [
         SUI_SYSTEM_STATE_OBJECT_ID,
         stakeCoin,
-        this.txBlock.pure(validatorAddr)
+        this.tx.pure.address(validatorAddr.toString())
       ])
     });
   }
 };
 
 // src/libs/suiInteractor/suiInteractor.ts
-import { SuiClient } from "@mysten/sui.js/client";
-import { requestSuiFromFaucetV0, getFaucetHost } from "@mysten/sui.js/faucet";
+import { SuiClient } from "@mysten/sui/client";
+import { requestSuiFromFaucetV0, getFaucetHost } from "@mysten/sui/faucet";
 
 // src/libs/suiModel/suiOwnedObject.ts
 var SuiOwnedObject = class {
@@ -491,8 +552,10 @@ var SuiOwnedObject = class {
       return this.objectId;
     }
     return {
+      $kind: "Object",
       Object: {
-        ImmOrOwned: {
+        $kind: "ImmOrOwnedObject",
+        ImmOrOwnedObject: {
           objectId: this.objectId,
           version: this.version,
           digest: this.digest
@@ -531,8 +594,10 @@ var SuiSharedObject = class {
       return this.objectId;
     }
     return {
+      $kind: "Object",
       Object: {
-        Shared: {
+        $kind: "SharedObject",
+        SharedObject: {
           objectId: this.objectId,
           initialSharedVersion: this.initialSharedVersion,
           mutable
@@ -892,8 +957,7 @@ function numberToAddressHex(num) {
 }
 
 // src/obelisk.ts
-import keccak256 from "keccak256";
-import { BCS, getSuiMoveConfig } from "@mysten/bcs";
+import { bcs as bcs2, fromHEX as fromHEX2, toHEX } from "@mysten/bcs";
 function isUndefined(value) {
   return value === void 0;
 }
@@ -918,7 +982,7 @@ function createTx(meta, fn) {
     }
   );
 }
-var _query, _tx, _exec, _read;
+var _query, _tx, _struct, _exec, _read;
 var Obelisk = class {
   /**
    * Support the following ways to init the ObeliskClient:
@@ -927,7 +991,7 @@ var Obelisk = class {
    * If none of them is provided, will generate a random mnemonics with 24 words.
    *
    * @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 secretKey, base64 or hex string or bech32, when mnemonics is provided, secretKey will be ignored
    * @param networkType, 'testnet' | 'mainnet' | 'devnet' | 'localnet', default is 'devnet'
    * @param fullnodeUrl, the fullnode url, default is the preconfig fullnode url for the given network type
    * @param packageId
@@ -942,6 +1006,7 @@ var Obelisk = class {
   } = {}) {
     __privateAdd(this, _query, {});
     __privateAdd(this, _tx, {});
+    __privateAdd(this, _struct, {});
     __privateAdd(this, _exec, async (meta, tx, params, typeArguments, isRaw) => {
       if (isRaw === true) {
         return tx.moveCall({
@@ -978,33 +1043,37 @@ var Obelisk = class {
     this.packageId = packageId;
     if (metadata !== void 0) {
       this.metadata = metadata;
-      Object.values(metadata).forEach((value) => {
-        const data = value;
-        const moduleName = data.name;
-        Object.entries(data.exposedFunctions).forEach(([funcName, value2]) => {
-          const meta = value2;
-          meta.moduleName = moduleName;
-          meta.funcName = funcName;
-          if (isUndefined(__privateGet(this, _query)[moduleName])) {
-            __privateGet(this, _query)[moduleName] = {};
-          }
-          if (isUndefined(__privateGet(this, _query)[moduleName][funcName])) {
-            __privateGet(this, _query)[moduleName][funcName] = createQuery(
-              meta,
-              (tx, p, typeArguments, isRaw) => __privateGet(this, _read).call(this, meta, tx, p, typeArguments, isRaw)
-            );
-          }
-          if (isUndefined(__privateGet(this, _tx)[moduleName])) {
-            __privateGet(this, _tx)[moduleName] = {};
-          }
-          if (isUndefined(__privateGet(this, _tx)[moduleName][funcName])) {
-            __privateGet(this, _tx)[moduleName][funcName] = createTx(
-              meta,
-              (tx, p, typeArguments, isRaw) => __privateGet(this, _exec).call(this, meta, tx, p, typeArguments, isRaw)
-            );
-          }
-        });
-      });
+      Object.values(metadata).forEach(
+        (moudlevalue) => {
+          const data = moudlevalue;
+          const moduleName = data.name;
+          Object.entries(data.exposedFunctions).forEach(
+            ([funcName, funcvalue]) => {
+              const meta = funcvalue;
+              meta.moduleName = moduleName;
+              meta.funcName = funcName;
+              if (isUndefined(__privateGet(this, _query)[moduleName])) {
+                __privateGet(this, _query)[moduleName] = {};
+              }
+              if (isUndefined(__privateGet(this, _query)[moduleName][funcName])) {
+                __privateGet(this, _query)[moduleName][funcName] = createQuery(
+                  meta,
+                  (tx, p, typeArguments, isRaw) => __privateGet(this, _read).call(this, meta, tx, p, typeArguments, isRaw)
+                );
+              }
+              if (isUndefined(__privateGet(this, _tx)[moduleName])) {
+                __privateGet(this, _tx)[moduleName] = {};
+              }
+              if (isUndefined(__privateGet(this, _tx)[moduleName][funcName])) {
+                __privateGet(this, _tx)[moduleName][funcName] = createTx(
+                  meta,
+                  (tx, p, typeArguments, isRaw) => __privateGet(this, _exec).call(this, meta, tx, p, typeArguments, isRaw)
+                );
+              }
+            }
+          );
+        }
+      );
     }
     this.contractFactory = new SuiContractFactory({
       packageId,
@@ -1017,6 +1086,9 @@ var Obelisk = class {
   get tx() {
     return __privateGet(this, _tx);
   }
+  get struct() {
+    return __privateGet(this, _struct);
+  }
   /**
    * if derivePathParams is not provided or mnemonics is empty, it will return the keypair.
    * else:
@@ -1049,11 +1121,20 @@ var Obelisk = class {
   getMetadata() {
     return this.contractFactory.metadata;
   }
+  getNetwork() {
+    return this.suiInteractor.network;
+  }
   /**
    * Request some SUI from faucet
    * @Returns {Promise<boolean>}, true if the request is successful, false otherwise.
    */
-  async requestFaucet(address, network) {
+  async requestFaucet(address, network, derivePathParams) {
+    if (address === void 0) {
+      address = this.accountManager.getAddress(derivePathParams);
+    }
+    if (network === void 0) {
+      network = this.getNetwork();
+    }
     return this.suiInteractor.requestFaucet(address, network);
   }
   async getBalance(coinType, derivePathParams) {
@@ -1077,18 +1158,21 @@ var Obelisk = class {
     return this.suiInteractor.getObjects(objectIds);
   }
   async signTxn(tx, derivePathParams) {
-    if (tx instanceof SuiTxBlock || tx instanceof TransactionBlock2) {
+    if (tx instanceof SuiTx || tx instanceof Transaction2) {
       tx.setSender(this.getAddress(derivePathParams));
     }
-    const txBlock = tx instanceof SuiTxBlock ? tx.txBlock : tx;
-    const txBytes = txBlock instanceof TransactionBlock2 ? await txBlock.build({ client: this.client() }) : txBlock;
+    const txBlock = tx instanceof SuiTx ? tx.tx : tx;
+    const txBytes = txBlock instanceof Transaction2 ? await txBlock.build({ client: this.client() }) : txBlock;
     const keyPair = this.getKeypair(derivePathParams);
-    return await keyPair.signTransactionBlock(txBytes);
+    return await keyPair.signTransaction(txBytes);
   }
   async signAndSendTxn(tx, derivePathParams) {
     const { bytes, signature } = await this.signTxn(tx, derivePathParams);
     return this.suiInteractor.sendTx(bytes, signature);
   }
+  async sendTxn(transactionBlock, signature) {
+    return this.suiInteractor.sendTx(transactionBlock, signature);
+  }
   /**
    * Transfer the given amount of SUI to the recipient
    * @param recipient
@@ -1096,7 +1180,7 @@ var Obelisk = class {
    * @param derivePathParams
    */
   async transferSui(recipient, amount, derivePathParams) {
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     tx.transferSui(recipient, amount);
     return this.signAndSendTxn(tx, derivePathParams);
   }
@@ -1107,7 +1191,7 @@ var Obelisk = class {
    * @param derivePathParams
    */
   async transferSuiToMany(recipients, amounts, derivePathParams) {
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     tx.transferSuiToMany(recipients, amounts);
     return this.signAndSendTxn(tx, derivePathParams);
   }
@@ -1119,7 +1203,7 @@ var Obelisk = class {
    * @param derivePathParams the derive path params for the current signer
    */
   async transferCoinToMany(recipients, amounts, coinType, derivePathParams) {
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     const owner = this.accountManager.getAddress(derivePathParams);
     const totalAmount = amounts.reduce((a, b) => a + b, 0);
     const coins = await this.suiInteractor.selectCoins(
@@ -1144,7 +1228,7 @@ var Obelisk = class {
     );
   }
   async transferObjects(objects, recipient, derivePathParams) {
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     tx.transferObjects(objects, recipient);
     return this.signAndSendTxn(tx, derivePathParams);
   }
@@ -1155,7 +1239,7 @@ var Obelisk = class {
       typeArguments = [],
       derivePathParams
     } = callParams;
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     tx.moveCall(target, args, typeArguments);
     return this.signAndSendTxn(tx, derivePathParams);
   }
@@ -1182,7 +1266,7 @@ var Obelisk = class {
    * @param derivePathParams the derive path params for the current signer
    */
   async stakeSui(amount, validatorAddr, derivePathParams) {
-    const tx = new SuiTxBlock();
+    const tx = new SuiTx();
     tx.stakeSui(amount, validatorAddr);
     return this.signAndSendTxn(tx, derivePathParams);
   }
@@ -1194,7 +1278,7 @@ var Obelisk = class {
    * @returns the effects and events of the transaction, such as object changes, gas cost, event emitted.
    */
   async inspectTxn(tx, derivePathParams) {
-    const txBlock = tx instanceof SuiTxBlock ? tx.txBlock : tx;
+    const txBlock = tx instanceof SuiTx ? tx.tx : tx;
     return this.suiInteractor.currentClient.devInspectTransactionBlock({
       transactionBlock: txBlock,
       sender: this.getAddress(derivePathParams)
@@ -1216,36 +1300,62 @@ var Obelisk = class {
   }
   async getEntity(worldId, schemaName, entityId) {
     const schemaModuleName = `${schemaName}_schema`;
-    const tx = new TransactionBlock2();
-    const params = [tx.pure(worldId)];
+    const tx = new Transaction2();
+    const params = [tx.pure.address(worldId)];
     if (entityId !== void 0) {
-      params.push(tx.pure(entityId));
+      params.push(tx.pure.address(entityId));
     }
     const getResult = await this.query[schemaModuleName].get(
       tx,
       params
     );
-    let returnValue = [];
+    let returnValues = [];
     if (getResult.effects.status.status === "success") {
       const resultList = getResult.results[0].returnValues;
       for (const res of resultList) {
-        const bcs = new BCS(getSuiMoveConfig());
-        const value = Uint8Array.from(res[0]);
-        const bcsType = res[1].replace(/0x1::ascii::String/g, "string");
-        const data = bcs.de(bcsType, value);
-        returnValue.push(data);
+        let baseValue = res[0];
+        let baseType = res[1];
+        const value = Uint8Array.from(baseValue);
+        if (baseType === "address") {
+          const Address = bcs2.bytes(32).transform({
+            // To change the input type, you need to provide a type definition for the input
+            input: (val) => fromHEX2(val),
+            output: (val) => toHEX(val)
+          });
+          returnValues.push(Address.parse(value));
+        } else if (baseType === "u8") {
+          returnValues.push(bcs2.u8().parse(value));
+        } else if (baseType === "u16") {
+          returnValues.push(bcs2.u16().parse(value));
+        } else if (baseType === "u32") {
+          returnValues.push(bcs2.u32().parse(value));
+        } else if (baseType === "u64") {
+          returnValues.push(bcs2.u64().parse(value));
+        } else if (baseType === "u128") {
+          returnValues.push(bcs2.u128().parse(value));
+        } else if (baseType === "u256") {
+          returnValues.push(bcs2.u256().parse(value));
+        } else if (baseType === "bool") {
+          returnValues.push(bcs2.bool().parse(value));
+        } else if (baseType === "0x1::ascii::String") {
+          returnValues.push(bcs2.string().parse(value));
+        } else if (baseType === "vector<u8>") {
+          returnValues.push(bcs2.vector(bcs2.u8()).parse(value));
+        } else if (baseType === "0x1::option::Option<u8>") {
+          returnValues.push(bcs2.option(bcs2.u8()).parse(value));
+        }
       }
-      return returnValue;
+      return returnValues;
     } else {
       return void 0;
     }
   }
   async containEntity(worldId, schemaName, entityId) {
     const schemaModuleName = `${schemaName}_schema`;
-    const tx = new TransactionBlock2();
-    const params = [tx.pure(worldId)];
+    const tx = new Transaction2();
+    const params = [tx.pure.address(worldId)];
     if (entityId !== void 0) {
-      params.push(tx.pure(entityId));
+      params.push(tx.pure.address(entityId));
     }
     const getResult = await this.query[schemaModuleName].contains(
       tx,
@@ -1253,9 +1363,9 @@ var Obelisk = class {
     );
     if (getResult.effects.status.status === "success") {
       const res = getResult.results[0].returnValues[0];
-      const bcs = new BCS(getSuiMoveConfig());
-      const value = Uint8Array.from(res[0]);
-      return bcs.de(res[1], value);
+      let baseValue = res[0];
+      const value = Uint8Array.from(baseValue);
+      return bcs2.bool().parse(value);
     } else {
       return void 0;
     }
@@ -1317,9 +1427,13 @@ var Obelisk = class {
   async entity_key_from_bytes(bytes) {
     const hashBytes = keccak256(bytes);
     const hashU8Array = Array.from(hashBytes);
-    const bcs = new BCS(getSuiMoveConfig());
     const value = Uint8Array.from(hashU8Array);
-    const data = bcs.de("address", value);
+    const Address = bcs2.bytes(32).transform({
+      // To change the input type, you need to provide a type definition for the input
+      input: (val) => fromHEX2(val),
+      output: (val) => toHEX(val)
+    });
+    const data = Address.parse(value);
     return "0x" + data;
   }
   async entity_key_from_address_with_seed(objectId, seed) {
@@ -1337,9 +1451,8 @@ var Obelisk = class {
     const checkObjectId = normalizeHexAddress(objectId);
     if (checkObjectId !== null) {
       objectId = checkObjectId;
-      const bcs = new BCS(getSuiMoveConfig());
       const bytes = Buffer.from(objectId.slice(2), "hex");
-      const numberBytes = bcs.ser("u256", x).toBytes();
+      const numberBytes = bcs2.u256().serialize(x).toBytes();
       return this.entity_key_from_bytes(Buffer.concat([bytes, numberBytes]));
     } else {
       return void 0;
@@ -1348,23 +1461,65 @@ var Obelisk = class {
   async entity_key_from_u256(x) {
     return numberToAddressHex(x);
   }
-  async formatData(type, value) {
-    const bcs = new BCS(getSuiMoveConfig());
-    const u8Value = Uint8Array.from(value);
-    return bcs.de(type, u8Value);
+  // async formatData(type: string, value: Buffer | number[] | Uint8Array) {
+  //   const u8Value = Uint8Array.from(value);
+  //   return bcs.de(type, u8Value);
+  // }
+  async autoFormatDryValue(value) {
+    let returnValues = [];
+    if (value.effects.status.status === "success") {
+      const resultList = value.results[0].returnValues;
+      for (const res of resultList) {
+        let baseValue = res[0];
+        let baseType = res[1];
+        const value2 = Uint8Array.from(baseValue);
+        if (baseType === "address") {
+          const Address = bcs2.bytes(32).transform({
+            // To change the input type, you need to provide a type definition for the input
+            input: (val) => fromHEX2(val),
+            output: (val) => toHEX(val)
+          });
+          returnValues.push(Address.parse(value2));
+        } else if (baseType === "u8") {
+          returnValues.push(bcs2.u8().parse(value2));
+        } else if (baseType === "u16") {
+          returnValues.push(bcs2.u16().parse(value2));
+        } else if (baseType === "u32") {
+          returnValues.push(bcs2.u32().parse(value2));
+        } else if (baseType === "u64") {
+          returnValues.push(bcs2.u64().parse(value2));
+        } else if (baseType === "u128") {
+          returnValues.push(bcs2.u128().parse(value2));
+        } else if (baseType === "u256") {
+          returnValues.push(bcs2.u256().parse(value2));
+        } else if (baseType === "bool") {
+          returnValues.push(bcs2.bool().parse(value2));
+        } else if (baseType === "0x1::ascii::String") {
+          returnValues.push(bcs2.string().parse(value2));
+        } else if (baseType === "vector<u8>") {
+          returnValues.push(bcs2.vector(bcs2.u8()).parse(value2));
+        } else if (baseType === "0x1::option::Option<u8>") {
+          returnValues.push(bcs2.option(bcs2.u8()).parse(value2));
+        }
+      }
+      return returnValues;
+    } else {
+      return void 0;
+    }
   }
 };
 _query = new WeakMap();
 _tx = new WeakMap();
+_struct = new WeakMap();
 _exec = new WeakMap();
 _read = new WeakMap();
 
 // src/libs/multiSig/client.ts
-import { MultiSigPublicKey } from "@mysten/sui.js/multisig";
+import { MultiSigPublicKey } from "@mysten/sui/multisig";
 
 // src/libs/multiSig/publickey.ts
-import { Ed25519PublicKey } from "@mysten/sui.js/keypairs/ed25519";
-import { fromB64 as fromB642 } from "@mysten/sui.js/utils";
+import { Ed25519PublicKey } from "@mysten/sui/keypairs/ed25519";
+import { fromB64 as fromB642 } from "@mysten/sui/utils";
 function ed25519PublicKeyFromBase64(rawPubkey) {
   let bytes = fromB642(rawPubkey);
   if (bytes.length !== 32 && bytes.length !== 33)
@@ -1401,7 +1556,7 @@ var MultiSigClient = class _MultiSigClient {
 };
 
 // src/metadata/index.ts
-import { getFullnodeUrl as getFullnodeUrl2 } from "@mysten/sui.js/client";
+import { getFullnodeUrl as getFullnodeUrl2 } from "@mysten/sui/client";
 async function loadMetadata(networkType, packageId) {
   const fullnodeUrls = [getFullnodeUrl2(networkType)];
   const suiInteractor = new SuiInteractor(fullnodeUrls);
@@ -1415,13 +1570,13 @@ async function loadMetadata(networkType, packageId) {
   }
 }
 export {
-  BCS2 as BCS,
+  BcsType,
   MultiSigClient,
   Obelisk,
   SuiAccountManager,
   SuiContractFactory,
-  SuiTxBlock,
-  getSuiMoveConfig2 as getSuiMoveConfig,
+  SuiTx,
+  bcs3 as bcs,
   loadMetadata
 };
 //# sourceMappingURL=index.mjs.map