@msafe/sui3-sdk 0.0.37 → 0.0.39

package/src/backend/BackendImpl.ts

@@ -33,6 +33,8 @@ import {
   UserMSafeStatus,
   IGetAddressBookModeResult,
   ISetAddressBookModeReq,
+  IRejectTransactionRequest,
+  IProposeIntentionAndBuildAndVoteRequest,
 } from '@msafe/sui3-utils';
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
 import { PublicKey } from '@mysten/sui.js/src/cryptography';
@@ -202,10 +204,14 @@ export class BackendImpl implements IBackend {
     return undefined;
   }
 
-  async rejectCurrentTx(input: IVoteTransactionRequest) {
-    await this.post(`/transaction/pending/reject`, input, {
-      headers: this.headers(),
-    });
+  async rejectCurrentTx(input: IRejectTransactionRequest) {
+    await this.post(
+      `/transaction/pending/reject`,
+      { ...input, gasPrice: input.gasPrice.toString(), gasBudget: input.gasBudget.toString() },
+      {
+        headers: this.headers(),
+      },
+    );
   }
 
   async voteForTransaction(input: IVoteTransactionRequest) {
@@ -222,6 +228,14 @@ export class BackendImpl implements IBackend {
     );
   }
 
+  async proposeIntentionAndBuildVote(input: IProposeIntentionAndBuildAndVoteRequest): Promise<void> {
+    await this.post(
+      `/transaction/intention/build`,
+      { ...input, gasPrice: input.gasPrice.toString(), gasBudget: input.gasBudget.toString() },
+      { headers: this.headers() },
+    );
+  }
+
   async skipNextFailedIntention(input: ISkipIntentionRequest) {
     await this.post(`/transaction/pending/skip`, input, { headers: this.headers() });
   }

package/src/backend/interface.ts

@@ -25,6 +25,8 @@ import {
   TransactionIntentionItem,
   IGetAddressBookModeResult,
   ISetAddressBookModeReq,
+  IRejectTransactionRequest,
+  IProposeIntentionAndBuildAndVoteRequest,
 } from '@msafe/sui3-utils';
 import { PublicKey, SerializedSignature } from '@mysten/sui.js/cryptography';
 
@@ -59,10 +61,11 @@ export interface IBackend {
     digest: string;
     signature: SerializedSignature;
   }): Promise<void>;
-  rejectCurrentTx(input: IVoteTransactionRequest): Promise<void>;
+  rejectCurrentTx(input: IRejectTransactionRequest): Promise<void>;
   voteForTransaction(input: IVoteTransactionRequest): Promise<void>;
   buildNextIntentionAndAddToPending(input: IBuildTransactionRequest): Promise<void>;
   skipNextFailedIntention(input: ISkipIntentionRequest): Promise<void>;
+  proposeIntentionAndBuildVote(input: IProposeIntentionAndBuildAndVoteRequest): Promise<void>;
 
   getAddressBookEntries(pagination?: IPageOptions): Promise<IGetAddressBookResult>;
   updateAddressBook(input: { updates: UpdateAddressBookEntry[]; signature: SerializedSignature }): Promise<void>;

package/src/core/MSafeAccount.ts

@@ -3,6 +3,7 @@ import {
   CoinTransferIntention,
   IGasOption,
   IMSafeConfig,
+  IProposeIntentionAndBuildAndVoteRequest,
   IProposeIntentionRequest,
   MultiSigAccount,
   ObjectTransferIntention,
@@ -12,7 +13,6 @@ import {
   TransactionSubTypes,
   TransactionType,
   TxIntention,
-  buildObjectTransferTxb,
   buildRejectTxb,
   isSameAddress,
 } from '@msafe/sui3-utils';
@@ -168,6 +168,25 @@ export class MSafeAccount {
     });
   }
 
+  async proposeIntentionAndBuildVote(
+    input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress'>,
+  ): Promise<void> {
+    const message = SigningMessageHelper.proposeIntentionMessage({
+      msafeAddress: this.address,
+      intention: input.intention,
+      sn: input.sequenceNumber,
+    });
+    const signature = await this.wallet.signPersonalMessage({
+      messageStr: message,
+    });
+
+    return this.backend.proposeIntentionAndBuildVote({
+      ...input,
+      msafeAddress: this.address,
+      signature: signature.signature,
+    });
+  }
+
   async simulateCoinTransferIntention(intention: CoinTransferIntention) {
     const sn = await this.nextSequenceNumber();
     return this.simulateIntention({
@@ -190,8 +209,18 @@ export class MSafeAccount {
     });
   }
 
+  async simulateObjectTransferIntention(intention: ObjectTransferIntention) {
+    const sn = await this.nextSequenceNumber();
+    return this.simulateIntention({
+      application: TransactionDefaultApplication,
+      txType: TransactionType.Assets,
+      txSubType: TransactionSubTypes.assets.object.send,
+      sequenceNumber: sn,
+      intention,
+    });
+  }
+
   async proposeObjectTransferIntention(intention: ObjectTransferIntention) {
-    await buildObjectTransferTxb(this.suiClient, intention, this.address);
     const sn = await this.nextSequenceNumber();
     return this.proposeIntention({
       application: TransactionDefaultApplication,
@@ -202,6 +231,17 @@ export class MSafeAccount {
     });
   }
 
+  async simulatePlainPayloadIntention(intention: PlainPayloadIntention) {
+    const sn = await this.nextSequenceNumber();
+    return this.simulateIntention({
+      application: TransactionDefaultApplication,
+      txType: TransactionType.Other,
+      txSubType: TransactionSubTypes.others.plain,
+      sequenceNumber: sn,
+      intention,
+    });
+  }
+
   async proposePlainPayloadIntention(intention: PlainPayloadIntention) {
     const sn = await this.nextSequenceNumber();
 
@@ -248,7 +288,18 @@ export class MSafeAccount {
     });
   }
 
-  async rejectCurrentTx() {
+  async simulateRejectTx() {
+    const pendingTx = await this.pendingTransaction();
+    if (!pendingTx || pendingTx.rejectDigest !== '') {
+      throw new Error('Already rejected');
+    }
+
+    const payloadToReject = pendingTx.payload;
+    const txb = buildRejectTxb(this.address, payloadToReject);
+    return this.simulator.simulate({ txb, sender: this.address });
+  }
+
+  async rejectCurrentTx(input: IGasOption & { forceBuild: boolean }) {
     const pendingTx = await this.pendingTransaction();
     if (!pendingTx || pendingTx.rejectDigest !== '') {
       throw new Error('Already rejected');
@@ -263,6 +314,7 @@ export class MSafeAccount {
       msafeAddress: this.address,
       digest,
       signature: signature.signature,
+      ...input,
     });
   }