@msafe/sui3-sdk 1.0.20 → 1.0.22

package/dist/index.cjs

@@ -61,20 +61,25 @@ __export(src_exports, {
   TESTNET_RPC_URL: () => TESTNET_RPC_URL,
   Uint8ArrayToHex: () => Uint8ArrayToHex,
   addPrefix: () => addPrefix,
+  collectPayloadObjectIds: () => collectPayloadObjectIds,
+  collectQueueExcludeObjectIds: () => collectQueueExcludeObjectIds,
   computeGasBudget: () => computeGasBudget,
   createCoinReservationRef: () => createCoinReservationRef,
   estimateGasBudget: () => estimateGasBudget,
   getAllCoins: () => getAllCoins,
+  getIntentionContent: () => getIntentionContent,
   getMSafeConfig: () => getMSafeConfig,
   getPublicKeyFromChain: () => getPublicKeyFromChain,
   httpUrlToGrpcBaseUrl: () => httpUrlToGrpcBaseUrl,
   isCoinReservationDigest: () => isCoinReservationDigest,
   msafeChainToSuiNetwork: () => msafeChainToSuiNetwork,
+  parkedPayloadHex: () => parkedPayloadHex,
   preferClassicGasPayment: () => preferClassicGasPayment,
   prepareGasFunding: () => prepareGasFunding,
   selectGasFunding: () => selectGasFunding,
   stringToBuffer: () => stringToBuffer,
-  toSuiTransaction: () => toSuiTransaction
+  toSuiTransaction: () => toSuiTransaction,
+  transactionFromContent: () => transactionFromContent
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -198,7 +203,7 @@ var InvitationSDK = class {
 var import_sui_app_store = require("@msafe/sui-app-store");
 var import_sui3_utils4 = require("@msafe/sui3-utils");
 var import_transactions4 = require("@mysten/sui/transactions");
-var import_utils5 = require("@mysten/sui/utils");
+var import_utils6 = require("@mysten/sui/utils");
 var import_wallet_standard = require("@mysten/wallet-standard");
 
 // src/simulate/simulator.ts
@@ -501,18 +506,66 @@ function computeGasBudget(gasUsed, gasPrice) {
   return BigInt(computationCost) + BigInt(storageCost) + safeOverhead;
 }
 function collectUsedObjectIds(tx) {
-  return tx.getData().inputs.reduce((used, input) => {
+  const used = tx.getData().inputs.reduce((acc, input) => {
     const immOrOwned = input.Object?.ImmOrOwnedObject?.objectId;
     if (immOrOwned) {
-      used.add((0, import_utils4.normalizeSuiObjectId)(immOrOwned));
-      return used;
+      acc.add((0, import_utils4.normalizeSuiObjectId)(immOrOwned));
+      return acc;
     }
     const unresolved = input.UnresolvedObject?.objectId;
     if (unresolved) {
-      used.add((0, import_utils4.normalizeSuiObjectId)(unresolved));
+      acc.add((0, import_utils4.normalizeSuiObjectId)(unresolved));
     }
-    return used;
+    return acc;
   }, /* @__PURE__ */ new Set());
+  (tx.getData().gasData.payment ?? []).forEach((payment) => {
+    if (payment.objectId) {
+      used.add((0, import_utils4.normalizeSuiObjectId)(payment.objectId));
+    }
+  });
+  return used;
+}
+function addExcludeObjectIds(used, excludeObjectIds) {
+  Array.from(excludeObjectIds ?? [], (id) => used.add((0, import_utils4.normalizeSuiObjectId)(id)));
+  return used;
+}
+function payloadToTransaction(payload) {
+  if (typeof payload !== "string") {
+    return import_transactions.Transaction.from(payload);
+  }
+  if (/^[0-9a-fA-F]+$/.test(payload) && payload.length % 2 === 0) {
+    return import_transactions.Transaction.from((0, import_utils4.fromHex)(payload));
+  }
+  return import_transactions.Transaction.from(payload);
+}
+function collectPayloadObjectIds(payload) {
+  return [...collectUsedObjectIds(payloadToTransaction(payload))];
+}
+function parkedPayloadHex(intention) {
+  if (!intention || typeof intention !== "object") {
+    return void 0;
+  }
+  const { content, digest } = intention;
+  if (typeof content !== "string" || typeof digest !== "string" || !digest) {
+    return void 0;
+  }
+  if (!/^[0-9a-fA-F]+$/.test(content) || content.length < 64) {
+    return void 0;
+  }
+  return content;
+}
+function collectQueueExcludeObjectIds(input) {
+  const ids = /* @__PURE__ */ new Set();
+  if (input.pendingPayload) {
+    collectPayloadObjectIds(input.pendingPayload).forEach((id) => ids.add(id));
+  }
+  (input.parkedPayloads ?? []).forEach((payload) => {
+    if (!payload) {
+      return;
+    }
+    collectPayloadObjectIds(payload).forEach((id) => ids.add(id));
+  });
+  return [...ids];
 }
 function txConsumesOwnedSuiCoins(tx) {
   return tx.getData().commands.some((cmd) => {
@@ -530,8 +583,8 @@ function txConsumesOwnedSuiCoins(tx) {
     }
   });
 }
-async function loadSuiGasFunding(suiClient, owner, tx) {
-  const usedObjectIds = collectUsedObjectIds(tx);
+async function loadSuiGasFunding(suiClient, owner, tx, excludeObjectIds) {
+  const usedObjectIds = addExcludeObjectIds(collectUsedObjectIds(tx), excludeObjectIds);
   const [coins, balanceRes] = await Promise.all([
     getAllCoins({ suiClient, owner, coinType: SUI_COIN }),
     suiClient.getBalance({ owner, coinType: SUI_COIN })
@@ -582,7 +635,7 @@ async function selectGasFunding(input) {
   const { tx, suiClient, owner, gasBudget } = input;
   const { payment } = tx.getData().gasData;
   if (payment != null && payment.length > 0) {
-    const funding2 = await loadSuiGasFunding(suiClient, owner, tx);
+    const funding2 = await loadSuiGasFunding(suiClient, owner, tx, input.excludeObjectIds);
     return {
       mode: "classic",
       gasBudget,
@@ -590,7 +643,7 @@ async function selectGasFunding(input) {
       addressBalance: funding2.addressBalance
     };
   }
-  const funding = await loadSuiGasFunding(suiClient, owner, tx);
+  const funding = await loadSuiGasFunding(suiClient, owner, tx, input.excludeObjectIds);
   const { paymentCoins, coinBalance, addressBalance, total } = funding;
   if (total < gasBudget) {
     throw new InsufficientGasFundsError(gasBudget, coinBalance, addressBalance);
@@ -636,8 +689,13 @@ function isPositiveBudget(budget) {
 }
 async function estimateGasBudget(input) {
   const { tx, suiClient, owner, gasPrice } = input;
-  const funding = await loadSuiGasFunding(suiClient, owner, tx);
-  if (funding.total <= 0n) {
+  const funding = input.preferAddressBalance ? {
+    ...await loadSuiGasFunding(suiClient, owner, tx, input.excludeObjectIds),
+    paymentCoins: [],
+    coinBalance: 0n
+  } : await loadSuiGasFunding(suiClient, owner, tx, input.excludeObjectIds);
+  const fundingTotal = input.preferAddressBalance ? funding.addressBalance : funding.total;
+  if (fundingTotal <= 0n) {
     throw new InsufficientGasFundsError(0n, funding.coinBalance, funding.addressBalance);
   }
   const { budget, payment } = tx.getData().gasData;
@@ -670,7 +728,7 @@ async function estimateGasBudget(input) {
   return computeGasBudget(effects.gasUsed, gasPrice);
 }
 async function prepareGasFunding(input) {
-  const { tx, suiClient, owner, gasPrice } = input;
+  const { tx, suiClient, owner, gasPrice, excludeObjectIds } = input;
   const { payment, budget: existingBudget } = tx.getData().gasData;
   const bakedAddressBalanceGas = payment != null && payment.length === 0;
   let { gasBudget } = input;
@@ -680,7 +738,14 @@ async function prepareGasFunding(input) {
   const existingPositive = isPositiveBudget(existingBudget) ? BigInt(existingBudget) : null;
   if (gasBudget == null) {
     if (bakedAddressBalanceGas || existingPositive == null) {
-      gasBudget = await estimateGasBudget({ tx, suiClient, owner, gasPrice });
+      gasBudget = await estimateGasBudget({
+        tx,
+        suiClient,
+        owner,
+        gasPrice,
+        excludeObjectIds,
+        preferAddressBalance: input.preferAddressBalance
+      });
     } else {
       gasBudget = existingPositive;
     }
@@ -689,7 +754,20 @@ async function prepareGasFunding(input) {
   if (bakedAddressBalanceGas) {
     tx.setExpiration(null);
   }
-  return selectGasFunding({ tx, suiClient, owner, gasBudget });
+  if (input.preferAddressBalance) {
+    const funding = await loadSuiGasFunding(suiClient, owner, tx, excludeObjectIds);
+    if (funding.addressBalance < gasBudget) {
+      throw new InsufficientGasFundsError(gasBudget, funding.coinBalance, funding.addressBalance);
+    }
+    tx.setGasPayment([]);
+    return {
+      mode: "addressBalance",
+      gasBudget,
+      coinBalance: funding.coinBalance,
+      addressBalance: funding.addressBalance
+    };
+  }
+  return selectGasFunding({ tx, suiClient, owner, gasBudget, excludeObjectIds });
 }
 async function preferClassicGasPayment(input) {
   const { tx, suiClient, owner } = input;
@@ -732,7 +810,9 @@ var Simulator = class {
         tx,
         suiClient,
         owner: input.sender,
-        gasPrice
+        gasPrice,
+        preferAddressBalance: input.preferAddressBalance,
+        excludeObjectIds: input.excludeObjectIds
       });
     } catch (e) {
       const message = e instanceof Error ? e.message : String(e);
@@ -753,9 +833,17 @@ var Simulator = class {
         simulationError: message
       };
     }
+    return this.inspectBuilt(built, gasPrice);
+  }
+  /** Dry-run a frozen payload without re-selecting gas. */
+  async simulateBuilt(built) {
+    const gasPrice = await this.getGasPrice();
+    return this.inspectBuilt(built, gasPrice);
+  }
+  async inspectBuilt(built, gasPrice) {
     let inspectResult;
     try {
-      inspectResult = await suiClient.simulateTransaction({
+      inspectResult = await this.globals.suiClient.simulateTransaction({
         transaction: built,
         include: {
           effects: true,
@@ -866,6 +954,7 @@ var SignatureVerifier = class _SignatureVerifier {
 
 // src/utils/transaction.ts
 var import_transactions3 = require("@mysten/sui/transactions");
+var import_utils5 = require("@mysten/sui/utils");
 function toSuiTransaction(txb) {
   if ((0, import_transactions3.isTransaction)(txb)) {
     return txb;
@@ -879,6 +968,30 @@ function toSuiTransaction(txb) {
   }
   throw new Error("Unsupported transaction value for toSuiTransaction");
 }
+function isHex(str) {
+  return /^[0-9a-fA-F]+$/.test(str);
+}
+function getIntentionContent(intention) {
+  if (intention && typeof intention === "object" && "content" in intention) {
+    return intention.content;
+  }
+  return void 0;
+}
+function transactionFromContent(content) {
+  if (content instanceof Uint8Array) {
+    return import_transactions3.Transaction.from(content);
+  }
+  if (typeof content === "string") {
+    if (isHex(content)) {
+      return import_transactions3.Transaction.from((0, import_utils5.fromHex)(content));
+    }
+    return import_transactions3.Transaction.from(content);
+  }
+  if (content && typeof content === "object") {
+    return import_transactions3.Transaction.from(JSON.stringify(content));
+  }
+  throw new Error("Invalid transaction content");
+}
 
 // src/utils/iter/iterator.ts
 var REQUEST_PAGE_SIZE = 25;
@@ -1045,7 +1158,7 @@ var MSafeAccount = class _MSafeAccount {
       balances.map(async (balance) => {
         const meta = await this.coinHelper.getCoinMeta(balance.coinType);
         return {
-          type: (0, import_utils5.normalizeStructTag)(balance.coinType),
+          type: (0, import_utils6.normalizeStructTag)(balance.coinType),
           balance: BigInt(balance.addressBalance),
           metadata: meta
         };
@@ -1101,32 +1214,14 @@ var MSafeAccount = class _MSafeAccount {
     return this.backend.getNextSequenceNumber(this.address);
   }
   async simulateIntention(request) {
-    let txb;
-    if (request.txb) {
-      txb = request.txb;
-    } else {
-      const appHelper = import_sui_app_store.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: (0, import_utils5.fromHex)(this.address),
-            chains: [import_wallet_standard.SUI_MAINNET_CHAIN, import_wallet_standard.SUI_TESTNET_CHAIN],
-            features: []
-          }
-        })
-      );
-    }
+    const txb = await this.buildTxFromIntention(request);
     txb.setSender(this.address);
-    return this.simulator.simulate({ txb, sender: this.address });
+    return this.simulator.simulate({
+      txb,
+      sender: this.address,
+      preferAddressBalance: request.preferAddressBalance,
+      excludeObjectIds: request.excludeObjectIds
+    });
   }
   async proposeIntention(input) {
     const message = import_sui3_utils4.SigningMessageHelper.proposeIntentionMessage({
@@ -1144,30 +1239,7 @@ var MSafeAccount = class _MSafeAccount {
     });
   }
   async proposeIntentionAndBuildVote(input) {
-    let txb;
-    if (input.txb) {
-      txb = input.txb;
-    } else {
-      const appHelper = import_sui_app_store.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: (0, import_utils5.fromHex)(this.address),
-            chains: [import_wallet_standard.SUI_MAINNET_CHAIN, import_wallet_standard.SUI_TESTNET_CHAIN],
-            features: []
-          }
-        })
-      );
-    }
+    const txb = await this.buildTxFromIntention(input);
     txb.setGasPrice(input.gasPrice);
     txb.setSender(this.address);
     await prepareGasFunding({
@@ -1175,14 +1247,20 @@ var MSafeAccount = class _MSafeAccount {
       suiClient: this.globals.suiClient,
       owner: this.address,
       gasPrice: input.gasPrice,
-      gasBudget: input.gasBudget
+      gasBudget: input.gasBudget,
+      preferAddressBalance: input.preferAddressBalance,
+      excludeObjectIds: input.excludeObjectIds
     });
     const payload = await txb.build({ client: this.globals.suiClient });
     const digest = await txb.getDigest({ client: this.globals.suiClient });
     const signature = await this.wallet.signTransactionBlock({ transactionBlock: payload });
+    const apiInput = { ...input };
+    delete apiInput.txb;
+    delete apiInput.preferAddressBalance;
+    delete apiInput.excludeObjectIds;
     return this.backend.proposeIntentionAndBuildVote({
-      ...input,
-      payload: (0, import_utils5.toHex)(payload),
+      ...apiInput,
+      payload: (0, import_utils6.toHex)(payload),
       digest,
       msafeAddress: this.address,
       signature: signature.signature
@@ -1289,25 +1367,16 @@ var MSafeAccount = class _MSafeAccount {
   }
   async simulateBuildTransaction() {
     const intention = await this.backend.getNextIntention({ msafeAddress: this.address });
-    const appHelper = import_sui_app_store.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,
-        txSubType: intention.txSubType,
-        clientUrl: this.globals.config.suiClient.url,
-        account: {
-          address: this.address,
-          publicKey: (0, import_utils5.fromHex)(this.address),
-          chains: [import_wallet_standard.SUI_MAINNET_CHAIN, import_wallet_standard.SUI_TESTNET_CHAIN],
-          features: []
-        }
-      })
-    );
+    const parked = parkedPayloadHex(intention.intention);
+    if (parked) {
+      return this.simulator.simulateBuilt((0, import_utils6.fromHex)(parked));
+    }
+    const txb = await this.buildTxFromIntention({
+      application: intention.application,
+      intention: intention.intention,
+      txType: intention.txType,
+      txSubType: intention.txSubType
+    });
     txb.setSender(this.address);
     return this.simulator.simulate({ txb, sender: this.address });
   }
@@ -1352,6 +1421,45 @@ var MSafeAccount = class _MSafeAccount {
       msafeAddress: this.address
     });
   }
+  /**
+   * 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).
+   */
+  async buildTxFromIntention(input) {
+    if (input.txb) {
+      return input.txb;
+    }
+    let appHelper;
+    try {
+      appHelper = import_sui_app_store.appHelpers.getAppHelper(input.application);
+    } catch {
+      appHelper = void 0;
+    }
+    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: (0, import_utils6.fromHex)(this.address),
+            chains: [import_wallet_standard.SUI_MAINNET_CHAIN, import_wallet_standard.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}`);
+  }
   calculateWeightFromVotes(votes) {
     return this.calculateWeight(votes.map((vote) => vote.userAddress));
   }
@@ -1384,7 +1492,7 @@ var MSafeAccount = class _MSafeAccount {
 
 // src/core/PublicKeyHelper.ts
 var import_sui3_utils5 = require("@msafe/sui3-utils");
-var import_utils7 = require("@mysten/sui/utils");
+var import_utils8 = require("@mysten/sui/utils");
 var PublicKeyHelper = class {
   constructor(globals) {
     this.globals = globals;
@@ -1433,7 +1541,7 @@ var PublicKeyHelper = class {
     if (!(0, import_sui3_utils5.isSameAddress)(address, publicKey.toSuiAddress())) {
       throw new Error("Invalid public key");
     }
-    this.knownPublicKeys.set((0, import_utils7.normalizeSuiAddress)(address), publicKey);
+    this.knownPublicKeys.set((0, import_utils8.normalizeSuiAddress)(address), publicKey);
   }
   async _getPublicKey(address) {
     const pkBackend = await this.getPublicKeyFromBackend(address);