@msafe/sui3-sdk 0.0.15-pre-3e855d9.0 → 0.0.16

package/dist/index.js

@@ -96,10 +96,13 @@ var InvitationSDK = class {
 
 // src/core/MSafeAccount.ts
 import {
-  buildIntentionTransaction,
   MultiSigAccount as MultiSigAccount2,
-  SigningMessageHelper as SigningMessageHelper3
+  SigningMessageHelper as SigningMessageHelper3,
+  TransactionDefaultApplication,
+  TransactionSubTypes,
+  TransactionType
 } from "@msafe/sui3-utils";
+import { TransactionBlock as TransactionBlock4 } from "@mysten/sui.js/transactions";
 import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
 
 // src/transactions/coin-transfer.ts
@@ -630,28 +633,36 @@ var MSafeAccount = class _MSafeAccount {
     return getAllOwnedObjects(this.suiClient, this.address, filterCoinObjectOptions);
   }
   async pendingTransaction() {
-    const pendings = await this.backend.getPendingTransactions(this.address);
-    if (pendings.length > 2) {
-      throw new Error(`invalid backend getPendingTransactions resp, length should not > 2: ${pendings}`);
-    }
-    if (pendings.length === 0) {
+    const res = await this.backend.getPendingTransactions({ msafeAddress: this.address });
+    if (!res.pending) {
       return void 0;
     }
-    const pendingTx = pendings.find((tx) => !tx.isRejectTx);
-    const rejectPending = pendings.find((tx) => tx.isRejectTx);
+    const pendingTx = res.pending;
+    const rejectPending = res.reject;
     return {
-      ...pendingTx,
+      txType: TransactionType.Assets,
+      txSubType: TransactionSubTypes.assets.coin.send,
+      createdAt: pendingTx.createdAt,
+      creator: pendingTx.creator,
+      digest: pendingTx.digest,
+      intention: pendingTx.intention,
+      sequenceNumber: pendingTx.sequenceNumber,
+      payload: pendingTx.payload,
+      votes: pendingTx.votes,
+      msafeAddress: pendingTx.msafeAddress,
       rejectDigest: rejectPending?.digest ?? "",
       rejectPayload: rejectPending?.payload ?? "",
       rejectVotes: rejectPending?.votes ?? []
     };
   }
-  async historyTransaction(paginationOption) {
-    return this.backend.getHistoryTransactions(this.address, paginationOption);
+  async historyTransaction(pagination) {
+    return this.backend.getHistoryTransactions({
+      msafeAddress: this.address,
+      ...pagination
+    });
   }
-  async futureIntentions(paginationOption) {
-    const paginatedIntentions = await this.backend.getFutureIntentions(this.address, paginationOption);
-    return paginatedIntentions.data;
+  async futureIntentions(pagination) {
+    return this.backend.getFutureIntentions({ msafeAddress: this.address, ...pagination });
   }
   async currentSequenceNumber() {
     return this.backend.getCurrentSequenceNumber(this.address);
@@ -671,17 +682,35 @@ var MSafeAccount = class _MSafeAccount {
     await this.backend.proposeIntention({
       ...input,
       msafeAddress: this.address,
-      userAddress: await this.userAddress(),
       signature: signature.signature
     });
   }
+  async proposeCoinTransferIntention(intention) {
+    const sn = await this.nextSequenceNumber();
+    return this.proposeIntention({
+      application: TransactionDefaultApplication,
+      txType: TransactionType.Assets,
+      txSubType: TransactionSubTypes.assets.coin.send,
+      sequenceNumber: sn,
+      intention
+    });
+  }
+  async proposeObjectTransferIntention(intention) {
+    const sn = await this.nextSequenceNumber();
+    return this.proposeIntention({
+      application: TransactionDefaultApplication,
+      txType: TransactionType.Assets,
+      txSubType: TransactionSubTypes.assets.object.send,
+      sequenceNumber: sn,
+      intention
+    });
+  }
   async voteForTransaction(digest, payload) {
     const payloadBytes = HexToUint8Array(payload);
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payloadBytes });
     return this.backend.voteForTransaction({
       msafeAddress: this.address,
-      userAddress: await this.userAddress(),
-      txDigest: digest,
+      digest,
       signature: signature.signature
     });
   }
@@ -704,20 +733,12 @@ var MSafeAccount = class _MSafeAccount {
       signature: signature.signature
     });
   }
-  async rejectCurrentTx(pending) {
-    let payloadToReject;
-    if (pending) {
-      if (pending.isRejectTx) {
-        throw new Error("Pending not reject transaction");
-      }
-      payloadToReject = pending.payload;
-    } else {
-      const pendingTx = await this.pendingTransaction();
-      if (!pendingTx || pendingTx.rejectDigest !== "") {
-        throw new Error("Already rejected");
-      }
-      payloadToReject = pendingTx.payload;
+  async rejectCurrentTx() {
+    const pendingTx = await this.pendingTransaction();
+    if (!pendingTx || pendingTx.rejectDigest !== "") {
+      throw new Error("Already rejected");
     }
+    const payloadToReject = pendingTx.payload;
     const rejectTxb = await IntentionHelper.buildRejectTransaction({
       msafeAddress: this.address,
       payloadToReject
@@ -727,7 +748,6 @@ var MSafeAccount = class _MSafeAccount {
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
     return this.backend.rejectCurrentTx({
       msafeAddress: this.address,
-      userAddress: await this.userAddress(),
       digest,
       signature: signature.signature
     });
@@ -736,10 +756,11 @@ var MSafeAccount = class _MSafeAccount {
     return this.backend.buildNextIntentionAndAddToPending({ msafeAddress: this.address });
   }
   async skipNextFailedIntention() {
-    return this.backend.skipNextFailedIntention({ msafeAddress: this.address, userAddress: await this.userAddress() });
+    return this.backend.skipNextFailedIntention({ msafeAddress: this.address });
   }
   async simulateIntention(intention) {
-    const txb = await buildIntentionTransaction(this.suiClient, intention, this.address);
+    const txb = new TransactionBlock4();
+    txb.setSender(this.address);
     if (!txb.blockData.gasConfig.price) {
       const refGas = await this.suiClient.getReferenceGasPrice();
       txb.setGasPrice(refGas);
@@ -971,8 +992,9 @@ var BackendImpl = class _BackendImpl {
       throw new Error(`Invalid updateMSafeStatus return: ${res}`);
     }
   }
-  async getPendingTransactions(msafeAddress) {
-    const res = await axios.get(`${this.apiURL}/transaction/pending/${msafeAddress}`, {
+  async getPendingTransactions(input) {
+    const res = await axios.get(`${this.apiURL}/transaction/pending`, {
+      params: input,
       headers: this.headers()
     });
     if (res.status !== 200 && res.status !== 201) {
@@ -980,28 +1002,19 @@ var BackendImpl = class _BackendImpl {
     }
     return res.data;
   }
-  async getHistoryTransactions(msafeAddress, paginationOption) {
-    const res = await axios.get(
-      `${this.apiURL}/transaction/history?address=${msafeAddress}`,
-      {
-        params: {
-          page: paginationOption?.page,
-          limit: paginationOption?.limit
-        },
-        headers: this.headers()
-      }
-    );
+  async getHistoryTransactions(input) {
+    const res = await axios.get(`${this.apiURL}/transaction/history`, {
+      params: input,
+      headers: this.headers()
+    });
     if (res.status !== 200 && res.status !== 201) {
       throw new Error(`invalid getCurrentSequenceNumber return: ${res}`);
     }
     return res.data;
   }
-  async getFutureIntentions(msafeAddress, paginationOption) {
-    const res = await axios.get(`${this.apiURL}/transaction/intention/${msafeAddress}`, {
-      params: {
-        page: paginationOption?.page,
-        limit: paginationOption?.limit
-      },
+  async getFutureIntentions(input) {
+    const res = await axios.get(`${this.apiURL}/transaction/intention`, {
+      params: input,
       headers: this.headers()
     });
     if (res.status !== 200 && res.status !== 201) {
@@ -1009,8 +1022,11 @@ var BackendImpl = class _BackendImpl {
     }
     return res.data;
   }
-  async getCurrentSequenceNumber(msafeAddress) {
-    const res = await axios.get(`${this.apiURL}/transaction/sn/current/${msafeAddress}`, {
+  async getCurrentSequenceNumber(address) {
+    const res = await axios.get(`${this.apiURL}/transaction/sn/current`, {
+      params: {
+        msafeAddress: address
+      },
       headers: this.headers()
     });
     if (res.status !== 200 && res.status !== 201) {
@@ -1018,8 +1034,11 @@ var BackendImpl = class _BackendImpl {
     }
     return res.data;
   }
-  async getNextSequenceNumber(msafeAddress) {
-    const res = await axios.get(`${this.apiURL}/transaction/sn/next/${msafeAddress}`, {
+  async getNextSequenceNumber(address) {
+    const res = await axios.get(`${this.apiURL}/transaction/sn/next`, {
+      params: {
+        msafeAddress: address
+      },
       headers: this.headers()
     });
     if (res.status !== 200 && res.status !== 201) {
@@ -1047,57 +1066,29 @@ var BackendImpl = class _BackendImpl {
     return void 0;
   }
   async rejectCurrentTx(input) {
-    const res = await axios.post(
-      `${this.apiURL}/transaction/pending/reject`,
-      {
-        address: input.msafeAddress,
-        digest: input.digest,
-        signature: input.signature
-      },
-      {
-        headers: this.headers()
-      }
-    );
+    const res = await axios.post(`${this.apiURL}/transaction/pending/reject`, input, {
+      headers: this.headers()
+    });
     if (res.status !== 200 && res.status !== 201) {
       throw new Error(`invalid voteForTransaction return: ${res}`);
     }
   }
   async voteForTransaction(input) {
-    const res = await axios.post(
-      `${this.apiURL}/transaction/pending/vote`,
-      {
-        address: input.msafeAddress,
-        digest: input.txDigest,
-        signature: input.signature
-      },
-      {
-        headers: this.headers()
-      }
-    );
+    const res = await axios.post(`${this.apiURL}/transaction/pending/vote`, input, {
+      headers: this.headers()
+    });
     if (res.status !== 200 && res.status !== 201) {
       throw new Error(`invalid voteForTransaction return: ${res}`);
     }
   }
   async buildNextIntentionAndAddToPending(input) {
-    const res = await axios.post(
-      `${this.apiURL}/transaction/pending/build`,
-      {
-        address: input.msafeAddress
-      },
-      { headers: this.headers() }
-    );
+    const res = await axios.post(`${this.apiURL}/transaction/pending/build`, input, { headers: this.headers() });
     if (res.status !== 200 && res.status !== 201) {
       throw new Error(`invalid buildNextIntentionAndAddToPending return: ${res}`);
     }
   }
   async skipNextFailedIntention(input) {
-    const res = await axios.post(
-      `${this.apiURL}/transaction/pending/skip`,
-      {
-        msafeAddress: input.msafeAddress
-      },
-      { headers: this.headers() }
-    );
+    const res = await axios.post(`${this.apiURL}/transaction/pending/skip`, input, { headers: this.headers() });
     if (res.status !== 200 && res.status !== 201) {
       throw new Error(`invalid skipNextFailedIntention return: ${res}`);
     }