@msafe/sui3-sdk 1.0.21 → 1.0.22

package/dist/index.d.cts

@@ -352,6 +352,18 @@ declare class InsufficientGasFundsError extends Error {
  * storageRebate is refunded after execution and must not reduce the budget.
  */
 declare function computeGasBudget(gasUsed: Pick<SuiClientTypes.GasCostSummary, 'computationCost' | 'storageCost'>, gasPrice: bigint): bigint;
+/** Object IDs a built payload already pins (inputs + gas payment). */
+declare function collectPayloadObjectIds(payload: string | Uint8Array): string[];
+/**
+ * Parked queue item: intention was saved with a built hex payload + digest
+ * so build-next can promote it without rebuilding.
+ */
+declare function parkedPayloadHex(intention: unknown): string | undefined;
+/** Coins already pinned by the current pending tx and any parked future payloads. */
+declare function collectQueueExcludeObjectIds(input: {
+    pendingPayload?: string;
+    parkedPayloads?: Array<string | undefined>;
+}): string[];
 /**
  * Select gas funding before tx.build() according to mixed coin/addressBalance policy:
  * 1) budget without storageRebate (caller supplies computeGasBudget result)
@@ -365,12 +377,15 @@ declare function selectGasFunding(input: {
     suiClient: SuiGrpcClient;
     owner: string;
     gasBudget: bigint;
+    excludeObjectIds?: Iterable<string>;
 }): Promise<GasFundingResult>;
 declare function estimateGasBudget(input: {
     tx: Transaction;
     suiClient: SuiGrpcClient;
     owner: string;
     gasPrice: bigint;
+    excludeObjectIds?: Iterable<string>;
+    preferAddressBalance?: boolean;
 }): Promise<bigint>;
 /**
  * Resolve gasBudget (no rebate) and apply gas funding selection before build.
@@ -381,6 +396,16 @@ declare function prepareGasFunding(input: {
     owner: string;
     gasPrice: bigint;
     gasBudget?: bigint;
+    /**
+     * Force Address Balance gas (`payment: []`). Prefer {@link excludeObjectIds}
+     * for queue-behind-pending so unused SUI coins can still pay.
+     */
+    preferAddressBalance?: boolean;
+    /**
+     * Queue-behind-pending: do not pick coins the current pending / parked
+     * payloads already pin. Those versions will change when the earlier tx executes.
+     */
+    excludeObjectIds?: Iterable<string>;
 }): Promise<GasFundingResult>;
 /**
  * @deprecated Use {@link prepareGasFunding} / {@link selectGasFunding}.
@@ -398,7 +423,12 @@ declare class Simulator {
     simulate(input: {
         txb: Transaction;
         sender: string;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<SimulationResult>;
+    /** Dry-run a frozen payload without re-selecting gas. */
+    simulateBuilt(built: Uint8Array): Promise<SimulationResult>;
+    private inspectBuilt;
     private getGasPrice;
     private toGasBudget;
     private copyTransaction;
