@msafe/sui3-sdk 1.0.19 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msafe/sui3-sdk",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "SDK for MSafe SUI V3",
   "type": "module",
   "module": "./dist/index.js",

package/src/core/MSafeAccount.ts

@@ -27,7 +27,7 @@ import { CoinHelper } from '@/utils';
 import { HexToUint8Array } from '@/utils/buffer';
 import { prepareGasFunding } from '@/utils/gasFunding';
 import { BatchObjectOptions, getAllOwnedObjects, type OwnedObjectData } from '@/utils/iter/object';
-import { toSuiTransaction } from '@/utils/transaction';
+import { getIntentionContent, toSuiTransaction, transactionFromContent } from '@/utils/transaction';
 
 export class MSafeAccount {
   public multiSig: MultiSigAccount;
@@ -140,30 +140,7 @@ export class MSafeAccount {
       txb?: Transaction;
     },
   ) {
-    let txb: Transaction;
-    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 = toSuiTransaction(
-        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 txb = await this.buildTxFromIntention(request);
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -190,30 +167,7 @@ export class MSafeAccount {
       txb?: Transaction;
     },
   ): Promise<void> {
-    let txb: Transaction;
-    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 = toSuiTransaction(
-        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 this.buildTxFromIntention(input);
     txb.setGasPrice(input.gasPrice);
     txb.setSender(this.address);
     await prepareGasFunding({
@@ -340,15 +294,9 @@ export class MSafeAccount {
       throw new Error('Already rejected');
     }
 
+    // API independently rebuilds via buildRejectTxb() + build() and compares digest.
+    // Do not set gas / prepareGasFunding here — that changes payment and breaks the check.
     const rejectTxb = toSuiTransaction(buildRejectTxb(this.address));
-    rejectTxb.setGasPrice(input.gasPrice);
-    await prepareGasFunding({
-      tx: rejectTxb,
-      suiClient: this.suiClient,
-      owner: this.address,
-      gasPrice: input.gasPrice,
-      gasBudget: input.gasBudget,
-    });
     const digest = await rejectTxb.getDigest({ client: this.suiClient });
     const payload = await rejectTxb.build({ client: this.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
@@ -362,25 +310,12 @@ export class MSafeAccount {
 
   async simulateBuildTransaction(): Promise<SimulationResult> {
     const intention = await this.backend.getNextIntention({ msafeAddress: this.address });
-    const appHelper = appHelpers.getAppHelper(intention.application);
-    if (!appHelper) {
-      throw new Error(`Can't find app helper for application ${intention.application}`);
-    }
-    const txb = toSuiTransaction(
-      await appHelper.build({
-        network: this.globals.config.network,
-        intentionData: intention.intention,
-        txType: intention.txType as TransactionType,
-        txSubType: intention.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 this.buildTxFromIntention({
+      application: intention.application,
+      intention: intention.intention,
+      txType: intention.txType as TransactionType,
+      txSubType: intention.txSubType,
+    });
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -433,6 +368,56 @@ export class MSafeAccount {
     });
   }
 
+  /**
+   * Resolve a Transaction from propose/simulate input.
+   * 1. Caller-supplied `txb` (generic store path — do not rebuild).
+   * 2. Registered app helper `build`.
+   * 3. Unregistered app: restore from `intention.content` (JSON or hex).
+   */
+  private async buildTxFromIntention(input: {
+    application: string;
+    txType: TransactionType;
+    txSubType: string;
+    intention: unknown;
+    txb?: Transaction;
+  }): Promise<Transaction> {
+    if (input.txb) {
+      return input.txb;
+    }
+
+    let appHelper: ReturnType<typeof appHelpers.getAppHelper> | undefined;
+    try {
+      appHelper = appHelpers.getAppHelper(input.application);
+    } catch {
+      appHelper = undefined;
+    }
+
+    if (appHelper) {
+      return toSuiTransaction(
+        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 content = getIntentionContent(input.intention);
+    if (content != null) {
+      return transactionFromContent(content);
+    }
+
+    throw new Error(`Can't find app helper for application ${input.application}`);
+  }
+
   private calculateWeightFromVotes(votes: { userAddress: string }[]) {
     return this.calculateWeight(votes.map((vote) => vote.userAddress));
   }

package/src/utils/transaction.ts

@@ -1,4 +1,5 @@
 import { Transaction, isTransaction } from '@mysten/sui/transactions';
+import { fromHex } from '@mysten/sui/utils';
 
 /**
  * Normalize a transaction value to {@link Transaction}.
@@ -23,3 +24,34 @@ export function toSuiTransaction(txb: Transaction | unknown): Transaction {
 
   throw new Error('Unsupported transaction value for toSuiTransaction');
 }
+
+function isHex(str: string): boolean {
+  return /^[0-9a-fA-F]+$/.test(str);
+}
+
+export function getIntentionContent(intention: unknown): unknown {
+  if (intention && typeof intention === 'object' && 'content' in intention) {
+    return (intention as { content: unknown }).content;
+  }
+  return undefined;
+}
+
+/**
+ * Restore a Transaction from plain-tx `intention.content`.
+ * Accepts V2 JSON (`tx.toJSON()`), hex BCS bytes, or a JSON object.
+ */
+export function transactionFromContent(content: unknown): Transaction {
+  if (content instanceof Uint8Array) {
+    return Transaction.from(content);
+  }
+  if (typeof content === 'string') {
+    if (isHex(content)) {
+      return Transaction.from(fromHex(content));
+    }
+    return Transaction.from(content);
+  }
+  if (content && typeof content === 'object') {
+    return Transaction.from(JSON.stringify(content));
+  }
+  throw new Error('Invalid transaction content');
+}