@msafe/sui3-sdk 0.0.82 → 0.0.84

package/src/core/MSafeAccount.ts

@@ -15,7 +15,7 @@ import {
   buildRejectTxb,
   isSameAddress,
 } from '@msafe/sui3-utils';
-import { SuiObjectData, SuiObjectResponse, SuiClient } from '@mysten/sui.js/client';
+import { SuiObjectData, SuiObjectResponse } from '@mysten/sui.js/client';
 import { SerializedSignature } from '@mysten/sui.js/cryptography';
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { fromHEX, normalizeStructTag, toHEX } from '@mysten/sui.js/utils';
@@ -131,25 +131,33 @@ export class MSafeAccount {
     return this.backend.getNextSequenceNumber(this.address);
   }
 
-  async simulateIntention(request: Omit<IProposeIntentionRequest, 'msafeAddress' | 'signature'>) {
-    const appHelper = appHelpers.getAppHelper(request.application);
-    if (!appHelper) {
-      throw new Error(`Can't find app helper for application ${request.application}`);
+  async simulateIntention(
+    request: Omit<IProposeIntentionRequest, 'msafeAddress' | 'signature'> & {
+      txb?: TransactionBlock;
+    },
+  ) {
+    let txb: TransactionBlock;
+    if (request.txb) {
+      txb = request.txb;
+    } else {
+      const appHelper = appHelpers.getAppHelper(request.application);
+      if (!appHelper) {
+        throw new Error(`Can't find app helper for application ${request.application}`);
+      }
+      txb = await appHelper.build({
+        network: this.globals.config.network,
+        intentionData: request.intention,
+        txType: request.txType,
+        txSubType: request.txSubType,
+        clientUrl: this.globals.config.suiClient.url,
+        account: {
+          address: this.address,
+          publicKey: fromHEX(this.address),
+          chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
+          features: [],
+        },
+      });
     }
-    // const config = getMSafeConfig(env, options);
-    const txb = await appHelper.build({
-      network: this.globals.config.network,
-      intentionData: request.intention,
-      txType: request.txType,
-      txSubType: request.txSubType,
-      clientUrl: this.globals.config.suiClient.url,
-      account: {
-        address: this.address,
-        publicKey: fromHEX(this.address),
-        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
-        features: [],
-      },
-    });
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -172,26 +180,32 @@ export class MSafeAccount {
   }
 
   async proposeIntentionAndBuildVote(
-    input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress' | 'payload' | 'digest'>,
+    input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress' | 'payload' | 'digest'> & {
+      txb?: TransactionBlock;
+    },
   ): Promise<void> {
-    const appHelper = appHelpers.getAppHelper(input.application);
-    if (!appHelper) {
-      throw new Error(`Can't find app helper for application ${input.application}`);
+    let txb: TransactionBlock;
+    if (input.txb) {
+      txb = input.txb;
+    } else {
+      const appHelper = appHelpers.getAppHelper(input.application);
+      if (!appHelper) {
+        throw new Error(`Can't find app helper for application ${input.application}`);
+      }
+      txb = await appHelper.build({
+        network: this.globals.config.network,
+        intentionData: input.intention,
+        txType: input.txType,
+        txSubType: input.txSubType,
+        clientUrl: this.globals.config.suiClient.url,
+        account: {
+          address: this.address,
+          publicKey: fromHEX(this.address),
+          chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
+          features: [],
+        },
+      });
     }
-
-    const txb = await appHelper.build({
-      network: this.globals.config.network,
-      intentionData: input.intention,
-      txType: input.txType,
-      txSubType: input.txSubType,
-      clientUrl: this.globals.config.suiClient.url,
-      account: {
-        address: this.address,
-        publicKey: fromHEX(this.address),
-        chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
-        features: [],
-      },
-    });
     txb.setGasPrice(input.gasPrice);
     txb.setGasBudget(input.gasBudget);
     txb.setSender(this.address);