@0xobelisk/sui-client 0.5.18 → 0.5.19

package/dist/index.mjs

@@ -29,10 +29,6 @@ import { Transaction as Transaction2 } from "@mysten/sui/transactions";
 
 // src/libs/suiAccountManager/index.ts
 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/keypairs/ed25519";
@@ -94,6 +90,10 @@ var generateMnemonic = (numberOfWords = 24) => {
 };
 
 // src/libs/suiAccountManager/index.ts
+import {
+  SUI_PRIVATE_KEY_PREFIX,
+  decodeSuiPrivateKey
+} from "@mysten/sui/cryptography";
 var SuiAccountManager = class {
   /**
    * Support the following ways to init the SuiToolkit:
@@ -170,9 +170,8 @@ import {
   isValidSuiObjectId,
   isValidSuiAddress
 } from "@mysten/sui/utils";
-import { Inputs } from "@mysten/sui/transactions";
-import { isSerializedBcs } from "@mysten/bcs";
-import { bcs } from "@mysten/sui/bcs";
+import { Inputs, getPureBcsSchema } from "@mysten/sui/transactions";
+import { SerializedBcs, bcs, isSerializedBcs } from "@mysten/bcs";
 var getDefaultSuiInputType = (value) => {
   if (typeof value === "string" && isValidSuiObjectId(value)) {
     return "object";
@@ -184,10 +183,7 @@ var getDefaultSuiInputType = (value) => {
     return void 0;
   }
 };
-function isPureArg(arg) {
-  return arg.Pure !== void 0;
-}
-function makeVecParam(tx, args, type) {
+function makeVecParam(txBlock, args, type) {
   if (args.length === 0)
     throw new Error("Transaction builder error: Empty array is not allowed");
   const defaultSuiType = getDefaultSuiInputType(args[0]);
@@ -196,32 +192,17 @@ function makeVecParam(tx, args, type) {
   type = type || defaultSuiType;
   if (type === "object") {
     const elements = args.map(
-      (arg) => typeof arg === "string" && isValidSuiObjectId(arg) ? tx.object(normalizeSuiObjectId(arg)) : convertObjArg(tx, arg)
+      (arg) => typeof arg === "string" && isValidSuiObjectId(arg) ? txBlock.object(normalizeSuiObjectId(arg)) : convertObjArg(txBlock, arg)
     );
-    return tx.makeMoveVec({ elements });
+    return txBlock.makeMoveVec({ elements });
   } else if (typeof type === "string" && !VECTOR_REGEX.test(type) && !STRUCT_REGEX.test(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));
-    }
+    const bcsSchema = getPureBcsSchema(type);
+    return txBlock.pure(bcs.vector(bcsSchema).serialize(args));
   } else {
-    const elements = args.map((arg) => convertObjArg(tx, arg));
-    return tx.makeMoveVec({ elements, type });
+    const elements = args.map(
+      (arg) => convertObjArg(txBlock, arg)
+    );
+    return txBlock.makeMoveVec({ elements, type });
   }
 }
 function isMoveVecArg(arg) {
@@ -232,74 +213,61 @@ function isMoveVecArg(arg) {
   }
   return false;
 }
-function convertArgs(tx, args) {
+function convertArgs(txBlock, args) {
   return args.map((arg) => {
-    if (typeof arg === "string" && isValidSuiObjectId(arg)) {
-      return tx.object(normalizeSuiObjectId(arg));
-    } else if (typeof arg == "object" && !isSerializedBcs(arg) && !isPureArg(arg) && !isMoveVecArg(arg)) {
-      return convertObjArg(tx, arg);
-    } else if (isMoveVecArg(arg)) {
+    if (arg instanceof SerializedBcs || isSerializedBcs(arg)) {
+      return txBlock.pure(arg);
+    }
+    if (isMoveVecArg(arg)) {
       const vecType = "vecType" in arg;
-      return vecType ? makeVecParam(tx, arg.value, arg.vecType) : makeVecParam(tx, arg);
-    } else if (isSerializedBcs(arg)) {
-      return arg;
-    } else {
-      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);
-      }
+      return vecType ? makeVecParam(txBlock, arg.value, arg.vecType) : makeVecParam(txBlock, arg);
     }
+    return arg;
   });
 }
-function convertAddressArg(tx, arg) {
+function convertAddressArg(txBlock, arg) {
   if (typeof arg === "string" && isValidSuiAddress(arg)) {
-    return tx.pure.address(normalizeSuiAddress(arg));
-  } else if (typeof arg == "object" && !isSerializedBcs(arg) && !isPureArg(arg)) {
-    return convertObjArg(tx, arg);
-  } else if (isPureArg(arg)) {
-    return tx.pure(Uint8Array.from(arg.Pure));
+    return txBlock.pure.address(normalizeSuiAddress(arg));
   } else {
-    return arg;
+    return convertArgs(txBlock, [arg])[0];
   }
 }
-function convertObjArg(tx, arg) {
+function convertObjArg(txb, arg) {
   if (typeof arg === "string") {
-    return tx.object(arg);
+    return txb.object(arg);
   }
   if ("digest" in arg && "version" in arg && "objectId" in arg) {
-    return tx.objectRef(arg);
+    return txb.objectRef(arg);
   }
   if ("objectId" in arg && "initialSharedVersion" in arg && "mutable" in arg) {
-    return tx.sharedObjectRef(arg);
+    return txb.sharedObjectRef(arg);
   }
   if ("Object" in arg) {
     if ("ImmOrOwnedObject" in arg.Object) {
-      return tx.object(
-        Inputs.ObjectRef(arg.Object.ImmOrOwnedObject)
-      );
+      return txb.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));
+      return txb.object(Inputs.SharedObjectRef(arg.Object.SharedObject));
     } else {
       throw new Error("Invalid argument type");
     }
   }
-  if ("kind" in arg) {
+  if (typeof arg === "function") {
+    return arg;
+  }
+  if ("GasCoin" in arg || "Input" in arg || "Result" in arg || "NestedResult" in arg) {
     return arg;
   }
   throw new Error("Invalid argument type");
 }
+function convertAmounts(txBlock, amounts) {
+  return amounts.map((amount) => {
+    if (typeof amount === "number" || typeof amount === "bigint") {
+      return amount;
+    } else {
+      return convertArgs(txBlock, [amount])[0];
+    }
+  });
+}
 
 // src/libs/suiTxBuilder/index.ts
 var SuiTx = class {
@@ -326,8 +294,8 @@ var SuiTx = class {
   address(value) {
     return this.tx.pure.address(value);
   }
-  pure(value) {
-    return this.tx.pure(value);
+  get pure() {
+    return this.tx.pure.bind(this.tx);
   }
   object(value) {
     return this.tx.object(value);
@@ -362,6 +330,9 @@ var SuiTx = class {
   serialize() {
     return this.tx.serialize();
   }
+  toJSON() {
+    return this.tx.toJSON();
+  }
   sign(params) {
     return this.tx.sign(params);
   }
@@ -380,24 +351,11 @@ var SuiTx = class {
   }) {
     return this.tx.publish({ modules, dependencies });
   }
-  upgrade({
-    modules,
-    dependencies,
-    package: packageId,
-    ticket
-  }) {
-    return this.tx.upgrade({
-      modules,
-      dependencies,
-      package: packageId,
-      ticket
-    });
+  upgrade(...args) {
+    return this.tx.upgrade(...args);
   }
-  makeMoveVec({
-    elements,
-    type
-  }) {
-    return this.tx.makeMoveVec({ elements, type });
+  makeMoveVec(...args) {
+    return this.tx.makeMoveVec(...args);
   }
   /* Override methods of TransactionBlock */
   transferObjects(objects, address) {
@@ -449,7 +407,9 @@ var SuiTx = class {
     }
     const coins = this.tx.splitCoins(
       this.tx.gas,
-      convertArgs(this.tx, amounts)
+      amounts.map(
+        (amount) => typeof amount === "number" || typeof amount === "bigint" ? amount : convertArgs(this.tx, [amount])[0]
+      )
     );
     const recipientObjects = recipients.map(
       (recipient) => convertAddressArg(this.tx, recipient)
@@ -468,10 +428,9 @@ var SuiTx = class {
     if (coins.length > 1) {
       this.tx.mergeCoins(mergedCoin, coinObjects.slice(1));
     }
-    const [sendCoin] = this.tx.splitCoins(
-      mergedCoin,
-      convertArgs(this.tx, [amount])
-    );
+    const [sendCoin] = this.tx.splitCoins(mergedCoin, [
+      typeof amount === "number" || typeof amount === "bigint" ? amount : convertArgs(this.tx, [amount])[0]
+    ]);
     return [sendCoin, mergedCoin];
   }
   splitSUIFromGas(amounts) {
@@ -485,7 +444,7 @@ var SuiTx = class {
     }
     const splitedCoins = this.tx.splitCoins(
       mergedCoin,
-      convertArgs(this.tx, amounts)
+      convertAmounts(this.tx, amounts)
     );
     return { splitedCoins, mergedCoin };
   }
@@ -515,14 +474,14 @@ var SuiTx = class {
   stakeSui(amount, validatorAddr) {
     const [stakeCoin] = this.tx.splitCoins(
       this.tx.gas,
-      convertArgs(this.tx, [amount])
+      convertAmounts(this.tx, [amount])
     );
     return this.tx.moveCall({
       target: "0x3::sui_system::request_add_stake",
       arguments: convertArgs(this.tx, [
-        SUI_SYSTEM_STATE_OBJECT_ID,
+        this.tx.object(SUI_SYSTEM_STATE_OBJECT_ID),
         stakeCoin,
-        this.tx.pure.address(validatorAddr.toString())
+        convertAddressArg(this.tx, validatorAddr)
       ])
     });
   }