@msafe/sui3-sdk 0.0.17 → 0.0.18

package/dist/index.js

@@ -100,13 +100,26 @@ import {
   SigningMessageHelper as SigningMessageHelper3,
   TransactionDefaultApplication,
   TransactionSubTypes,
-  TransactionType
+  TransactionType,
+  buildObjectTransferTxb,
+  buildRejectTxb
 } from "@msafe/sui3-utils";
-import { TransactionBlock as TransactionBlock4 } from "@mysten/sui.js/transactions";
+import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
 
-// src/transactions/coin-transfer.ts
-import { TransactionBlock } from "@mysten/sui.js/transactions";
+// src/utils/buffer.ts
+function stringToBuffer(s) {
+  return Buffer.from(s, "utf-8");
+}
+function Uint8ArrayToHex(b) {
+  return `0x${Array.prototype.map.call(b, (x) => `0${x.toString(16)}`.slice(-2)).join("")}`;
+}
+function HexToUint8Array(hex) {
+  return Uint8Array.from(Buffer.from(hex.startsWith("0x") ? hex.slice(2) : hex, "hex"));
+}
+
+// src/utils/crypto.ts
+import { verifyPersonalMessage, verifyTransactionBlock } from "@mysten/sui.js/verify";
 
 // src/utils/format.ts
 import { normalizeSuiAddress, normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
@@ -182,6 +195,45 @@ var Formatter = class {
   }
 };
 
+// src/utils/crypto.ts
+var SignatureVerifier = class _SignatureVerifier {
+  static async getPublicKeyFromSignature(input) {
+    if (input.messageType === "TransactionBlock") {
+      return verifyTransactionBlock(input.message, input.signature);
+    }
+    return verifyPersonalMessage(input.message, input.signature);
+  }
+  static async getPublicKeyFromPersonalSignature(input) {
+    const message = stringToBuffer(input.messageStr);
+    return this.getPublicKeyFromSignature({
+      message,
+      messageType: "Personal",
+      signature: input.signature
+    });
+  }
+  static async verifySignature(input) {
+    const publicKey = await _SignatureVerifier.getPublicKeyFromSignature(input);
+    return Formatter.isSuiAddressEqual(publicKey.toSuiAddress(), input.targetAddress);
+  }
+  static async verifyPersonalSignature(input) {
+    const message = stringToBuffer(input.messageStr);
+    return this.verifySignature({
+      message,
+      messageType: "Personal",
+      signature: input.signature,
+      targetAddress: input.targetAddress
+    });
+  }
+  static async verifyTransactionSignature(input) {
+    return this.verifySignature({
+      messageType: "TransactionBlock",
+      message: input.payload,
+      signature: input.signature,
+      targetAddress: input.targetAddress
+    });
+  }
+};
+
 // src/utils/sui.ts
 import { PublicKeySerde as PublicKeySerde2 } from "@msafe/sui3-utils";
 import { parseSerializedSignature } from "@mysten/sui.js/cryptography";
@@ -260,209 +312,6 @@ async function getAllCoins(input) {
   return res;
 }
 
