@msafe/sui3-sdk 1.0.21 → 1.0.22

package/dist/index.cjs

@@ -61,6 +61,8 @@ __export(src_exports, {
   TESTNET_RPC_URL: () => TESTNET_RPC_URL,
   Uint8ArrayToHex: () => Uint8ArrayToHex,
   addPrefix: () => addPrefix,
+  collectPayloadObjectIds: () => collectPayloadObjectIds,
+  collectQueueExcludeObjectIds: () => collectQueueExcludeObjectIds,
   computeGasBudget: () => computeGasBudget,
   createCoinReservationRef: () => createCoinReservationRef,
   estimateGasBudget: () => estimateGasBudget,
@@ -71,6 +73,7 @@ __export(src_exports, {
   httpUrlToGrpcBaseUrl: () => httpUrlToGrpcBaseUrl,
   isCoinReservationDigest: () => isCoinReservationDigest,
   msafeChainToSuiNetwork: () => msafeChainToSuiNetwork,
+  parkedPayloadHex: () => parkedPayloadHex,
   preferClassicGasPayment: () => preferClassicGasPayment,
   prepareGasFunding: () => prepareGasFunding,
   selectGasFunding: () => selectGasFunding,
@@ -503,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) => {
@@ -532,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 })
@@ -584,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,
@@ -592,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);
@@ -638,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;
@@ -672,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;
@@ -682,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;
     }
@@ -691,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;
@@ -734,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);
@@ -755,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,
@@ -1130,7 +1216,12 @@ var MSafeAccount = class _MSafeAccount {
   async simulateIntention(request) {
     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({
@@ -1156,13 +1247,19 @@ 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,
+      ...apiInput,
       payload: (0, import_utils6.toHex)(payload),
       digest,
       msafeAddress: this.address,
@@ -1270,6 +1367,10 @@ var MSafeAccount = class _MSafeAccount {
   }
   async simulateBuildTransaction() {
     const intention = await this.backend.getNextIntention({ msafeAddress: this.address });
+    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,