@msafe/sui3-sdk 1.0.15 → 1.0.17

package/dist/index.js

@@ -133,125 +133,90 @@ import {
   buildRejectTxb,
   isSameAddress as isSameAddress2
 } from "@msafe/sui3-utils";
-import { Transaction as Transaction3 } from "@mysten/sui/transactions";
-import { fromHex, normalizeStructTag as normalizeStructTag3, toHex } from "@mysten/sui/utils";
+import { Transaction as Transaction4 } from "@mysten/sui/transactions";
+import { fromHex as fromHex2, normalizeStructTag as normalizeStructTag3, toHex as toHex2 } from "@mysten/sui/utils";
 import { SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN } from "@mysten/wallet-standard";
 
 // src/simulate/simulator.ts
+import { Transaction as Transaction2 } from "@mysten/sui/transactions";
+
+// src/utils/gasFunding.ts
 import { Transaction } from "@mysten/sui/transactions";
-var GAS_SAFE_OVERHEAD = 1000n;
-function formatExecutionError(error) {
-  return error.message;
-}
-function gasObjectToReference(gas) {
-  if (!gas?.objectId) {
-    throw new Error("Gas object missing from simulation effects");
-  }
-  const version = gas.outputVersion ?? gas.inputVersion ?? "0";
-  const digest = gas.outputDigest ?? gas.inputDigest ?? "";
-  return { objectId: gas.objectId, version, digest };
-}
-var Simulator = class {
-  constructor(globals) {
-    this.globals = globals;
-  }
-  async simulate(input) {
-    const tx = this.copyTransaction(input.txb);
-    const { suiClient } = this.globals;
-    const gasPrice = await this.getGasPrice();
-    tx.setGasPrice(gasPrice);
-    tx.setSender(input.sender);
-    let built;
-    try {
-      built = await tx.build({ client: suiClient });
-    } catch (e) {
-      const message = e instanceof Error ? e.message : String(e);
-      return {
-        success: false,
-        gasPrice,
-        simulationError: message
-      };
-    }
-    let inspectResult;
-    try {
-      inspectResult = await suiClient.simulateTransaction({
-        transaction: built,
-        include: {
-          effects: true,
-          balanceChanges: true,
-          events: true,
-          objectTypes: true,
-          transaction: true,
-          bcs: true,
-          commandResults: true
-        }
-      });
-    } catch (e) {
-      const message = e instanceof Error ? e.message : String(e);
-      return {
-        success: false,
-        gasPrice,
-        simulationError: message
-      };
-    }
-    const txRow = inspectResult.Transaction ?? inspectResult.FailedTransaction;
-    const { effects } = txRow;
-    if (!effects) {
-      throw new Error("simulateTransaction did not return effects");
-    }
-    const success = effects.status.success === true;
-    if (!success) {
-      const err = effects.status.success === false ? effects.status.error : null;
-      return {
-        success,
-        gasPrice,
-        response: inspectResult,
-        simulationError: err ? formatExecutionError(err) : "Simulation failed"
-      };
-    }
-    const gasBudget = this.toGasBudget(effects.gasUsed, gasPrice);
-    return {
-      success,
-      gasPrice,
-      gasObject: gasObjectToReference(effects.gasObject),
-      gasUsed: effects.gasUsed,
-      gasBudget,
-      response: inspectResult
-    };
-  }
-  async getGasPrice() {
-    const { referenceGasPrice } = await this.globals.suiClient.getReferenceGasPrice();
-    return BigInt(referenceGasPrice);
-  }
-  toGasBudget(gasUsed, gasPrice) {
-    const { computationCost, storageCost, storageRebate } = gasUsed;
-    const safeOverhead = GAS_SAFE_OVERHEAD * gasPrice;
-    const baseComputationCostWithOverhead = BigInt(computationCost) + safeOverhead;
-    const gasBudget = baseComputationCostWithOverhead + BigInt(storageCost) - BigInt(storageRebate);
-    return gasBudget > baseComputationCostWithOverhead ? gasBudget : baseComputationCostWithOverhead;
-  }
-  copyTransaction(tx) {
-    return Transaction.from(tx);
-  }
-};
+import { normalizeSuiObjectId } from "@mysten/sui/utils";
 