-// src/transactions/coin-transfer.ts
-async function buildCoinTransferTxb(input) {
-  if (Formatter.isSuiStructEqual(input.intention.coinType, SUI_COIN)) {
-    return buildSuiCoinTransferTxb(input);
-  }
-  return buildOtherCoinTransferTxb(input);
-}
-function buildSuiCoinTransferTxb(input) {
-  const txb = new TransactionBlock();
-  const [coin] = txb.splitCoins(txb.gas, [txb.pure(input.intention.amount)]);
-  txb.transferObjects([coin], txb.pure(input.intention.recipient));
-  txb.setSender(input.sender);
-  return txb;
-}
-async function buildOtherCoinTransferTxb(input) {
-  const { suiClient, sender, intention } = input;
-  const objs = await getAllCoins({
-    suiClient,
-    owner: sender,
-    coinType: intention.coinType
-  });
-  if (objs.length === 0) {
-    throw new Error("No valid coin found to send");
-  }
-  const totalBal = objs.reduce((sum, coin2) => sum + BigInt(coin2.balance), 0n);
-  if (totalBal < BigInt(intention.amount)) {
-    throw new Error("Not enough balance");
-  }
-  const txb = new TransactionBlock();
-  const primary = txb.object(objs[0].coinObjectId);
-  if (objs.length > 1) {
-    txb.mergeCoins(
-      primary,
-      objs.slice(1).map((obj) => txb.object(obj.coinObjectId))
-    );
-  }
-  const [coin] = txb.splitCoins(primary, [txb.pure(intention.amount)]);
-  txb.transferObjects([coin], txb.pure(intention.recipient));
-  txb.setSender(input.sender);
-  return txb;
-}
-
-// src/transactions/object-transfer.ts
-import { TransactionBlock as TransactionBlock2 } from "@mysten/sui.js/transactions";
-async function buildObjectTransferTxb(input) {
-  await validateObjectTransfer(input);
-  const txb = new TransactionBlock2();
-  txb.transferObjects([txb.object(input.intention.objectId)], txb.pure(input.intention.receiver));
-  txb.setSender(input.sender);
-  return txb;
-}
-async function validateObjectTransfer(input) {
-  const { suiClient, sender, intention } = input;
-  const obj = await suiClient.getObject({
-    id: intention.objectId
-  });
-  if (obj.data === void 0) {
-    throw new Error("Object not found");
-  }
-  if (!obj.data?.type) {
-    throw new Error("Object type is null");
-  }
-  if (!Formatter.isSuiStructEqual(obj.data.type, intention.objectType)) {
-    throw new Error("Object type not expected");
-  }
-  if (Formatter.isCoinObjectType(obj.data.type)) {
-    throw new Error("Can not transfer coin object in Object Transfer transactions");
-  }
-  const addressOwner = getAddressOwner(obj);
-  if (!Formatter.isSuiAddressEqual(addressOwner, sender)) {
-    throw new Error("Object owner not match");
-  }
-}
-function getAddressOwner(object) {
-  const owner = object.data?.owner;
-  if (!owner) {
-    throw new Error("Object Owner not found");
-  }
-  if (typeof owner !== "object" || !("AddressOwner" in owner)) {
-    throw new Error("Invalid object owner");
-  }
-  return owner.AddressOwner;
-}
-
-// src/transactions/reject.ts
-import { TransactionBlock as TransactionBlock3 } from "@mysten/sui.js/transactions";
-
-// src/utils/buffer.ts
-function stringToBuffer(s) {
-  return Buffer.from(s, "utf-8");
-}
-function Uint8ArrayToHex(b) {
-  return `0x${Array.prototype.map.call(b, (x) => `0${x.toString(16)}`.slice(-2)).join("")}`;
-}
-function HexToUint8Array(hex) {
-  return Uint8Array.from(Buffer.from(hex.startsWith("0x") ? hex.slice(2) : hex, "hex"));
-}
-
-// src/transactions/reject.ts
-async function buildRejectTxb(input) {
-  const approveTxb = TransactionBlock3.from(HexToUint8Array(input.payloadToReject));
-  const gasPayment = approveTxb.blockData.gasConfig.payment;
-  if (!gasPayment) {
-    throw new Error("No gas payment found for approve payload");
-  }
-  const txb = new TransactionBlock3();
-  txb.setGasPayment(gasPayment);
-  txb.setSender(input.sender);
-  return txb;
-}
-
-// src/transactions/intention.ts
-var IntentionHelper = class {
-  static ser(intention) {
-    return JSON.stringify(intention);
-  }
-  static de(val) {
-    const intention = JSON.parse(val);
-    if (typeof intention !== "object" || !("txType" in intention)) {
-      throw new Error(`Failed to deserialize intention: ${val}`);
-    }
-    return JSON.parse(val);
-  }
-  // TODO: Add gas option here.
-  static buildTxb(input) {
-    switch (input.intention.txType) {
-      case "CoinTransfer":
-        return buildCoinTransferTxb({
-          suiClient: input.suiClient,
-          sender: input.sender,
-          intention: input.intention
-        });
-      case "ObjectTransfer":
-        return buildObjectTransferTxb({
-          suiClient: input.suiClient,
-          sender: input.sender,
-          intention: input.intention
-        });
-      default:
-        throw new Error(`Unknown tx type: ${input.intention}`);
-    }
-  }
-  static getTxType(intention) {
-    switch (intention.txType) {
-      case "CoinTransfer":
-        return {
-          txType: "CoinTransfer",
-          txSubType: "CoinTransfer"
-        };
-      case "ObjectTransfer":
-        return {
-          txType: "ObjectTransfer",
-          txSubType: "ObjectTransfer"
-        };
-      default:
-        throw new Error("Unknown intention type");
-    }
-  }
-  static buildRejectTransaction(input) {
-    return buildRejectTxb({ sender: input.msafeAddress, payloadToReject: input.payloadToReject });
-  }
-};
-
-// src/utils/crypto.ts
-import { verifyPersonalMessage, verifyTransactionBlock } from "@mysten/sui.js/verify";
-var SignatureVerifier = class _SignatureVerifier {
-  static async getPublicKeyFromSignature(input) {
-    if (input.messageType === "TransactionBlock") {
-      return verifyTransactionBlock(input.message, input.signature);
-    }
-    return verifyPersonalMessage(input.message, input.signature);
-  }
-  static async getPublicKeyFromPersonalSignature(input) {
-    const message = stringToBuffer(input.messageStr);
-    return this.getPublicKeyFromSignature({
-      message,
-      messageType: "Personal",
-      signature: input.signature
-    });
-  }
-  static async verifySignature(input) {
-    const publicKey = await _SignatureVerifier.getPublicKeyFromSignature(input);
-    return Formatter.isSuiAddressEqual(publicKey.toSuiAddress(), input.targetAddress);
-  }
-  static async verifyPersonalSignature(input) {
-    const message = stringToBuffer(input.messageStr);
-    return this.verifySignature({
-      message,
-      messageType: "Personal",
-      signature: input.signature,
-      targetAddress: input.targetAddress
-    });
-  }
-  static async verifyTransactionSignature(input) {
-    return this.verifySignature({
-      messageType: "TransactionBlock",
-      message: input.payload,
-      signature: input.signature,
-      targetAddress: input.targetAddress
-    });
-  }
-};
-
 // src/utils/iter/iterator.ts
 var REQUEST_PAGE_SIZE = 25;
 async function getAllFromIterator(it) {
@@ -696,6 +545,7 @@ var MSafeAccount = class _MSafeAccount {
     });
   }
   async proposeObjectTransferIntention(intention) {
+    await buildObjectTransferTxb(this.suiClient, intention, this.address);
     const sn = await this.nextSequenceNumber();
     return this.proposeIntention({
       application: TransactionDefaultApplication,
@@ -717,11 +567,7 @@ var MSafeAccount = class _MSafeAccount {
   // Shortcut for proposing a transaction to be a pending transaction, and add user vote to it.
   // Requires the multi-sig to be empty in pending transaction.
   async proposePendingTransaction(intention) {
-    const txb = await IntentionHelper.buildTxb({
-      suiClient: this.suiClient,
-      intention,
-      sender: this.address
-    });
+    const txb = new TransactionBlock();
     const payload = await txb.build({ client: this.suiClient });
     const digest = await txb.getDigest({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
@@ -739,10 +585,7 @@ var MSafeAccount = class _MSafeAccount {
       throw new Error("Already rejected");
     }
     const payloadToReject = pendingTx.payload;
-    const rejectTxb = await IntentionHelper.buildRejectTransaction({
-      msafeAddress: this.address,
-      payloadToReject
-    });
+    const rejectTxb = buildRejectTxb(this.address, payloadToReject);
     const digest = await rejectTxb.getDigest({ client: this.suiClient });
     const payload = await rejectTxb.build({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
@@ -758,8 +601,8 @@ var MSafeAccount = class _MSafeAccount {
   async skipNextFailedIntention() {
     return this.backend.skipNextFailedIntention({ msafeAddress: this.address });
   }
-  async simulateIntention(intention) {
-    const txb = new TransactionBlock4();
+  async simulateIntention() {
+    const txb = new TransactionBlock();
     txb.setSender(this.address);
     if (!txb.blockData.gasConfig.price) {
       const refGas = await this.suiClient.getReferenceGasPrice();
@@ -1331,7 +1174,6 @@ export {
   ENV_CONFIGS,
   Formatter,
   HexToUint8Array,
-  IntentionHelper,
   LOCAL_API_URL,
   LOCAL_SYNCING_URL,
   MAINNET_RPC_URL,