@@ -440,10 +470,14 @@ declare class MSafeAccount {
     nextSequenceNumber(): Promise<number>;
     simulateIntention(request: Omit<IProposeIntentionRequest, 'msafeAddress' | 'signature'> & {
         txb?: Transaction;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<SimulationResult>;
     proposeIntention(input: Omit<IProposeIntentionRequest, 'signature' | 'msafeAddress'>): Promise<void>;
     proposeIntentionAndBuildVote(input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress' | 'payload' | 'digest'> & {
         txb?: Transaction;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<void>;
     simulateCoinTransferIntention(intention: CoinTransferIntention): Promise<SimulationResult>;
     proposeCoinTransferIntention(intention: CoinTransferIntention): Promise<void>;
@@ -609,4 +643,4 @@ declare function getIntentionContent(intention: unknown): unknown;
  */
 declare function transactionFromContent(content: unknown): Transaction;
 
-export { AddressBookSDK, COIN_RESERVATION_MAGIC, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, type GasFundingMode, type GasFundingResult, type GasObjectReference, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, InsufficientGasFundsError, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulateDryRunResponse, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, computeGasBudget, createCoinReservationRef, estimateGasBudget, getAllCoins, getIntentionContent, getMSafeConfig, getPublicKeyFromChain, httpUrlToGrpcBaseUrl, isCoinReservationDigest, msafeChainToSuiNetwork, preferClassicGasPayment, prepareGasFunding, selectGasFunding, stringToBuffer, toSuiTransaction, transactionFromContent };
+export { AddressBookSDK, COIN_RESERVATION_MAGIC, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, type GasFundingMode, type GasFundingResult, type GasObjectReference, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, InsufficientGasFundsError, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulateDryRunResponse, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, collectPayloadObjectIds, collectQueueExcludeObjectIds, computeGasBudget, createCoinReservationRef, estimateGasBudget, getAllCoins, getIntentionContent, getMSafeConfig, getPublicKeyFromChain, httpUrlToGrpcBaseUrl, isCoinReservationDigest, msafeChainToSuiNetwork, parkedPayloadHex, preferClassicGasPayment, prepareGasFunding, selectGasFunding, stringToBuffer, toSuiTransaction, transactionFromContent };

package/dist/index.d.ts

@@ -352,6 +352,18 @@ declare class InsufficientGasFundsError extends Error {
  * storageRebate is refunded after execution and must not reduce the budget.
  */
 declare function computeGasBudget(gasUsed: Pick<SuiClientTypes.GasCostSummary, 'computationCost' | 'storageCost'>, gasPrice: bigint): bigint;
+/** Object IDs a built payload already pins (inputs + gas payment). */
+declare function collectPayloadObjectIds(payload: string | Uint8Array): string[];
+/**
+ * Parked queue item: intention was saved with a built hex payload + digest
+ * so build-next can promote it without rebuilding.
+ */
+declare function parkedPayloadHex(intention: unknown): string | undefined;
+/** Coins already pinned by the current pending tx and any parked future payloads. */
+declare function collectQueueExcludeObjectIds(input: {
+    pendingPayload?: string;
+    parkedPayloads?: Array<string | undefined>;
+}): string[];
 /**
  * Select gas funding before tx.build() according to mixed coin/addressBalance policy:
  * 1) budget without storageRebate (caller supplies computeGasBudget result)
@@ -365,12 +377,15 @@ declare function selectGasFunding(input: {
     suiClient: SuiGrpcClient;
     owner: string;
     gasBudget: bigint;
+    excludeObjectIds?: Iterable<string>;
 }): Promise<GasFundingResult>;
 declare function estimateGasBudget(input: {
     tx: Transaction;
     suiClient: SuiGrpcClient;
     owner: string;
     gasPrice: bigint;
+    excludeObjectIds?: Iterable<string>;
+    preferAddressBalance?: boolean;
 }): Promise<bigint>;
 /**
  * Resolve gasBudget (no rebate) and apply gas funding selection before build.
@@ -381,6 +396,16 @@ declare function prepareGasFunding(input: {
     owner: string;
     gasPrice: bigint;
     gasBudget?: bigint;
+    /**
+     * Force Address Balance gas (`payment: []`). Prefer {@link excludeObjectIds}
+     * for queue-behind-pending so unused SUI coins can still pay.
+     */
+    preferAddressBalance?: boolean;
+    /**
+     * Queue-behind-pending: do not pick coins the current pending / parked
+     * payloads already pin. Those versions will change when the earlier tx executes.
+     */
+    excludeObjectIds?: Iterable<string>;
 }): Promise<GasFundingResult>;
 /**
  * @deprecated Use {@link prepareGasFunding} / {@link selectGasFunding}.
@@ -398,7 +423,12 @@ declare class Simulator {
     simulate(input: {
         txb: Transaction;
         sender: string;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<SimulationResult>;
+    /** Dry-run a frozen payload without re-selecting gas. */
+    simulateBuilt(built: Uint8Array): Promise<SimulationResult>;
+    private inspectBuilt;
     private getGasPrice;
     private toGasBudget;
     private copyTransaction;
@@ -440,10 +470,14 @@ declare class MSafeAccount {
     nextSequenceNumber(): Promise<number>;
     simulateIntention(request: Omit<IProposeIntentionRequest, 'msafeAddress' | 'signature'> & {
         txb?: Transaction;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<SimulationResult>;
     proposeIntention(input: Omit<IProposeIntentionRequest, 'signature' | 'msafeAddress'>): Promise<void>;
     proposeIntentionAndBuildVote(input: Omit<IProposeIntentionAndBuildAndVoteRequest, 'signature' | 'msafeAddress' | 'payload' | 'digest'> & {
         txb?: Transaction;
+        preferAddressBalance?: boolean;
+        excludeObjectIds?: Iterable<string>;
     }): Promise<void>;
     simulateCoinTransferIntention(intention: CoinTransferIntention): Promise<SimulationResult>;
     proposeCoinTransferIntention(intention: CoinTransferIntention): Promise<void>;
@@ -609,4 +643,4 @@ declare function getIntentionContent(intention: unknown): unknown;
  */
 declare function transactionFromContent(content: unknown): Transaction;
 
-export { AddressBookSDK, COIN_RESERVATION_MAGIC, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, type GasFundingMode, type GasFundingResult, type GasObjectReference, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, InsufficientGasFundsError, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulateDryRunResponse, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, computeGasBudget, createCoinReservationRef, estimateGasBudget, getAllCoins, getIntentionContent, getMSafeConfig, getPublicKeyFromChain, httpUrlToGrpcBaseUrl, isCoinReservationDigest, msafeChainToSuiNetwork, preferClassicGasPayment, prepareGasFunding, selectGasFunding, stringToBuffer, toSuiTransaction, transactionFromContent };
+export { AddressBookSDK, COIN_RESERVATION_MAGIC, COIN_TYPE_ARG_REGEX, Coin, CoinHelper, CreateHelper, type CreateMSafeInfo, DEV_API_URL, DEV_SYNCING_URL, ENV_CONFIGS, Formatter, type FutureIntention, type GasFundingMode, type GasFundingResult, type GasObjectReference, HexToUint8Array, type HistorySendTx, type HistoryVote, type IWallet, InfoTypeEnabledDto, InfoTypeKey, InsufficientGasFundsError, LOCAL_API_URL, LOCAL_SYNCING_URL, MAINNET_RPC_URL, MSafeAccount, MSafeClient, type MSafeConfig, type MSafeConfigOptions, MSafeEnabledDto, MSafeEnv, MSafeGlobals, type NotificationData, type NotificationInfo, NotificationSubscribeDto, NotificationUpdateDto, PREV_API_URL, PROD_API_URL, type Pagination, type PendingTx, type PendingVote, type ProposeIntention, type ReceiveTransaction, SUI_COIN, SignatureVerifier, type SimulateDryRunResponse, type SimulationFailedResult, type SimulationOption, type SimulationResult, type SimulationSuccessResult, TESTNET_RPC_URL, Uint8ArrayToHex, addPrefix, collectPayloadObjectIds, collectQueueExcludeObjectIds, computeGasBudget, createCoinReservationRef, estimateGasBudget, getAllCoins, getIntentionContent, getMSafeConfig, getPublicKeyFromChain, httpUrlToGrpcBaseUrl, isCoinReservationDigest, msafeChainToSuiNetwork, parkedPayloadHex, preferClassicGasPayment, prepareGasFunding, selectGasFunding, stringToBuffer, toSuiTransaction, transactionFromContent };

package/dist/index.js

@@ -134,7 +134,7 @@ import {
   isSameAddress as isSameAddress2
 } from "@msafe/sui3-utils";
 import { Transaction as Transaction4 } from "@mysten/sui/transactions";
-import { fromHex as fromHex3, normalizeStructTag as normalizeStructTag4, toHex as toHex2 } from "@mysten/sui/utils";
+import { fromHex as fromHex4, normalizeStructTag as normalizeStructTag4, toHex as toHex2 } from "@mysten/sui/utils";
 import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from "@mysten/wallet-standard";
 
 // src/simulate/simulator.ts
@@ -142,7 +142,7 @@ import { Transaction as Transaction2 } from "@mysten/sui/transactions";
 
 // src/utils/gasFunding.ts
 import { Transaction } from "@mysten/sui/transactions";
-import { normalizeStructTag as normalizeStructTag3, normalizeSuiObjectId } from "@mysten/sui/utils";
+import { fromHex as fromHex2, normalizeStructTag as normalizeStructTag3, normalizeSuiObjectId } from "@mysten/sui/utils";
 
 // src/utils/coinReservation.ts
 import { bcs, TypeTagSerializer } from "@mysten/sui/bcs";
@@ -437,18 +437,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(normalizeSuiObjectId(immOrOwned));
-      return used;
+      acc.add(normalizeSuiObjectId(immOrOwned));
+      return acc;
     }
     const unresolved = input.UnresolvedObject?.objectId;
     if (unresolved) {
-      used.add(normalizeSuiObjectId(unresolved));
+      acc.add(normalizeSuiObjectId(unresolved));
     }
-    return used;
+    return acc;
   }, /* @__PURE__ */ new Set());
+  (tx.getData().gasData.payment ?? []).forEach((payment) => {
+    if (payment.objectId) {
+      used.add(normalizeSuiObjectId(payment.objectId));
+    }
+  });
+  return used;
+}
+function addExcludeObjectIds(used, excludeObjectIds) {
+  Array.from(excludeObjectIds ?? [], (id) => used.add(normalizeSuiObjectId(id)));
+  return used;
+}
+function payloadToTransaction(payload) {
+  if (typeof payload !== "string") {
+    return Transaction.from(payload);
+  }
+  if (/^[0-9a-fA-F]+$/.test(payload) && payload.length % 2 === 0) {
+    return Transaction.from(fromHex2(payload));
+  }
+  return 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) => {
@@ -466,8 +514,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 })
@@ -518,7 +566,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,
@@ -526,7 +574,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);
@@ -572,8 +620,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;
@@ -606,7 +659,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;
@@ -616,7 +669,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;
     }