-// src/utils/buffer.ts
-import { Buffer } from "buffer";
-function stringToBuffer(s) {
-  return Buffer.from(s, "utf-8");
+// src/utils/coinReservation.ts
+import { bcs, TypeTagSerializer } from "@mysten/sui/bcs";
+import { deriveDynamicFieldID, fromBase58, fromHex, normalizeSuiAddress, toBase58, toHex } from "@mysten/sui/utils";
+var SUI_ACCUMULATOR_ROOT_OBJECT_ID = normalizeSuiAddress("0xacc");
+var ACCUMULATOR_KEY_TYPE_TAG = TypeTagSerializer.parseFromStr(
+  "0x2::accumulator::Key<0x2::balance::Balance<0x2::sui::SUI>>"
+);
+var COIN_RESERVATION_MAGIC = new Uint8Array([
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172,
+  172
+]);
+function isCoinReservationDigest(digestBase58) {
+  const digestBytes = fromBase58(digestBase58);
+  const last20Bytes = digestBytes.slice(12, 32);
+  return last20Bytes.every((byte, i) => byte === COIN_RESERVATION_MAGIC[i]);
 }
-function Uint8ArrayToHex(b) {
-  return `0x${Array.prototype.map.call(b, (x) => `0${x.toString(16)}`.slice(-2)).join("")}`;
+function deriveReservationObjectId(owner, chainIdentifier) {
+  const keyBcs = bcs.Address.serialize(owner).toBytes();
+  const accumulatorId = deriveDynamicFieldID(SUI_ACCUMULATOR_ROOT_OBJECT_ID, ACCUMULATOR_KEY_TYPE_TAG, keyBcs);
+  const accBytes = fromHex(accumulatorId.slice(2));
+  const chainBytes = fromBase58(chainIdentifier);
+  if (chainBytes.length !== 32) {
+    throw new Error(`Invalid chain identifier length: expected 32 bytes, got ${chainBytes.length}`);
+  }
+  const xored = new Uint8Array(32);
+  for (let i = 0; i < 32; i++) {
+    xored[i] = accBytes[i] ^ chainBytes[i];
+  }
+  return `0x${toHex(xored)}`;
 }
-function HexToUint8Array(hex) {
-  return Uint8Array.from(Buffer.from(hex.startsWith("0x") ? hex.slice(2) : hex, "hex"));
+function createCoinReservationRef(reservedBalance, owner, chainIdentifier, epoch) {
+  const digestBytes = new Uint8Array(32);
+  const view = new DataView(digestBytes.buffer);
+  view.setBigUint64(0, reservedBalance, true);
+  const epochNum = Number(epoch);
+  if (!Number.isSafeInteger(epochNum) || epochNum < 0 || epochNum > 4294967295) {
+    throw new Error(`Epoch ${epoch} out of u32 range for coin reservation digest`);
+  }
+  view.setUint32(8, epochNum, true);
+  digestBytes.set(COIN_RESERVATION_MAGIC, 12);
+  return {
+    objectId: deriveReservationObjectId(owner, chainIdentifier),
+    version: "0",
+    digest: toBase58(digestBytes)
+  };
 }
 
-// src/utils/crypto.ts
-import { verifyPersonalMessageSignature, verifyTransactionSignature } from "@mysten/sui/verify";
+// src/utils/sui.ts
+import { PublicKeySerde as PublicKeySerde2 } from "@msafe/sui3-utils";
+import { parseSerializedSignature } from "@mysten/sui/cryptography";
+import { SuiGraphQLClient } from "@mysten/sui/graphql";
+import { MultiSigPublicKey } from "@mysten/sui/multisig";
 
 // src/utils/format.ts
-import { normalizeSuiAddress, normalizeStructTag as normalizeStructTag2 } from "@mysten/sui/utils";
+import { normalizeSuiAddress as normalizeSuiAddress2, normalizeStructTag as normalizeStructTag2 } from "@mysten/sui/utils";
 
 // src/utils/coin.ts
 import { normalizeStructTag } from "@mysten/sui/utils";
@@ -315,13 +280,13 @@ var Coin = class _Coin {
 // src/utils/format.ts
 var Formatter = class {
   static normalizeSuiAddress(addr) {
-    return normalizeSuiAddress(addr);
+    return normalizeSuiAddress2(addr);
   }
   static normalizeStructTag(struct) {
     return normalizeStructTag2(struct);
   }
   static isSuiAddressEqual(addr1, addr2) {
-    return normalizeSuiAddress(addr1) === normalizeSuiAddress(addr2);
+    return normalizeSuiAddress2(addr1) === normalizeSuiAddress2(addr2);
   }
   static isSuiStructEqual(struct1, struct2) {
     return normalizeStructTag2(struct1) === normalizeStructTag2(struct2);
@@ -337,50 +302,7 @@ function addPrefix(s, prefix) {
   return prefix + s;
 }
 
-// src/utils/crypto.ts
-var SignatureVerifier = class _SignatureVerifier {
-  static async getPublicKeyFromSignature(input) {
-    if (input.messageType === "TransactionBlock") {
-      return verifyTransactionSignature(input.message, input.signature);
-    }
-    return verifyPersonalMessageSignature(input.message, input.signature);
-  }
-  static async getPublicKeyFromPersonalSignature(input) {
-    const message = stringToBuffer(input.messageStr);
-    return this.getPublicKeyFromSignature({
-      message,
-      messageType: "Personal",
-      signature: input.signature
-    });
-  }
-  static async verifySignature(input) {
-    const publicKey = await _SignatureVerifier.getPublicKeyFromSignature(input);
-    return Formatter.isSuiAddressEqual(publicKey.toSuiAddress(), input.targetAddress);
-  }
-  static async verifyPersonalSignature(input) {
-    const message = stringToBuffer(input.messageStr);
-    return this.verifySignature({
-      message,
-      messageType: "Personal",
-      signature: input.signature,
-      targetAddress: input.targetAddress
-    });
-  }
-  static async verifyTransactionSignature(input) {
-    return this.verifySignature({
-      messageType: "TransactionBlock",
-      message: input.payload,
-      signature: input.signature,
-      targetAddress: input.targetAddress
-    });
-  }
-};
-
 // src/utils/sui.ts
-import { PublicKeySerde as PublicKeySerde2 } from "@msafe/sui3-utils";
-import { parseSerializedSignature } from "@mysten/sui/cryptography";
-import { SuiGraphQLClient } from "@mysten/sui/graphql";
-import { MultiSigPublicKey } from "@mysten/sui/multisig";
 var SUI_COIN = "0x2::sui::SUI";
 var GRAPHQL_URL_BY_NETWORK = {
   mainnet: "https://sui-mainnet.mystenlabs.com/graphql",
@@ -492,14 +414,355 @@ async function getAllCoins(input) {
   return res;
 }
 
+// src/utils/gasFunding.ts
+var GAS_SAFE_OVERHEAD = 1000n;
+var InsufficientGasFundsError = class extends Error {
+  gasBudget;
+  coinBalance;
+  addressBalance;
+  constructor(gasBudget, coinBalance, addressBalance) {
+    const total = coinBalance + addressBalance;
+    super(
+      `Insufficient gas funds: need ${gasBudget}, have coinBalance=${coinBalance} + addressBalance=${addressBalance} = ${total}`
+    );
+    this.name = "InsufficientGasFundsError";
+    this.gasBudget = gasBudget;
+    this.coinBalance = coinBalance;
+    this.addressBalance = addressBalance;
+  }
+};
+function computeGasBudget(gasUsed, gasPrice) {
+  const { computationCost, storageCost } = gasUsed;
+  const safeOverhead = GAS_SAFE_OVERHEAD * gasPrice;
+  return BigInt(computationCost) + BigInt(storageCost) + safeOverhead;
+}
+function collectUsedObjectIds(tx) {
+  return tx.getData().inputs.reduce((used, input) => {
+    const immOrOwned = input.Object?.ImmOrOwnedObject?.objectId;
+    if (immOrOwned) {
+      used.add(normalizeSuiObjectId(immOrOwned));
+      return used;
+    }
+    const unresolved = input.UnresolvedObject?.objectId;
+    if (unresolved) {
+      used.add(normalizeSuiObjectId(unresolved));
+    }
+    return used;
+  }, /* @__PURE__ */ new Set());
+}
+async function loadSuiGasFunding(suiClient, owner, tx) {
+  const usedObjectIds = collectUsedObjectIds(tx);
+  const [coins, balanceRes] = await Promise.all([
+    getAllCoins({ suiClient, owner, coinType: SUI_COIN }),
+    suiClient.getBalance({ owner, coinType: SUI_COIN })
+  ]);
+  const paymentCoins = coins.filter((coin) => !usedObjectIds.has(normalizeSuiObjectId(coin.objectId)) && BigInt(coin.balance) > 0n).map((coin) => ({
+    objectId: coin.objectId,
+    version: coin.version,
+    digest: coin.digest,
+    balance: BigInt(coin.balance)
+  }));
+  const coinBalance = paymentCoins.reduce((sum, coin) => sum + coin.balance, 0n);
+  const addressBalance = BigInt(balanceRes.balance.addressBalance);
+  return {
+    paymentCoins,
+    coinBalance,
+    addressBalance,
+    total: coinBalance + addressBalance
+  };
+}
+function toObjectRefs(coins) {
+  return coins.map(({ objectId, version, digest }) => ({ objectId, version, digest }));
+}
+async function applyMixedTopUp(input) {
+  const { tx, suiClient, owner, paymentCoins, topUpAmount } = input;
+  if (paymentCoins.length === 0) {
+    throw new Error("mixed gas top-up requires at least one SUI coin object");
+  }
+  if (topUpAmount <= 0n) {
+    tx.setGasPayment(toObjectRefs(paymentCoins));
+    return;
+  }
+  const [{ chainIdentifier }, { systemState }] = await Promise.all([
+    suiClient.core.getChainIdentifier(),
+    suiClient.core.getCurrentSystemState()
+  ]);
+  const reservation = createCoinReservationRef(topUpAmount, owner, chainIdentifier, systemState.epoch);
+  tx.setGasPayment([...toObjectRefs(paymentCoins), reservation]);
+}
+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);
+    return {
+      mode: "classic",
+      gasBudget,
+      coinBalance: funding2.coinBalance,
+      addressBalance: funding2.addressBalance
+    };
+  }
+  const funding = await loadSuiGasFunding(suiClient, owner, tx);
+  const { paymentCoins, coinBalance, addressBalance, total } = funding;
+  if (total < gasBudget) {
+    throw new InsufficientGasFundsError(gasBudget, coinBalance, addressBalance);
+  }
+  if (paymentCoins.length > 0 && coinBalance >= gasBudget) {
+    tx.setGasPayment(toObjectRefs(paymentCoins));
+    return { mode: "classic", gasBudget, coinBalance, addressBalance };
+  }
+  if (paymentCoins.length > 0 && total >= gasBudget) {
+    const topUpAmount = gasBudget - coinBalance;
+    await applyMixedTopUp({
+      tx,
+      suiClient,
+      owner,
+      paymentCoins,
+      topUpAmount
+    });
+    return { mode: "mixedTopUp", gasBudget, coinBalance, addressBalance };
+  }
+  if (addressBalance >= gasBudget) {
+    tx.setGasPayment([]);
+    return { mode: "addressBalance", gasBudget, coinBalance, addressBalance };
+  }
+  throw new InsufficientGasFundsError(gasBudget, coinBalance, addressBalance);
+}
+async function estimateGasBudget(input) {
+  const { tx, suiClient, owner, gasPrice } = input;
+  const funding = await loadSuiGasFunding(suiClient, owner, tx);
+  if (funding.total <= 0n) {
+    throw new InsufficientGasFundsError(0n, funding.coinBalance, funding.addressBalance);
+  }
+  const probe = Transaction.from(tx);
+  probe.setSender(owner);
+  probe.setGasPrice(gasPrice);
+  if (funding.paymentCoins.length > 0) {
+    probe.setGasPayment(toObjectRefs(funding.paymentCoins));
+  }
+  let built;
+  try {
+    built = await probe.build({ client: suiClient });
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(`Failed to estimate gas budget: ${message}`);
+  }
+  const inspect = await suiClient.simulateTransaction({
+    transaction: built,
+    include: { effects: true }
+  });
+  const effects = (inspect.Transaction ?? inspect.FailedTransaction)?.effects;
+  if (!effects?.gasUsed) {
+    throw new Error("Failed to estimate gas budget: simulateTransaction returned no gasUsed");
+  }
+  if (effects.status.success !== true) {
+    const err = effects.status.success === false ? effects.status.error?.message : void 0;
+    throw new Error(`Failed to estimate gas budget: ${err ?? "simulation failed"}`);
+  }
+  return computeGasBudget(effects.gasUsed, gasPrice);
+}
+async function prepareGasFunding(input) {
+  const { tx, suiClient, owner, gasPrice } = input;
+  const { payment, budget: existingBudget } = tx.getData().gasData;
+  const bakedAddressBalanceGas = payment != null && payment.length === 0;
+  let { gasBudget } = input;
+  if (gasBudget == null) {
+    if (bakedAddressBalanceGas || existingBudget == null) {
+      gasBudget = await estimateGasBudget({ tx, suiClient, owner, gasPrice });
+    } else {
+      gasBudget = BigInt(existingBudget);
+    }
+  }
+  tx.setGasBudget(gasBudget);
+  return selectGasFunding({ tx, suiClient, owner, gasBudget });
+}
+async function preferClassicGasPayment(input) {
+  const { tx, suiClient, owner } = input;
+  const { payment } = tx.getData().gasData;
+  if (payment != null) {
+    return payment.length > 0;
+  }
+  const funding = await loadSuiGasFunding(suiClient, owner, tx);
+  if (funding.paymentCoins.length === 0) {
+    return false;
+  }
+  tx.setGasPayment(toObjectRefs(funding.paymentCoins));
+  return true;
+}
+
+// src/simulate/simulator.ts
+function formatExecutionError(error) {
+  return error.message;
+}
+function gasObjectToReference(gas) {
+  if (!gas?.objectId) {
+    throw new Error("Gas object missing from simulation effects");
+  }
+  const version = gas.outputVersion ?? gas.inputVersion ?? "0";
+  const digest = gas.outputDigest ?? gas.inputDigest ?? "";
+  return { objectId: gas.objectId, version, digest };
+}
+var Simulator = class {
+  constructor(globals) {
+    this.globals = globals;
+  }
+  async simulate(input) {
+    const tx = this.copyTransaction(input.txb);
+    const { suiClient } = this.globals;
+    const gasPrice = await this.getGasPrice();
+    tx.setGasPrice(gasPrice);
+    tx.setSender(input.sender);
+    try {
+      await prepareGasFunding({
+        tx,
+        suiClient,
+        owner: input.sender,
+        gasPrice
+      });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      return {
+        success: false,
+        gasPrice,
+        simulationError: message
+      };
+    }
+    let built;
+    try {
+      built = await tx.build({ client: suiClient });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      return {
+        success: false,
+        gasPrice,
+        simulationError: message
+      };
+    }
+    let inspectResult;
+    try {
+      inspectResult = await suiClient.simulateTransaction({
+        transaction: built,
+        include: {
+          effects: true,
+          balanceChanges: true,
+          events: true,
+          objectTypes: true,
+          transaction: true,
+          bcs: true,
+          commandResults: true
+        }
+      });
+    } catch (e) {
+      const message = e instanceof Error ? e.message : String(e);
+      return {
+        success: false,
+        gasPrice,
+        simulationError: message
+      };
+    }
+    const txRow = inspectResult.Transaction ?? inspectResult.FailedTransaction;
+    const { effects } = txRow;
+    if (!effects) {
+      throw new Error("simulateTransaction did not return effects");
+    }
+    const success = effects.status.success === true;
+    if (!success) {
+      const err = effects.status.success === false ? effects.status.error : null;
+      return {
+        success,
+        gasPrice,
+        response: inspectResult,
+        simulationError: err ? formatExecutionError(err) : "Simulation failed"
+      };
+    }
+    const gasBudget = this.toGasBudget(effects.gasUsed, gasPrice);
+    return {
+      success,
+      gasPrice,
+      gasObject: gasObjectToReference(effects.gasObject),
+      gasUsed: effects.gasUsed,
+      gasBudget,
+      response: inspectResult
+    };
+  }
+  async getGasPrice() {
+    const { referenceGasPrice } = await this.globals.suiClient.getReferenceGasPrice();
+    return BigInt(referenceGasPrice);
+  }
+  toGasBudget(gasUsed, gasPrice) {
+    return computeGasBudget(gasUsed, gasPrice);
+  }
+  copyTransaction(tx) {
+    return Transaction2.from(tx);
+  }
+};
+
+// src/utils/buffer.ts
+import { Buffer } from "buffer";
+function stringToBuffer(s) {
+  return Buffer.from(s, "utf-8");
+}
+function Uint8ArrayToHex(b) {
+  return `0x${Array.prototype.map.call(b, (x) => `0${x.toString(16)}`.slice(-2)).join("")}`;
+}
+function HexToUint8Array(hex) {
+  return Uint8Array.from(Buffer.from(hex.startsWith("0x") ? hex.slice(2) : hex, "hex"));
+}
+
+// src/utils/crypto.ts
+import { verifyPersonalMessageSignature, verifyTransactionSignature } from "@mysten/sui/verify";
+var SignatureVerifier = class _SignatureVerifier {
+  static async getPublicKeyFromSignature(input) {
+    if (input.messageType === "TransactionBlock") {
+      return verifyTransactionSignature(input.message, input.signature);
+    }
+    return verifyPersonalMessageSignature(input.message, input.signature);
+  }
+  static async getPublicKeyFromPersonalSignature(input) {
+    const message = stringToBuffer(input.messageStr);
+    return this.getPublicKeyFromSignature({
+      message,
+      messageType: "Personal",
+      signature: input.signature
+    });
+  }
+  static async verifySignature(input) {
+    const publicKey = await _SignatureVerifier.getPublicKeyFromSignature(input);
+    return Formatter.isSuiAddressEqual(publicKey.toSuiAddress(), input.targetAddress);
+  }
+  static async verifyPersonalSignature(input) {
+    const message = stringToBuffer(input.messageStr);
+    return this.verifySignature({
+      message,
+      messageType: "Personal",
+      signature: input.signature,
+      targetAddress: input.targetAddress
+    });
+  }
+  static async verifyTransactionSignature(input) {
+    return this.verifySignature({
+      messageType: "TransactionBlock",
+      message: input.payload,
+      signature: input.signature,
+      targetAddress: input.targetAddress
+    });
+  }
+};
+
 // src/utils/transaction.ts
-import { Transaction as Transaction2, isTransaction } from "@mysten/sui/transactions";
+import { Transaction as Transaction3, isTransaction } from "@mysten/sui/transactions";
 function toSuiTransaction(txb) {
   if (isTransaction(txb)) {
     return txb;
   }
+  if (typeof txb === "string" || txb instanceof Uint8Array) {
+    return Transaction3.from(txb);
+  }
   const legacy = txb;
-  return Transaction2.from(legacy.serialize());
+  if (typeof legacy?.serialize === "function") {
+    return Transaction3.from(legacy.serialize());
+  }
+  throw new Error("Unsupported transaction value for toSuiTransaction");
 }
 
 // src/utils/iter/iterator.ts
@@ -740,7 +1003,7 @@ var MSafeAccount = class _MSafeAccount {
           clientUrl: this.globals.config.suiClient.url,
           account: {
             address: this.address,
-            publicKey: fromHex(this.address),
+            publicKey: fromHex2(this.address),
             chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
             features: []
           }
@@ -783,7 +1046,7 @@ var MSafeAccount = class _MSafeAccount {
           clientUrl: this.globals.config.suiClient.url,
           account: {
             address: this.address,
-            publicKey: fromHex(this.address),
+            publicKey: fromHex2(this.address),
             chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
             features: []
           }
@@ -791,14 +1054,20 @@ var MSafeAccount = class _MSafeAccount {
       );
     }
     txb.setGasPrice(input.gasPrice);
-    txb.setGasBudget(input.gasBudget);
     txb.setSender(this.address);
+    await prepareGasFunding({
+      tx: txb,
+      suiClient: this.globals.suiClient,
+      owner: this.address,
+      gasPrice: input.gasPrice,
+      gasBudget: input.gasBudget
+    });
     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 });
     return this.backend.proposeIntentionAndBuildVote({
       ...input,
-      payload: toHex(payload),
+      payload: toHex2(payload),
       digest,
       msafeAddress: this.address,
       signature: signature.signature
@@ -856,7 +1125,7 @@ var MSafeAccount = class _MSafeAccount {
   }
   async proposePlainPayloadIntention(intention) {
     const sn = await this.nextSequenceNumber();
-    const tb = Transaction3.from(intention.payload);
+    const tb = Transaction4.from(intention.payload);
     const data = tb.getData();
     if (!data.sender || !isSameAddress2(data.sender, this.address)) {
       throw new Error("Transaction sender is not same as the multisig address");
@@ -893,6 +1162,14 @@ var MSafeAccount = class _MSafeAccount {
       throw new Error("Already rejected");
     }
     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 });
@@ -918,7 +1195,7 @@ var MSafeAccount = class _MSafeAccount {
         clientUrl: this.globals.config.suiClient.url,
         account: {
           address: this.address,
-          publicKey: fromHex(this.address),
+          publicKey: fromHex2(this.address),
           chains: [SUI_MAINNET_CHAIN, SUI_TESTNET_CHAIN],
           features: []
         }
@@ -1000,7 +1277,7 @@ var MSafeAccount = class _MSafeAccount {
 
 // src/core/PublicKeyHelper.ts
 import { isSameAddress as isSameAddress3 } from "@msafe/sui3-utils";
-import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui/utils";
+import { normalizeSuiAddress as normalizeSuiAddress3 } from "@mysten/sui/utils";
 var PublicKeyHelper = class {
   constructor(globals) {
     this.globals = globals;
@@ -1049,7 +1326,7 @@ var PublicKeyHelper = class {
     if (!isSameAddress3(address, publicKey.toSuiAddress())) {
       throw new Error("Invalid public key");
     }
-    this.knownPublicKeys.set(normalizeSuiAddress2(address), publicKey);
+    this.knownPublicKeys.set(normalizeSuiAddress3(address), publicKey);
   }
   async _getPublicKey(address) {
     const pkBackend = await this.getPublicKeyFromBackend(address);
@@ -1668,6 +1945,7 @@ var MSafeEnabledDto = class {
 };
 export {
   AddressBookSDK,
+  COIN_RESERVATION_MAGIC,
   COIN_TYPE_ARG_REGEX,
   Coin,
   CoinHelper,
@@ -1679,6 +1957,7 @@ export {
   HexToUint8Array,
   InfoTypeEnabledDto,
   InfoTypeKey,
+  InsufficientGasFundsError,
   LOCAL_API_URL,
   LOCAL_SYNCING_URL,
   MAINNET_RPC_URL,
@@ -1696,11 +1975,18 @@ export {
   TESTNET_RPC_URL,
   Uint8ArrayToHex,
   addPrefix,
+  computeGasBudget,
+  createCoinReservationRef,
+  estimateGasBudget,
   getAllCoins,
   getMSafeConfig,
   getPublicKeyFromChain,
   httpUrlToGrpcBaseUrl,
+  isCoinReservationDigest,
   msafeChainToSuiNetwork,
+  preferClassicGasPayment,
+  prepareGasFunding,
+  selectGasFunding,
   stringToBuffer,
   toSuiTransaction
 };