@@ -625,7 +685,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;
@@ -668,7 +741,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);
@@ -689,9 +764,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,
@@ -802,7 +885,7 @@ var SignatureVerifier = class _SignatureVerifier {
 
 // src/utils/transaction.ts
 import { Transaction as Transaction3, isTransaction } from "@mysten/sui/transactions";
-import { fromHex as fromHex2 } from "@mysten/sui/utils";
+import { fromHex as fromHex3 } from "@mysten/sui/utils";
 function toSuiTransaction(txb) {
   if (isTransaction(txb)) {
     return txb;
@@ -831,7 +914,7 @@ function transactionFromContent(content) {
   }
   if (typeof content === "string") {
     if (isHex(content)) {
-      return Transaction3.from(fromHex2(content));
+      return Transaction3.from(fromHex3(content));
     }
     return Transaction3.from(content);
   }
@@ -1064,7 +1147,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 = SigningMessageHelper3.proposeIntentionMessage({
@@ -1090,13 +1178,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: toHex2(payload),
       digest,
       msafeAddress: this.address,
@@ -1204,6 +1298,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(fromHex4(parked));
+    }
     const txb = await this.buildTxFromIntention({
       application: intention.application,
       intention: intention.intention,
@@ -1280,7 +1378,7 @@ var MSafeAccount = class _MSafeAccount {
           clientUrl: this.globals.config.suiClient.url,
           account: {
             address: this.address,
-            publicKey: fromHex3(this.address),
+            publicKey: fromHex4(this.address),
             chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
             features: []
           }
@@ -2023,6 +2121,8 @@ export {
   TESTNET_RPC_URL,
   Uint8ArrayToHex,
   addPrefix,
+  collectPayloadObjectIds,
+  collectQueueExcludeObjectIds,
   computeGasBudget,
   createCoinReservationRef,
   estimateGasBudget,
@@ -2033,6 +2133,7 @@ export {
   httpUrlToGrpcBaseUrl,
   isCoinReservationDigest,
   msafeChainToSuiNetwork,
+  parkedPayloadHex,
   preferClassicGasPayment,
   prepareGasFunding,
   selectGasFunding,