@fuel-ts/account 0.101.1 → 0.101.3

package/dist/test-utils.js

@@ -255,8 +255,9 @@ var launchNode = /* @__PURE__ */ __name(async ({
       "--consensus-key",
       "--db-type",
       "--poa-instant",
+      "--native-executor-version",
       "--min-gas-price",
-      "--native-executor-version"
+      "--starting-gas-price"
     ]);
     const snapshotDir = getFlagValueFromArgs(args, "--snapshot");
     const consensusKey = getFlagValueFromArgs(args, "--consensus-key") || import_utils2.defaultConsensusKey;
@@ -405,8 +406,8 @@ var launchNode = /* @__PURE__ */ __name(async ({
 ), "launchNode");
 
 // src/test-utils/setup-test-provider-and-wallets.ts
-var import_utils46 = require("@fuel-ts/utils");
-var import_ramda10 = require("ramda");
+var import_utils47 = require("@fuel-ts/utils");
+var import_ramda11 = require("ramda");
 
 // src/providers/coin-quantity.ts
 var import_math2 = require("@fuel-ts/math");
@@ -447,7 +448,7 @@ var import_address4 = require("@fuel-ts/address");
 var import_errors21 = require("@fuel-ts/errors");
 var import_math20 = require("@fuel-ts/math");
 var import_transactions25 = require("@fuel-ts/transactions");
-var import_utils32 = require("@fuel-ts/utils");
+var import_utils33 = require("@fuel-ts/utils");
 var import_versions = require("@fuel-ts/versions");
 var import_graphql_request = require("graphql-request");
 var import_graphql_tag2 = __toESM(require("graphql-tag"));
@@ -1847,8 +1848,11 @@ var import_graphql = require("graphql");
 
 // src/providers/utils/handle-gql-error-message.ts
 var import_errors3 = require("@fuel-ts/errors");
+var ASSET_ID_REGEX = /[0-9a-fA-F]{32,64}/g;
 var gqlErrorMessage = {
   RPC_CONSISTENCY: /The required fuel block height is higher than the current block height. Required: \d+, Current: \d+/,
+  INSUFFICIENT_FUNDS: /the target cannot be met due to insufficient coins available for [0-9a-fA-F]{32,64}. Collected: \d+/,
+  MAX_COINS_REACHED: /the target for [0-9a-fA-F]{32,64} cannot be met due to exceeding the \d+ coin limit. Collected: \d+./,
   NOT_ENOUGH_COINS_MAX_COINS: /the target cannot be met due to no coins available or exceeding the \d+ coin limit./,
   ASSET_NOT_FOUND: /resource was not found in table/,
   MULTIPLE_CHANGE_POLICIES: /The asset ([a-fA-F0-9]{64}) has multiple change policies/,
@@ -1864,6 +1868,46 @@ var mapGqlErrorMessage = /* @__PURE__ */ __name((error) => {
       error
     );
   }
+  if (gqlErrorMessage.MAX_COINS_REACHED.test(error.message)) {
+    const matches = error.message.match(ASSET_ID_REGEX);
+    const assetId = matches ? `0x${matches[0]}` : null;
+    const owner = matches ? `0x${matches[1]}` : null;
+    let suffix = "";
+    if (assetId) {
+      suffix += `
+	Asset ID: '${assetId}'.`;
+    }
+    if (owner) {
+      suffix += `
+	Owner: '${owner}'.`;
+    }
+    return new import_errors3.FuelError(
+      import_errors3.ErrorCode.MAX_COINS_REACHED,
+      `You have too many small value coins - consider combining UTXOs.${suffix}`,
+      { assetId, owner },
+      error
+    );
+  }
+  if (gqlErrorMessage.INSUFFICIENT_FUNDS.test(error.message)) {
+    const matches = error.message.match(ASSET_ID_REGEX);
+    const assetId = matches ? `0x${matches[0]}` : null;
+    const owner = matches ? `0x${matches[1]}` : null;
+    let suffix = "";
+    if (assetId) {
+      suffix += `
+	Asset ID: '${assetId}'.`;
+    }
+    if (owner) {
+      suffix += `
+	Owner: '${owner}'.`;
+    }
+    return new import_errors3.FuelError(
+      import_errors3.ErrorCode.INSUFFICIENT_FUNDS,
+      `Insufficient funds.${suffix}`,
+      { assetId, owner },
+      error
+    );
+  }
   if (gqlErrorMessage.MULTIPLE_CHANGE_POLICIES.test(error.message)) {
     const match = error.message.match(/asset ([a-fA-F0-9]{64})/);
     const assetId = match?.[1] || "";
@@ -2891,58 +2935,98 @@ ${import_configs5.PANIC_DOC_URL}#variant.${statusReason}`;
   });
 }, "assemblePanicError");
 var stringify = /* @__PURE__ */ __name((obj) => JSON.stringify(obj, null, 2), "stringify");
-var assembleRevertError = /* @__PURE__ */ __name((receipts, logs, metadata) => {
+var assembleSignalErrorMessage = /* @__PURE__ */ __name((reasonHex, logs, metadata) => {
   let errorMessage = "The transaction reverted with an unknown reason.";
-  const revertReceipt = receipts.find(({ type }) => type === import_transactions7.ReceiptType.Revert);
   let reason = "";
-  if (revertReceipt) {
-    const reasonHex = (0, import_math8.bn)(revertReceipt.val).toHex();
-    const lastLog = logs[logs.length - 1];
-    const lastButOneLog = logs[logs.length - 2];
-    switch (reasonHex) {
-      case import_configs5.FAILED_REQUIRE_SIGNAL: {
-        reason = "require";
-        errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
-        break;
-      }
-      case import_configs5.FAILED_ASSERT_EQ_SIGNAL: {
-        const suffix = logs.length >= 2 ? ` comparing ${stringify(lastLog)} and ${stringify(lastButOneLog)}.` : ".";
-        reason = "assert_eq";
-        errorMessage = `The transaction reverted because of an "assert_eq" statement${suffix}`;
-        break;
-      }
-      case import_configs5.FAILED_ASSERT_NE_SIGNAL: {
-        const suffix = logs.length >= 2 ? ` comparing ${stringify(lastButOneLog)} and ${stringify(lastLog)}.` : ".";
-        reason = "assert_ne";
-        errorMessage = `The transaction reverted because of an "assert_ne" statement${suffix}`;
-        break;
-      }
-      case import_configs5.FAILED_ASSERT_SIGNAL:
-        reason = "assert";
-        errorMessage = `The transaction reverted because an "assert" statement failed to evaluate to true.`;
-        break;
-      case import_configs5.FAILED_TRANSFER_TO_ADDRESS_SIGNAL:
-        reason = "MissingOutputVariable";
-        errorMessage = `The transaction reverted because it's missing an "OutputVariable".`;
-        break;
-      default:
-        throw new import_errors9.FuelError(
-          import_errors9.ErrorCode.UNKNOWN,
-          `The transaction reverted with an unknown reason: ${revertReceipt.val}`,
-          {
-            ...metadata,
-            reason: "unknown"
-          }
-        );
+  const lastLog = logs[logs.length - 1];
+  const lastButOneLog = logs[logs.length - 2];
+  switch (reasonHex) {
+    case import_configs5.FAILED_REQUIRE_SIGNAL: {
+      reason = "require";
+      errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
+      break;
+    }
+    case import_configs5.FAILED_ASSERT_EQ_SIGNAL: {
+      const suffix = logs.length >= 2 ? ` comparing ${stringify(lastLog)} and ${stringify(lastButOneLog)}.` : ".";
+      reason = "assert_eq";
+      errorMessage = `The transaction reverted because of an "assert_eq" statement${suffix}`;
+      break;
     }
+    case import_configs5.FAILED_ASSERT_NE_SIGNAL: {
+      const suffix = logs.length >= 2 ? ` comparing ${stringify(lastButOneLog)} and ${stringify(lastLog)}.` : ".";
+      reason = "assert_ne";
+      errorMessage = `The transaction reverted because of an "assert_ne" statement${suffix}`;
+      break;
+    }
+    case import_configs5.FAILED_ASSERT_SIGNAL:
+      reason = "assert";
+      errorMessage = `The transaction reverted because an "assert" statement failed to evaluate to true.`;
+      break;
+    case import_configs5.FAILED_TRANSFER_TO_ADDRESS_SIGNAL:
+      reason = "MissingOutputVariable";
+      errorMessage = `The transaction reverted because it's missing an "OutputVariable".`;
+      break;
+    default:
+      reason = `revert_with_log`;
+      errorMessage = `The transaction reverted because a "revert_with_log" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
+      break;
   }
   return new import_errors9.FuelError(import_errors9.ErrorCode.SCRIPT_REVERTED, errorMessage, {
     ...metadata,
     reason
   });
+}, "assembleSignalErrorMessage");
+function buildAbiErrorMessage(abiError, logs, metadata, reason) {
+  const { pos, msg } = abiError;
+  let errorMessage = "";
+  const positionMessage = pos ? `
+
+This error originated at ${JSON.stringify(pos, null, 2)}` : "";
+  if (msg) {
+    errorMessage = `A sway "panic" expression was invoked with the message: "${msg}".${positionMessage}`;
+  } else {
+    const value = logs[logs.length - 1];
+    errorMessage = `A sway "panic" expression was invoked with the value: ${JSON.stringify(value)}.${positionMessage}`;
+  }
+  return new import_errors9.FuelError(import_errors9.ErrorCode.SCRIPT_REVERTED, errorMessage, {
+    ...metadata,
+    abiError,
+    reason
+  });
+}
+__name(buildAbiErrorMessage, "buildAbiErrorMessage");
+function findErrorInAbis(statusReason, abis = []) {
+  for (const abi of abis) {
+    if (abi.errorCodes?.[statusReason]) {
+      return abi.errorCodes[statusReason];
+    }
+  }
+  return void 0;
+}
+__name(findErrorInAbis, "findErrorInAbis");
+var assembleRevertError = /* @__PURE__ */ __name((_receipts, logs, metadata, statusReason, abis) => {
+  const match = statusReason.match(/Revert\((\d+)\)/);
+  const reason = match?.[1] ?? statusReason;
+  const reasonHex = (0, import_math8.bn)(reason).toHex();
+  if (Object.values(import_configs5.SwaySignalErrors).includes(reasonHex)) {
+    return assembleSignalErrorMessage(reasonHex, logs, metadata);
+  }
+  let abiError;
+  if (abis) {
+    const abisArr = [abis.main, ...Object.values(abis.otherContractsAbis)];
+    abiError = findErrorInAbis(reason, abisArr);
+  }
+  if (abiError) {
+    return buildAbiErrorMessage(abiError, logs, metadata, reason);
+  }
+  const errorMessage = `The transaction reverted with reason: ${reason}.`;
+  return new import_errors9.FuelError(import_errors9.ErrorCode.SCRIPT_REVERTED, errorMessage, {
+    ...metadata,
+    reason
+  });
 }, "assembleRevertError");
 var extractTxError = /* @__PURE__ */ __name((params) => {
-  const { receipts, statusReason, logs, groupedLogs } = params;
+  const { receipts, statusReason, logs, groupedLogs, abis } = params;
   const isPanic = receipts.some(({ type }) => type === import_transactions7.ReceiptType.Panic);
   const isRevert = receipts.some(({ type }) => type === import_transactions7.ReceiptType.Revert);
   const metadata = {
@@ -2956,7 +3040,7 @@ var extractTxError = /* @__PURE__ */ __name((params) => {
   if (isPanic) {
     return assemblePanicError(statusReason, metadata);
   }
-  return assembleRevertError(receipts, logs, metadata);
+  return assembleRevertError(receipts, logs, metadata, statusReason, abis);
 }, "extractTxError");
 
 // src/providers/utils/merge-quantities.ts
@@ -3929,11 +4013,15 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    * @deprecated Use `provider.assembleTx` instead.
    * Check the migration guide https://docs.fuel.network/guide/assembling-transactions/migration-guide.html for more information.
    */
-  async estimateAndFund(account, { signatureCallback, quantities = [] } = {}) {
+  async estimateAndFund(account, {
+    signatureCallback,
+    quantities = [],
+    skipAutoConsolidation
+  } = {}) {
     const txCost = await account.getTransactionCost(this, { signatureCallback, quantities });
     this.maxFee = txCost.maxFee;
     this.gasLimit = txCost.gasUsed;
-    await account.fund(this, txCost);
+    await account.fund(this, txCost, { skipAutoConsolidation });
     return this;
   }
   /**
@@ -4500,12 +4588,12 @@ var ResourceCache = class {
 var import_errors19 = require("@fuel-ts/errors");
 var import_math19 = require("@fuel-ts/math");
 var import_transactions23 = require("@fuel-ts/transactions");
-var import_utils29 = require("@fuel-ts/utils");
+var import_utils30 = require("@fuel-ts/utils");
 
 // src/providers/transaction-summary/assemble-transaction-summary.ts
 var import_math18 = require("@fuel-ts/math");
 var import_transactions21 = require("@fuel-ts/transactions");
-var import_utils27 = require("@fuel-ts/utils");
+var import_utils28 = require("@fuel-ts/utils");
 
 // src/providers/transaction-summary/calculate-tx-fee-for-summary.ts
 var import_math14 = require("@fuel-ts/math");
@@ -4578,6 +4666,45 @@ var import_configs11 = require("@fuel-ts/address/configs");
 var import_errors17 = require("@fuel-ts/errors");
 var import_math16 = require("@fuel-ts/math");
 var import_transactions19 = require("@fuel-ts/transactions");
+var import_utils26 = require("@fuel-ts/utils");
+
+// src/providers/transaction-summary/call.ts
+var import_abi_coder5 = require("@fuel-ts/abi-coder");
+var import_abi_coder6 = require("@fuel-ts/abi-coder");
+var getFunctionCall = /* @__PURE__ */ __name(({
+  abi,
+  receipt,
+  offset,
+  scriptData
+}) => {
+  const [functionSelector, argumentsOffset] = new import_abi_coder5.StdStringCoder().decode(scriptData, offset);
+  const abiInterface = new import_abi_coder6.Interface(abi);
+  const functionFragment = abiInterface.getFunction(functionSelector);
+  const inputs = functionFragment.jsonFn.inputs;
+  let argumentsProvided;
+  if (inputs.length) {
+    const functionArgsBytes = scriptData.slice(argumentsOffset);
+    const decodedArguments = functionFragment.decodeArguments(functionArgsBytes);
+    argumentsProvided = inputs.reduce((prev, input, index) => {
+      const value = decodedArguments?.[index];
+      const name = input.name;
+      if (name) {
+        return {
+          ...prev,
+          // reparse to remove bn
+          [name]: JSON.parse(JSON.stringify(value))
+        };
+      }
+      return prev;
+    }, {});
+  }
+  return {
+    functionSignature: functionFragment.signature,
+    functionName: functionFragment.name,
+    argumentsProvided,
+    ...receipt.amount?.isZero() ? {} : { amount: receipt.amount, assetId: receipt.assetId }
+  };
+}, "getFunctionCall");
 
 // src/providers/transaction-summary/input.ts
 var import_errors16 = require("@fuel-ts/errors");
@@ -4861,12 +4988,45 @@ function getWithdrawFromFuelOperations({
   return withdrawFromFuelOperations;
 }
 __name(getWithdrawFromFuelOperations, "getWithdrawFromFuelOperations");
-function getContractCalls(contractInput, abiMap, _receipt, _rawPayload, _maxInputs) {
-  const abi = abiMap?.[contractInput.contractID];
-  if (!abi) {
-    return [];
+function findBytesSegmentIndex(whole, segment) {
+  for (let i = 0; i <= whole.length - segment.length; i++) {
+    let match = true;
+    for (let j = 0; j < segment.length; j++) {
+      if (whole[i + j] !== segment[j]) {
+        match = false;
+        break;
+      }
+    }
+    if (match) {
+      return i;
+    }
   }
-  return [];
+  return -1;
+}
+__name(findBytesSegmentIndex, "findBytesSegmentIndex");
+function getContractCalls(contractInput, abiMap, receipt, scriptData) {
+  const calls = [];
+  const abi = abiMap?.[contractInput.contractID];
+  if (!abi || !scriptData) {
+    return calls;
+  }
+  const bytesSegment = (0, import_utils26.concat)([
+    (0, import_utils26.arrayify)(receipt.to),
+    // Contract ID (32 bytes)
+    (0, import_math16.toBytes)(receipt.param1.toHex(), 8),
+    // Function selector offset (8 bytes)
+    (0, import_math16.toBytes)(receipt.param2.toHex(), 8)
+    // Function args offset (8 bytes)
+  ]);
+  const segmentIndex = findBytesSegmentIndex(scriptData, bytesSegment);
+  const canDecodeFunctionCall = segmentIndex !== -1;
+  if (!canDecodeFunctionCall) {
+    return calls;
+  }
+  const offset = segmentIndex + bytesSegment.length;
+  const call = getFunctionCall({ abi, receipt, offset, scriptData });
+  calls.push(call);
+  return calls;
 }
 __name(getContractCalls, "getContractCalls");
 function getAssetsSent(receipt) {
@@ -4878,14 +5038,14 @@ function getAssetsSent(receipt) {
   ];
 }
 __name(getAssetsSent, "getAssetsSent");
-function processCallReceipt(receipt, contractInput, inputs, abiMap, rawPayload, maxInputs, baseAssetId) {
+function processCallReceipt(receipt, contractInput, inputs, abiMap, scriptData, baseAssetId) {
   const assetId = receipt.assetId === import_configs11.ZeroBytes32 ? baseAssetId : receipt.assetId;
   const input = getInputFromAssetId(inputs, assetId, assetId === baseAssetId);
   if (!input) {
     return [];
   }
   const inputAddress = getInputAccountAddress(input);
-  const calls = getContractCalls(contractInput, abiMap, receipt, rawPayload, maxInputs);
+  const calls = getContractCalls(contractInput, abiMap, receipt, scriptData);
   return [
     {
       name: "Contract call" /* contractCall */,
@@ -4910,7 +5070,6 @@ function getContractCallOperations({
   receipts,
   abiMap,
   rawPayload,
-  maxInputs,
   baseAssetId
 }) {
   const contractCallReceipts = getReceiptsCall(receipts);
@@ -4920,16 +5079,15 @@ function getContractCallOperations({
     if (!contractInput) {
       return [];
     }
+    let scriptData;
+    if (rawPayload) {
+      const [transaction] = new import_transactions19.TransactionCoder().decode((0, import_utils26.arrayify)(rawPayload), 0);
+      if (transaction.type === import_transactions19.TransactionType.Script) {
+        scriptData = (0, import_utils26.arrayify)(transaction.scriptData);
+      }
+    }
     return contractCallReceipts.filter((receipt) => receipt.to === contractInput.contractID).flatMap(
-      (receipt) => processCallReceipt(
-        receipt,
-        contractInput,
-        inputs,
-        abiMap,
-        rawPayload,
-        maxInputs,
-        baseAssetId
-      )
+      (receipt) => processCallReceipt(receipt, contractInput, inputs, abiMap, scriptData, baseAssetId)
     );
   });
 }
@@ -5253,7 +5411,7 @@ function assembleTransactionSummary(params) {
     baseAssetId
   } = params;
   const gasUsed = getGasUsedFromReceipts(receipts);
-  const rawPayload = (0, import_utils27.hexlify)(transactionBytes);
+  const rawPayload = (0, import_utils28.hexlify)(transactionBytes);
   const operations = getOperations({
     transactionType: transaction.type,
     inputs: transaction.inputs || [],
@@ -5284,7 +5442,7 @@ function assembleTransactionSummary(params) {
   const burnedAssets = extractBurnedAssetsFromReceipts(receipts);
   let date;
   if (time) {
-    date = import_utils27.DateTime.fromTai64(time);
+    date = import_utils28.DateTime.fromTai64(time);
   }
   const transactionSummary = {
     id,
@@ -5345,7 +5503,7 @@ function assemblePreConfirmationTransactionSummary(params) {
     type = getTransactionTypeName(transaction.type);
     tip = (0, import_math18.bn)(transaction.policies?.find((policy) => policy.type === import_transactions21.PolicyType.Tip)?.data);
     if (receipts) {
-      const rawPayload = (0, import_utils27.hexlify)(new import_transactions21.TransactionCoder().encode(transaction));
+      const rawPayload = (0, import_utils28.hexlify)(new import_transactions21.TransactionCoder().encode(transaction));
       operations = getOperations({
         transactionType: transaction.type,
         inputs: transaction.inputs || [],
@@ -5391,7 +5549,7 @@ function assemblePreConfirmationTransactionSummary(params) {
 __name(assemblePreConfirmationTransactionSummary, "assemblePreConfirmationTransactionSummary");
 
 // src/providers/transaction-response/getAllDecodedLogs.ts
-var import_abi_coder5 = require("@fuel-ts/abi-coder");
+var import_abi_coder7 = require("@fuel-ts/abi-coder");
 var import_configs12 = require("@fuel-ts/address/configs");
 var import_transactions22 = require("@fuel-ts/transactions");
 function getAllDecodedLogs(opts) {
@@ -5411,8 +5569,8 @@ function getAllDecodedLogs(opts) {
         const isLogFromMainAbi = receipt.id === import_configs12.ZeroBytes32 || mainContract === receipt.id;
         const isDecodable = isLogFromMainAbi || externalAbis[receipt.id];
         if (isDecodable) {
-          const interfaceToUse = isLogFromMainAbi ? new import_abi_coder5.Interface(mainAbi) : new import_abi_coder5.Interface(externalAbis[receipt.id]);
-          const data = receipt.type === import_transactions22.ReceiptType.Log ? new import_abi_coder5.BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
+          const interfaceToUse = isLogFromMainAbi ? new import_abi_coder7.Interface(mainAbi) : new import_abi_coder7.Interface(externalAbis[receipt.id]);
+          const data = receipt.type === import_transactions22.ReceiptType.Log ? new import_abi_coder7.BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
           const [decodedLog] = interfaceToUse.decodeLog(data, receipt.rb.toString());
           logs.push(decodedLog);
           groupedLogs[receipt.id] = [...groupedLogs[receipt.id] || [], decodedLog];
@@ -5427,25 +5585,6 @@ __name(getAllDecodedLogs, "getAllDecodedLogs");
 
 // src/providers/transaction-response/transaction-response.ts
 var TransactionResponse = class _TransactionResponse {
-  /**
-   * Constructor for `TransactionResponse`.
-   *
-   * @param tx - The transaction ID or TransactionRequest.
-   * @param provider - The provider.
-   */
-  constructor(tx, provider, chainId, abis, submitTxSubscription) {
-    this.submitTxSubscription = submitTxSubscription;
-    if (typeof tx === "string") {
-      this.id = tx;
-    } else {
-      this.id = tx.getTransactionId(chainId);
-      this.request = tx;
-    }
-    this.provider = provider;
-    this.abis = abis;
-    this.waitForResult = this.waitForResult.bind(this);
-    this.waitForPreConfirmation = this.waitForPreConfirmation.bind(this);
-  }
   static {
     __name(this, "TransactionResponse");
   }
@@ -5460,9 +5599,42 @@ var TransactionResponse = class _TransactionResponse {
   request;
   status;
   abis;
+  submitTxSubscription;
   preConfirmationStatus;
   waitingForStreamData = false;
   statusResolvers = /* @__PURE__ */ new Map();
+  /**
+   * Constructor for `TransactionResponse`.
+   */
+  constructor(constructorParams, provider, chainId, abis, submitTxSubscription) {
+    let tx;
+    let _provider;
+    let _chainId;
+    let _abis;
+    if (typeof constructorParams === "object" && "provider" in constructorParams && arguments.length === 1) {
+      tx = constructorParams.transactionRequestOrId;
+      _provider = constructorParams.provider;
+      _chainId = constructorParams.chainId;
+      _abis = constructorParams.abis;
+      this.submitTxSubscription = constructorParams.submitAndAwaitSubscription;
+    } else {
+      tx = constructorParams;
+      _provider = provider;
+      _chainId = chainId;
+      _abis = abis;
+      this.submitTxSubscription = submitTxSubscription;
+    }
+    if (typeof tx === "string") {
+      this.id = tx;
+    } else {
+      this.id = tx.getTransactionId(_chainId);
+      this.request = tx;
+    }
+    this.provider = _provider;
+    this.abis = _abis;
+    this.waitForResult = this.waitForResult.bind(this);
+    this.waitForPreConfirmation = this.waitForPreConfirmation.bind(this);
+  }
   /**
    * Async constructor for `TransactionResponse`. This method can be used to create
    * an instance of `TransactionResponse` and wait for the transaction to be fetched
@@ -5511,7 +5683,7 @@ var TransactionResponse = class _TransactionResponse {
     }
     const gqlTransaction = this.gqlTransaction ?? await this.fetch();
     const { rawPayload } = gqlTransaction;
-    const bytes = (0, import_utils29.arrayify)(rawPayload);
+    const bytes = (0, import_utils30.arrayify)(rawPayload);
     const [tx] = new import_transactions23.TransactionCoder().decode(bytes, 0);
     return {
       tx,
@@ -5699,6 +5871,7 @@ var TransactionResponse = class _TransactionResponse {
       ...transactionSummary
     };
     let { logs, groupedLogs } = { logs: [], groupedLogs: {} };
+    let abis;
     if (this.abis) {
       ({ logs, groupedLogs } = getAllDecodedLogs({
         receipts: transactionSummary.receipts,
@@ -5707,6 +5880,7 @@ var TransactionResponse = class _TransactionResponse {
       }));
       transactionResult.logs = logs;
       transactionResult.groupedLogs = groupedLogs;
+      abis = this.abis;
     }
     const { receipts } = transactionResult;
     const status = this.getTransactionStatus();
@@ -5716,7 +5890,8 @@ var TransactionResponse = class _TransactionResponse {
         receipts,
         statusReason: reason,
         logs,
-        groupedLogs
+        groupedLogs,
+        abis
       });
     }
     return transactionResult;
@@ -5778,12 +5953,12 @@ var TransactionResponse = class _TransactionResponse {
 };
 
 // src/providers/transaction-response/getDecodedLogs.ts
-var import_abi_coder6 = require("@fuel-ts/abi-coder");
+var import_abi_coder8 = require("@fuel-ts/abi-coder");
 var import_configs13 = require("@fuel-ts/address/configs");
 var import_transactions24 = require("@fuel-ts/transactions");
 
 // src/providers/utils/auto-retry-fetch.ts
-var import_utils31 = require("@fuel-ts/utils");
+var import_utils32 = require("@fuel-ts/utils");
 function getWaitDelay(options, retryAttemptNum) {
   const duration = options.baseDelay ?? 150;
   switch (options.backoff) {
@@ -5814,7 +5989,7 @@ function autoRetryFetch(fetchFn, options, retryAttemptNum = 0) {
         throw error;
       }
       const delay = getWaitDelay(options, retryNum);
-      await (0, import_utils31.sleep)(delay);
+      await (0, import_utils32.sleep)(delay);
       return autoRetryFetch(fetchFn, options, retryNum)(...args);
     }
   };
@@ -5954,7 +6129,7 @@ var Provider = class _Provider {
     return url.replace(/-sub$/, "");
   }
   static hasWriteOperationHappened(url) {
-    return (0, import_utils32.isDefined)(_Provider.currentBlockHeightCache[this.normalizeUrl(url)]);
+    return (0, import_utils33.isDefined)(_Provider.currentBlockHeightCache[this.normalizeUrl(url)]);
   }
   /**
    * @hidden
@@ -5976,7 +6151,15 @@ var Provider = class _Provider {
       if (_Provider.ENABLE_RPC_CONSISTENCY && _Provider.hasWriteOperationHappened(url)) {
         _Provider.applyBlockHeight(fullRequest, url);
       }
-      return _Provider.fetchAndProcessBlockHeight(url, fullRequest, options);
+      const response = await _Provider.fetchAndProcessBlockHeight(url, fullRequest, options);
+      if (response.body === null) {
+        throw new import_errors21.FuelError(
+          import_errors21.ErrorCode.RESPONSE_BODY_EMPTY,
+          "The response from the server is missing the body",
+          { timestamp: (/* @__PURE__ */ new Date()).toISOString(), request, response }
+        );
+      }
+      return response;
     }, retryOptions);
   }
   static applyBlockHeight(request, url) {
@@ -5999,24 +6182,26 @@ var Provider = class _Provider {
       baseDelay: 500
     };
     for (let retriesLeft = retryOptions.maxRetries; retriesLeft > 0; --retriesLeft) {
-      const { extensions } = await parseGraphqlResponse({
-        response,
-        isSubscription: url.endsWith("-sub")
-      });
-      _Provider.setCurrentBlockHeight(url, extensions?.current_fuel_block_height);
-      if (!extensions?.fuel_block_height_precondition_failed) {
-        break;
+      if (response.body) {
+        const { extensions } = await parseGraphqlResponse({
+          response,
+          isSubscription: url.endsWith("-sub")
+        });
+        _Provider.setCurrentBlockHeight(url, extensions?.current_fuel_block_height);
+        if (!extensions?.fuel_block_height_precondition_failed) {
+          break;
+        }
       }
       const retryAttempt = retryOptions.maxRetries - retriesLeft + 1;
       const sleepTime = getWaitDelay(retryOptions, retryAttempt);
-      await (0, import_utils32.sleep)(sleepTime);
+      await (0, import_utils33.sleep)(sleepTime);
       response = await fetchFn();
     }
     return response;
   }
   static setCurrentBlockHeight(url, height) {
     const writeOperationHappened = _Provider.hasWriteOperationHappened(url);
-    if (!(0, import_utils32.isDefined)(height) || !writeOperationHappened) {
+    if (!(0, import_utils33.isDefined)(height) || !writeOperationHappened) {
       return;
     }
     const normalizedUrl = _Provider.normalizeUrl(url);
@@ -6051,7 +6236,7 @@ var Provider = class _Provider {
       _Provider.chainInfoCache[this.urlWithoutAuth] = chain;
       _Provider.nodeInfoCache[this.urlWithoutAuth] = nodeInfo;
     }
-    if ((0, import_utils32.isDefined)(resourceCacheTTL)) {
+    if ((0, import_utils33.isDefined)(resourceCacheTTL)) {
       if (resourceCacheTTL !== -1) {
         this.cache = new ResourceCache(resourceCacheTTL);
       } else {
@@ -6414,7 +6599,7 @@ var Provider = class _Provider {
       await this.estimateTxDependencies(transactionRequest);
     }
     await this.validateTransaction(transactionRequest);
-    const encodedTransaction = (0, import_utils32.hexlify)(transactionRequest.toTransactionBytes());
+    const encodedTransaction = (0, import_utils33.hexlify)(transactionRequest.toTransactionBytes());
     let abis;
     if (isTransactionTypeScript(transactionRequest)) {
       abis = transactionRequest.abis;
@@ -6428,7 +6613,13 @@ var Provider = class _Provider {
       transactionRequest.getTransactionId(await this.getChainId())
     );
     const chainId = await this.getChainId();
-    return new TransactionResponse(transactionRequest, this, chainId, abis, subscription);
+    return new TransactionResponse({
+      transactionRequestOrId: transactionRequest,
+      provider: this,
+      chainId,
+      abis,
+      submitAndAwaitSubscription: subscription
+    });
   }
   /**
    * Executes a transaction without actually submitting it to the chain.
@@ -6445,7 +6636,7 @@ var Provider = class _Provider {
     if (estimateTxDependencies) {
       return this.estimateTxDependencies(transactionRequest);
     }
-    const encodedTransaction = (0, import_utils32.hexlify)(transactionRequest.toTransactionBytes());
+    const encodedTransaction = (0, import_utils33.hexlify)(transactionRequest.toTransactionBytes());
     const { dryRun: dryRunStatuses } = await this.operations.dryRun({
       encodedTransactions: encodedTransaction,
       utxoValidation: utxoValidation || false
@@ -6469,7 +6660,7 @@ var Provider = class _Provider {
     if (!shouldEstimatePredicates) {
       return transactionRequest;
     }
-    const encodedTransaction = (0, import_utils32.hexlify)(transactionRequest.toTransactionBytes());
+    const encodedTransaction = (0, import_utils33.hexlify)(transactionRequest.toTransactionBytes());
     const response = await this.operations.estimatePredicates({
       encodedTransaction
     });
@@ -6501,7 +6692,7 @@ var Provider = class _Provider {
       estimatePredicates
     } = await this.operations.estimatePredicatesAndGasPrice({
       blockHorizon: String(blockHorizon),
-      encodedTransaction: (0, import_utils32.hexlify)(transactionRequest.toTransactionBytes())
+      encodedTransaction: (0, import_utils33.hexlify)(transactionRequest.toTransactionBytes())
     });
     transactionRequest = this.parseEstimatePredicatesResponse(
       transactionRequest,
@@ -6539,7 +6730,7 @@ var Provider = class _Provider {
       const {
         dryRun: [{ receipts: serializedReceipts, status }]
       } = await this.operations.dryRun({
-        encodedTransactions: [(0, import_utils32.hexlify)(transactionRequest.toTransactionBytes())],
+        encodedTransactions: [(0, import_utils33.hexlify)(transactionRequest.toTransactionBytes())],
         utxoValidation: false,
         gasPrice: gasPrice.toString()
       });
@@ -6594,7 +6785,7 @@ var Provider = class _Provider {
     const serializedTransactionsMap = /* @__PURE__ */ new Map();
     allRequests.forEach((req, index) => {
       if (isTransactionTypeScript(req)) {
-        serializedTransactionsMap.set(index, (0, import_utils32.hexlify)(req.toTransactionBytes()));
+        serializedTransactionsMap.set(index, (0, import_utils33.hexlify)(req.toTransactionBytes()));
       }
     });
     let transactionsToProcess = Array.from(serializedTransactionsMap.keys());
@@ -6630,7 +6821,7 @@ var Provider = class _Provider {
             transactionRequest: request
           });
           request.maxFee = maxFee;
-          serializedTransactionsMap.set(requestIdx, (0, import_utils32.hexlify)(request.toTransactionBytes()));
+          serializedTransactionsMap.set(requestIdx, (0, import_utils33.hexlify)(request.toTransactionBytes()));
           nextRoundTransactions.push(requestIdx);
         }
       }
@@ -6651,7 +6842,7 @@ var Provider = class _Provider {
     if (estimateTxDependencies) {
       return this.estimateMultipleTxDependencies(transactionRequests);
     }
-    const encodedTransactions = transactionRequests.map((tx) => (0, import_utils32.hexlify)(tx.toTransactionBytes()));
+    const encodedTransactions = transactionRequests.map((tx) => (0, import_utils33.hexlify)(tx.toTransactionBytes()));
     const { dryRun: dryRunStatuses } = await this.operations.dryRun({
       encodedTransactions,
       utxoValidation: utxoValidation || false
@@ -6701,7 +6892,7 @@ var Provider = class _Provider {
     const chainInfo = await this.getChain();
     const { gasPriceFactor, maxGasPerTx } = await this.getGasConfig();
     const minGas = transactionRequest.calculateMinGas(chainInfo);
-    if (!(0, import_utils32.isDefined)(gasPrice)) {
+    if (!(0, import_utils33.isDefined)(gasPrice)) {
       gasPrice = await this.estimateGasPrice(10);
     }
     const minFee = calculateGasFee({
@@ -6753,7 +6944,7 @@ var Provider = class _Provider {
     if (estimateTxDependencies) {
       return this.estimateTxDependencies(transactionRequest);
     }
-    const encodedTransactions = [(0, import_utils32.hexlify)(transactionRequest.toTransactionBytes())];
+    const encodedTransactions = [(0, import_utils33.hexlify)(transactionRequest.toTransactionBytes())];
     const { dryRun: dryRunStatuses } = await this.operations.dryRun({
       encodedTransactions,
       utxoValidation: true
@@ -6916,7 +7107,7 @@ var Provider = class _Provider {
     const {
       assembleTx: { status, transaction: gqlTransaction, gasPrice }
     } = await this.operations.assembleTx({
-      tx: (0, import_utils32.hexlify)(request.toTransactionBytes()),
+      tx: (0, import_utils33.hexlify)(request.toTransactionBytes()),
       blockHorizon: String(blockHorizon),
       feeAddressIndex: String(feePayerIndex),
       requiredBalances,
@@ -6968,7 +7159,7 @@ var Provider = class _Provider {
         paginationLimit: RESOURCES_PAGE_SIZE_LIMIT,
         inputArgs: paginationArgs
       }),
-      filter: { owner: ownerAddress.toB256(), assetId: assetId && (0, import_utils32.hexlify)(assetId) }
+      filter: { owner: ownerAddress.toB256(), assetId: assetId && (0, import_utils33.hexlify)(assetId) }
     });
     const coins = edges.map(({ node }) => ({
       id: node.utxoId,
@@ -7000,7 +7191,7 @@ var Provider = class _Provider {
     const coinsQuery = {
       owner: ownerAddress.toB256(),
       queryPerAsset: quantities.map(coinQuantityfy).map(({ assetId, amount, max: maxPerAsset }) => ({
-        assetId: (0, import_utils32.hexlify)(assetId),
+        assetId: (0, import_utils33.hexlify)(assetId),
         amount: (amount.eqn(0) ? (0, import_math20.bn)(1) : amount).toString(10),
         max: maxPerAsset ? maxPerAsset.toString(10) : void 0
       })),
@@ -7158,7 +7349,7 @@ var Provider = class _Provider {
       },
       transactionIds: block.transactions.map((tx) => tx.id),
       transactions: block.transactions.map(
-        (tx) => new import_transactions25.TransactionCoder().decode((0, import_utils32.arrayify)(tx.rawPayload), 0)?.[0]
+        (tx) => new import_transactions25.TransactionCoder().decode((0, import_utils33.arrayify)(tx.rawPayload), 0)?.[0]
       )
     };
   }
@@ -7175,7 +7366,7 @@ var Provider = class _Provider {
     }
     try {
       return new import_transactions25.TransactionCoder().decode(
-        (0, import_utils32.arrayify)(transaction.rawPayload),
+        (0, import_utils33.arrayify)(transaction.rawPayload),
         0
       )?.[0];
     } catch (error) {
@@ -7203,7 +7394,7 @@ var Provider = class _Provider {
     const coder = new import_transactions25.TransactionCoder();
     const transactions = edges.map(({ node: { rawPayload } }) => {
       try {
-        return coder.decode((0, import_utils32.arrayify)(rawPayload), 0)[0];
+        return coder.decode((0, import_utils33.arrayify)(rawPayload), 0)[0];
       } catch (error) {
         if (error instanceof import_errors21.FuelError && error.code === import_errors21.ErrorCode.UNSUPPORTED_TRANSACTION_TYPE) {
           console.warn("Unsupported transaction type encountered");
@@ -7252,7 +7443,7 @@ var Provider = class _Provider {
   async getContractBalance(contractId, assetId) {
     const { contractBalance } = await this.operations.getContractBalance({
       contract: new import_address4.Address(contractId).toB256(),
-      asset: (0, import_utils32.hexlify)(assetId)
+      asset: (0, import_utils33.hexlify)(assetId)
     });
     return (0, import_math20.bn)(contractBalance.amount, 10);
   }
@@ -7266,7 +7457,7 @@ var Provider = class _Provider {
   async getBalance(owner, assetId) {
     const { balance } = await this.operations.getBalanceV2({
       owner: new import_address4.Address(owner).toB256(),
-      assetId: (0, import_utils32.hexlify)(assetId)
+      assetId: (0, import_utils33.hexlify)(assetId)
     });
     return (0, import_math20.bn)(balance.amountU128, 10);
   }
@@ -7471,7 +7662,7 @@ var Provider = class _Provider {
   async produceBlocks(amount, startTime) {
     const { produceBlocks: latestBlockHeight } = await this.operations.produceBlocks({
       blocksToProduce: (0, import_math20.bn)(amount).toString(10),
-      startTimestamp: startTime ? import_utils32.DateTime.fromUnixMilliseconds(startTime).toTai64() : void 0
+      startTimestamp: startTime ? import_utils33.DateTime.fromUnixMilliseconds(startTime).toTai64() : void 0
     });
     return (0, import_math20.bn)(latestBlockHeight);
   }
@@ -7523,7 +7714,11 @@ var Provider = class _Provider {
    */
   async getTransactionResponse(transactionId) {
     const chainId = await this.getChainId();
-    return new TransactionResponse(transactionId, this, chainId);
+    return new TransactionResponse({
+      transactionRequestOrId: transactionId,
+      provider: this,
+      chainId
+    });
   }
   /**
    * Returns Message for given nonce.
@@ -7574,18 +7769,21 @@ var Provider = class _Provider {
   extractDryRunError(transactionRequest, receipts, reason) {
     let logs = [];
     let groupedLogs = {};
+    let abis;
     if (transactionRequest.type === import_transactions25.TransactionType.Script && transactionRequest.abis) {
       ({ logs, groupedLogs } = getAllDecodedLogs({
         receipts,
         mainAbi: transactionRequest.abis.main,
         externalAbis: transactionRequest.abis.otherContractsAbis
       }));
+      abis = transactionRequest.abis;
     }
     return extractTxError({
       logs,
       groupedLogs,
       receipts,
-      statusReason: reason
+      statusReason: reason,
+      abis
     });
   }
   /**
@@ -7624,8 +7822,8 @@ var Provider = class _Provider {
    */
   async adjustResourcesToIgnoreForAddresses(addresses, resourcesIdsToIgnore) {
     const final = {
-      messages: resourcesIdsToIgnore?.messages?.map((nonce) => (0, import_utils32.hexlify)(nonce)) || [],
-      utxos: resourcesIdsToIgnore?.utxos?.map((id) => (0, import_utils32.hexlify)(id)) || []
+      messages: resourcesIdsToIgnore?.messages?.map((nonce) => (0, import_utils33.hexlify)(nonce)) || [],
+      utxos: resourcesIdsToIgnore?.utxos?.map((id) => (0, import_utils33.hexlify)(id)) || []
     };
     if (this.cache) {
       const cache2 = this.cache;
@@ -7657,16 +7855,16 @@ var Provider = class _Provider {
 var import_errors22 = require("@fuel-ts/errors");
 var import_math21 = require("@fuel-ts/math");
 var import_transactions26 = require("@fuel-ts/transactions");
-var import_utils34 = require("@fuel-ts/utils");
+var import_utils35 = require("@fuel-ts/utils");
 
 // src/providers/transaction-summary/assemble-transaction-summary-from-serialized.ts
 var import_math22 = require("@fuel-ts/math");
 var import_transactions27 = require("@fuel-ts/transactions");
-var import_utils35 = require("@fuel-ts/utils");
+var import_utils36 = require("@fuel-ts/utils");
 
 // src/test-utils/test-asset-id.ts
 var import_crypto4 = require("@fuel-ts/crypto");
-var import_utils36 = require("@fuel-ts/utils");
+var import_utils37 = require("@fuel-ts/utils");
 var TestAssetId = class _TestAssetId {
   constructor(value) {
     this.value = value;
@@ -7683,7 +7881,7 @@ var TestAssetId = class _TestAssetId {
   static random(count = 1) {
     const assetIds = [];
     for (let i = 0; i < count; i++) {
-      assetIds.push(new _TestAssetId((0, import_utils36.hexlify)((0, import_crypto4.randomBytes)(32))));
+      assetIds.push(new _TestAssetId((0, import_utils37.hexlify)((0, import_crypto4.randomBytes)(32))));
     }
     return assetIds;
   }
@@ -7691,23 +7889,23 @@ var TestAssetId = class _TestAssetId {
 
 // src/test-utils/wallet-config.ts
 var import_crypto9 = require("@fuel-ts/crypto");
-var import_errors28 = require("@fuel-ts/errors");
-var import_math25 = require("@fuel-ts/math");
-var import_utils45 = require("@fuel-ts/utils");
+var import_errors29 = require("@fuel-ts/errors");
+var import_math26 = require("@fuel-ts/math");
+var import_utils46 = require("@fuel-ts/utils");
 
 // src/wallet/base-wallet-unlocked.ts
 var import_hasher4 = require("@fuel-ts/hasher");
-var import_utils40 = require("@fuel-ts/utils");
+var import_utils41 = require("@fuel-ts/utils");
 
 // src/account.ts
-var import_abi_coder8 = require("@fuel-ts/abi-coder");
-var import_address6 = require("@fuel-ts/address");
+var import_abi_coder10 = require("@fuel-ts/abi-coder");
+var import_address7 = require("@fuel-ts/address");
 var import_crypto5 = require("@fuel-ts/crypto");
-var import_errors23 = require("@fuel-ts/errors");
-var import_math23 = require("@fuel-ts/math");
-var import_transactions28 = require("@fuel-ts/transactions");
-var import_utils38 = require("@fuel-ts/utils");
-var import_ramda9 = require("ramda");
+var import_errors24 = require("@fuel-ts/errors");
+var import_math24 = require("@fuel-ts/math");
+var import_transactions29 = require("@fuel-ts/transactions");
+var import_utils39 = require("@fuel-ts/utils");
+var import_ramda10 = require("ramda");
 
 // src/types.ts
 var AbstractAccount = class {
@@ -7716,18 +7914,166 @@ var AbstractAccount = class {
   }
 };
 
-// src/utils/formatTransferToContractScriptData.ts
-var import_abi_coder7 = require("@fuel-ts/abi-coder");
+// src/utils/consolidate-coins.ts
 var import_address5 = require("@fuel-ts/address");
-var import_utils37 = require("@fuel-ts/utils");
+var import_errors23 = require("@fuel-ts/errors");
+var import_math23 = require("@fuel-ts/math");
+var import_transactions28 = require("@fuel-ts/transactions");
+var import_ramda9 = require("ramda");
+var CONSOLIDATABLE_ERROR_CODES = [import_errors23.ErrorCode.MAX_COINS_REACHED];
+var consolidateCoinsIfRequired = /* @__PURE__ */ __name(async (opts) => {
+  const { error: errorUnknown, account, skipAutoConsolidation = false } = opts;
+  if (skipAutoConsolidation) {
+    return false;
+  }
+  const error = import_errors23.FuelError.parse(errorUnknown);
+  if (CONSOLIDATABLE_ERROR_CODES.includes(error.code)) {
+    const { assetId, owner } = error.metadata;
+    return account.startConsolidation({
+      owner,
+      assetId
+    });
+  }
+  return false;
+}, "consolidateCoinsIfRequired");
+var getAllCoins = /* @__PURE__ */ __name(async (account, assetId) => {
+  const all = [];
+  let hasNextPage = true;
+  let after;
+  while (hasNextPage) {
+    const { coins, pageInfo } = await account.getCoins(assetId, { after });
+    all.push(...coins);
+    after = coins.pop()?.id;
+    hasNextPage = pageInfo.hasNextPage;
+  }
+  return { coins: all };
+}, "getAllCoins");
+var sortCoins = /* @__PURE__ */ __name(({ coins }) => coins.sort((a, b) => b.amount.cmp(a.amount)), "sortCoins");
+var createOuputCoin = /* @__PURE__ */ __name((opts) => {
+  const { transactionId, outputs, baseAssetId } = opts;
+  const outputChangeIndex = outputs.findIndex(
+    (output) => output.type === import_transactions28.OutputType.Change && output.assetId === baseAssetId
+  );
+  if (outputChangeIndex === -1) {
+    throw new import_errors23.FuelError(import_errors23.ErrorCode.UNKNOWN, "No change output found");
+  }
+  const outputCoin = outputs[outputChangeIndex];
+  const outputIndexPadded = Number(outputChangeIndex).toString().padStart(4, "0");
+  return {
+    id: `${transactionId}${outputIndexPadded}`,
+    assetId: outputCoin.assetId,
+    amount: outputCoin.amount,
+    owner: new import_address5.Address(outputCoin.to),
+    blockCreated: (0, import_math23.bn)(0),
+    txCreatedIdx: (0, import_math23.bn)(0)
+  };
+}, "createOuputCoin");
+var consolidateCoins = /* @__PURE__ */ __name(async ({
+  account,
+  assetId
+}) => {
+  const chainInfo = await account.provider.getChain();
+  const chainId = chainInfo.consensusParameters.chainId.toNumber();
+  const gasPrice = await account.provider.estimateGasPrice(10);
+  const maxInputs = chainInfo.consensusParameters.txParameters.maxInputs.toNumber();
+  const baseAssetId = await account.provider.getBaseAssetId();
+  const isBaseAsset = assetId === baseAssetId;
+  const batchSize = maxInputs;
+  const numberOfFundingCoins = maxInputs;
+  let funding = [];
+  let dust = [];
+  if (isBaseAsset) {
+    const coins = await getAllCoins(account, baseAssetId).then(sortCoins);
+    funding = coins.slice(0, numberOfFundingCoins);
+    dust = coins.slice(numberOfFundingCoins);
+  } else {
+    funding = await getAllCoins(account, baseAssetId).then(sortCoins).then((coins) => coins.slice(0, numberOfFundingCoins));
+    dust = await getAllCoins(account, assetId).then(({ coins }) => coins);
+  }
+  if (funding.length === 0) {
+    throw new import_errors23.FuelError(
+      import_errors23.ErrorCode.INSUFFICIENT_FUNDS,
+      `Insufficient funds to consolidate.
+	Asset ID: ${baseAssetId}
+	Owner: ${account.address.toB256()}`
+    );
+  }
+  const batches = [
+    ...(0, import_ramda9.splitEvery)(batchSize, funding),
+    // We leave one coin for the funding coin
+    ...(0, import_ramda9.splitEvery)(batchSize - 1, dust)
+  ];
+  const txs = batches.map((batch) => {
+    const request = new ScriptTransactionRequest({
+      scriptData: "0x"
+    });
+    request.addResources(batch);
+    return request;
+  });
+  const submitAll = /* @__PURE__ */ __name(async (opts = {}) => {
+    const txResponses = [];
+    let previousTx;
+    for (let i = 0; i < txs.length; i++) {
+      let currentTx = txs[i];
+      const step = i + 1;
+      if (previousTx) {
+        const coin = createOuputCoin({
+          transactionId: previousTx.transactionId,
+          outputs: previousTx.outputs,
+          baseAssetId
+        });
+        currentTx.addResource(coin);
+      }
+      if ("populateTransactionPredicateData" in account && typeof account.populateTransactionPredicateData === "function") {
+        currentTx = account.populateTransactionPredicateData(currentTx);
+        currentTx = await account.provider.estimatePredicates(currentTx);
+      }
+      const fee = calculateGasFee({
+        gasPrice,
+        gas: currentTx.calculateMinGas(chainInfo),
+        priceFactor: chainInfo.consensusParameters.feeParameters.gasPriceFactor,
+        tip: currentTx.tip
+      });
+      currentTx.maxFee = fee;
+      currentTx.gasLimit = (0, import_math23.bn)(1e3);
+      opts.onTransactionStart?.({
+        tx: currentTx,
+        step,
+        assetId,
+        transactionId: currentTx.getTransactionId(chainId)
+      });
+      const response = await account.sendTransaction(currentTx);
+      const result = await response.waitForResult();
+      txResponses.push(result);
+      previousTx = {
+        transactionId: response.id,
+        outputs: result.transaction.outputs
+      };
+    }
+    return {
+      txResponses,
+      errors: []
+    };
+  }, "submitAll");
+  return {
+    txs,
+    totalFeeCost: txs.reduce((acc, request) => acc.add(request.maxFee), (0, import_math23.bn)(0)),
+    submitAll
+  };
+}, "consolidateCoins");
+
+// src/utils/formatTransferToContractScriptData.ts
+var import_abi_coder9 = require("@fuel-ts/abi-coder");
+var import_address6 = require("@fuel-ts/address");
+var import_utils38 = require("@fuel-ts/utils");
 var asm = __toESM(require("@fuels/vm-asm"));
 var formatTransferToContractScriptData = /* @__PURE__ */ __name((transferParams) => {
-  const numberCoder = new import_abi_coder7.BigNumberCoder("u64");
+  const numberCoder = new import_abi_coder9.BigNumberCoder("u64");
   return transferParams.reduce((acc, transferParam) => {
     const { assetId, amount, contractId } = transferParam;
     const encoded = numberCoder.encode(amount);
-    const scriptData = (0, import_utils37.concat)([new import_address5.Address(contractId).toBytes(), encoded, (0, import_utils37.arrayify)(assetId)]);
-    return (0, import_utils37.concat)([acc, scriptData]);
+    const scriptData = (0, import_utils38.concat)([new import_address6.Address(contractId).toBytes(), encoded, (0, import_utils38.arrayify)(assetId)]);
+    return (0, import_utils38.concat)([acc, scriptData]);
   }, new Uint8Array());
 }, "formatTransferToContractScriptData");
 var assembleTransferToContractScript = /* @__PURE__ */ __name(async (transferParams) => {
@@ -7735,24 +8081,24 @@ var assembleTransferToContractScript = /* @__PURE__ */ __name(async (transferPar
   await asm.initWasm();
   let script = new Uint8Array();
   transferParams.forEach((_, i) => {
-    const offset = (import_abi_coder7.CONTRACT_ID_LEN + import_abi_coder7.WORD_SIZE + import_abi_coder7.ASSET_ID_LEN) * i;
-    script = (0, import_utils37.concat)([
+    const offset = (import_abi_coder9.CONTRACT_ID_LEN + import_abi_coder9.WORD_SIZE + import_abi_coder9.ASSET_ID_LEN) * i;
+    script = (0, import_utils38.concat)([
       script,
       // Load ScriptData into register 0x10.
       asm.gtf(16, 0, asm.GTFArgs.ScriptData).to_bytes(),
       // Add the offset to 0x10 so it will point to the current contract ID, store in 0x11.
       asm.addi(17, 16, offset).to_bytes(),
       // Add CONTRACT_ID_LEN to 0x11 to point to the amount in the ScriptData, store in 0x12.
-      asm.addi(18, 17, import_abi_coder7.CONTRACT_ID_LEN).to_bytes(),
+      asm.addi(18, 17, import_abi_coder9.CONTRACT_ID_LEN).to_bytes(),
       // Load word to the amount at 0x12 into register 0x13.
       asm.lw(19, 18, 0).to_bytes(),
       // Add WORD_SIZE to 0x12 to point to the asset ID in the ScriptData, store in 0x14.
-      asm.addi(20, 18, import_abi_coder7.WORD_SIZE).to_bytes(),
+      asm.addi(20, 18, import_abi_coder9.WORD_SIZE).to_bytes(),
       // Perform the transfer using contract ID in 0x11, amount in 0x13, and asset ID in 0x14.
       asm.tr(17, 19, 20).to_bytes()
     ]);
   });
-  script = (0, import_utils37.concat)([script, asm.ret(1).to_bytes()]);
+  script = (0, import_utils38.concat)([script, asm.ret(1).to_bytes()]);
   return { script, scriptData };
 }, "assembleTransferToContractScript");
 
@@ -7797,7 +8143,7 @@ var Account = class extends AbstractAccount {
     super();
     this._provider = provider;
     this._connector = connector;
-    this.address = new import_address6.Address(address);
+    this.address = new import_address7.Address(address);
   }
   /**
    * The provider used to interact with the network.
@@ -7808,7 +8154,7 @@ var Account = class extends AbstractAccount {
    */
   get provider() {
     if (!this._provider) {
-      throw new import_errors23.FuelError(import_errors23.ErrorCode.MISSING_PROVIDER, "Provider not set");
+      throw new import_errors24.FuelError(import_errors24.ErrorCode.MISSING_PROVIDER, "Provider not set");
     }
     return this._provider;
   }
@@ -7835,10 +8181,24 @@ var Account = class extends AbstractAccount {
    *
    * @param quantities - Quantities of resources to be obtained.
    * @param resourcesIdsToIgnore - IDs of resources to be excluded from the query (optional).
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to an array of Resources.
    */
-  async getResourcesToSpend(quantities, resourcesIdsToIgnore) {
-    return this.provider.getResourcesToSpend(this.address, quantities, resourcesIdsToIgnore);
+  async getResourcesToSpend(quantities, resourcesIdsToIgnore, { skipAutoConsolidation } = {}) {
+    const getResourcesToSpend = /* @__PURE__ */ __name(() => this.provider.getResourcesToSpend(this.address, quantities, resourcesIdsToIgnore), "getResourcesToSpend");
+    try {
+      return await getResourcesToSpend();
+    } catch (error) {
+      const shouldRetry = await consolidateCoinsIfRequired({
+        error,
+        account: this,
+        skipAutoConsolidation
+      });
+      if (!shouldRetry) {
+        throw error;
+      }
+      return await getResourcesToSpend();
+    }
   }
   /**
    * Retrieves coins owned by the account.
@@ -7887,7 +8247,7 @@ var Account = class extends AbstractAccount {
    * @deprecated Use provider.assembleTx instead
    * Check the migration guide https://docs.fuel.network/docs/fuels-ts/transactions/assemble-tx-migration-guide/ for more information.
    */
-  async fund(request, params) {
+  async fund(request, params, { skipAutoConsolidation } = {}) {
     const {
       addedSignatures,
       estimatedPredicates,
@@ -7899,9 +8259,9 @@ var Account = class extends AbstractAccount {
     const chainId = await this.provider.getChainId();
     const fee = request.maxFee;
     const baseAssetId = await this.provider.getBaseAssetId();
-    const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || (0, import_math23.bn)(0);
+    const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || (0, import_math24.bn)(0);
     const requiredQuantitiesWithFee = addAmountToCoinQuantities({
-      amount: (0, import_math23.bn)(fee),
+      amount: (0, import_math24.bn)(fee),
       assetId: baseAssetId,
       coinQuantities: requiredQuantities
     });
@@ -7909,7 +8269,7 @@ var Account = class extends AbstractAccount {
     requiredQuantitiesWithFee.forEach(({ amount, assetId }) => {
       quantitiesDict[assetId] = {
         required: amount,
-        owned: (0, import_math23.bn)(0)
+        owned: (0, import_math24.bn)(0)
       };
     });
     request.inputs.filter(isRequestInputResource).forEach((input) => {
@@ -7933,11 +8293,12 @@ var Account = class extends AbstractAccount {
     while (needsToBeFunded && fundingAttempts < MAX_FUNDING_ATTEMPTS) {
       const resources = await this.getResourcesToSpend(
         missingQuantities,
-        cacheRequestInputsResourcesFromOwner(request.inputs, this.address)
+        cacheRequestInputsResourcesFromOwner(request.inputs, this.address),
+        { skipAutoConsolidation }
       );
       request.addResources(resources);
       request.updatePredicateGasUsed(estimatedPredicates);
-      const requestToReestimate2 = (0, import_ramda9.clone)(request);
+      const requestToReestimate2 = (0, import_ramda10.clone)(request);
       if (addedSignatures) {
         Array.from({ length: addedSignatures }).forEach(
           () => requestToReestimate2.addEmptyWitness()
@@ -7970,15 +8331,15 @@ var Account = class extends AbstractAccount {
       fundingAttempts += 1;
     }
     if (needsToBeFunded) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.INSUFFICIENT_FUNDS_OR_MAX_COINS,
+      throw new import_errors24.FuelError(
+        import_errors24.ErrorCode.INSUFFICIENT_FUNDS,
         `The account ${this.address} does not have enough base asset funds to cover the transaction execution.`
       );
     }
     request.updateState(chainId, "funded", transactionSummary);
     await this.provider.validateTransaction(request);
     request.updatePredicateGasUsed(estimatedPredicates);
-    const requestToReestimate = (0, import_ramda9.clone)(request);
+    const requestToReestimate = (0, import_ramda10.clone)(request);
     if (addedSignatures) {
       Array.from({ length: addedSignatures }).forEach(() => requestToReestimate.addEmptyWitness());
     }
@@ -7999,16 +8360,20 @@ var Account = class extends AbstractAccount {
    * @param amount - The amount of coins to transfer.
    * @param assetId - The asset ID of the coins to transfer (optional).
    * @param txParams - The transaction parameters (optional).
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to the prepared transaction request.
    */
-  async createTransfer(destination, amount, assetId, txParams = {}) {
+  async createTransfer(destination, amount, assetId, txParams = {}, { skipAutoConsolidation } = {}) {
     let request = new ScriptTransactionRequest(txParams);
     request = this.addTransfer(request, {
       destination,
       amount,
       assetId: assetId || await this.provider.getBaseAssetId()
     });
-    const { gasPrice, transactionRequest } = await this.assembleTx(request);
+    const { gasPrice, transactionRequest } = await this.assembleTx({
+      transactionRequest: request,
+      skipAutoConsolidation
+    });
     request = await setAndValidateGasAndFeeForAssembledTx({
       gasPrice,
       provider: this.provider,
@@ -8025,10 +8390,13 @@ var Account = class extends AbstractAccount {
    * @param amount - The amount of coins to transfer.
    * @param assetId - The asset ID of the coins to transfer (optional).
    * @param txParams - The transaction parameters (optional).
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to the transaction response.
    */
-  async transfer(destination, amount, assetId, txParams = {}) {
-    const request = await this.createTransfer(destination, amount, assetId, txParams);
+  async transfer(destination, amount, assetId, txParams = {}, { skipAutoConsolidation } = {}) {
+    const request = await this.createTransfer(destination, amount, assetId, txParams, {
+      skipAutoConsolidation
+    });
     return this.sendTransaction(request, { estimateTxDependencies: false });
   }
   /**
@@ -8036,12 +8404,16 @@ var Account = class extends AbstractAccount {
    *
    * @param transferParams - An array of `TransferParams` objects representing the transfers to be made.
    * @param txParams - Optional transaction parameters.
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to a `TransactionResponse` object representing the transaction result.
    */
-  async batchTransfer(transferParams, txParams = {}) {
+  async batchTransfer(transferParams, txParams = {}, { skipAutoConsolidation } = {}) {
     let request = new ScriptTransactionRequest(txParams);
     request = this.addBatchTransfer(request, transferParams);
-    const { gasPrice, transactionRequest } = await this.assembleTx(request);
+    const { gasPrice, transactionRequest } = await this.assembleTx({
+      transactionRequest: request,
+      skipAutoConsolidation
+    });
     request = await setAndValidateGasAndFeeForAssembledTx({
       gasPrice,
       provider: this.provider,
@@ -8061,7 +8433,7 @@ var Account = class extends AbstractAccount {
   addTransfer(request, transferParams) {
     const { destination, amount, assetId } = transferParams;
     this.validateTransferAmount(amount);
-    request.addCoinOutput(new import_address6.Address(destination), amount, assetId);
+    request.addCoinOutput(new import_address7.Address(destination), amount, assetId);
     return request;
   }
   /**
@@ -8088,24 +8460,27 @@ var Account = class extends AbstractAccount {
    * @param amount - The amount of coins to transfer.
    * @param assetId - The asset ID of the coins to transfer (optional).
    * @param txParams - The transaction parameters (optional).
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to the transaction response.
    */
-  async transferToContract(contractId, amount, assetId, txParams = {}) {
-    return this.batchTransferToContracts([{ amount, assetId, contractId }], txParams);
+  async transferToContract(contractId, amount, assetId, txParams = {}, { skipAutoConsolidation } = {}) {
+    return this.batchTransferToContracts([{ amount, assetId, contractId }], txParams, {
+      skipAutoConsolidation
+    });
   }
-  async batchTransferToContracts(contractTransferParams, txParams = {}) {
+  async batchTransferToContracts(contractTransferParams, txParams = {}, { skipAutoConsolidation } = {}) {
     let request = new ScriptTransactionRequest({
       ...txParams
     });
     const quantities = [];
     const defaultAssetId = await this.provider.getBaseAssetId();
     const transferParams = contractTransferParams.map((transferParam) => {
-      const amount = (0, import_math23.bn)(transferParam.amount);
-      const contractAddress = new import_address6.Address(transferParam.contractId);
-      const assetId = transferParam.assetId ? (0, import_utils38.hexlify)(transferParam.assetId) : defaultAssetId;
+      const amount = (0, import_math24.bn)(transferParam.amount);
+      const contractAddress = new import_address7.Address(transferParam.contractId);
+      const assetId = transferParam.assetId ? (0, import_utils39.hexlify)(transferParam.assetId) : defaultAssetId;
       if (amount.lte(0)) {
-        throw new import_errors23.FuelError(
-          import_errors23.ErrorCode.INVALID_TRANSFER_AMOUNT,
+        throw new import_errors24.FuelError(
+          import_errors24.ErrorCode.INVALID_TRANSFER_AMOUNT,
           "Transfer amount must be a positive number."
         );
       }
@@ -8120,7 +8495,11 @@ var Account = class extends AbstractAccount {
     const { script, scriptData } = await assembleTransferToContractScript(transferParams);
     request.script = script;
     request.scriptData = scriptData;
-    const { gasPrice, transactionRequest } = await this.assembleTx(request, quantities);
+    const { gasPrice, transactionRequest } = await this.assembleTx({
+      transactionRequest: request,
+      quantities,
+      skipAutoConsolidation
+    });
     request = await setAndValidateGasAndFeeForAssembledTx({
       gasPrice,
       provider: this.provider,
@@ -8136,26 +8515,31 @@ var Account = class extends AbstractAccount {
    * @param recipient - Address of the recipient on the base chain.
    * @param amount - Amount of base asset.
    * @param txParams - The transaction parameters (optional).
+   * @param skipAutoConsolidation - Whether to skip the automatic consolidatation of coins process (optional).
    * @returns A promise that resolves to the transaction response.
    */
-  async withdrawToBaseLayer(recipient, amount, txParams = {}) {
-    const recipientAddress = new import_address6.Address(recipient);
-    const recipientDataArray = (0, import_utils38.arrayify)(
+  async withdrawToBaseLayer(recipient, amount, txParams = {}, { skipAutoConsolidation } = {}) {
+    const recipientAddress = new import_address7.Address(recipient);
+    const recipientDataArray = (0, import_utils39.arrayify)(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
     );
-    const amountDataArray = (0, import_utils38.arrayify)(
-      "0x".concat((0, import_math23.bn)(amount).toHex().substring(2).padStart(16, "0"))
+    const amountDataArray = (0, import_utils39.arrayify)(
+      "0x".concat((0, import_math24.bn)(amount).toHex().substring(2).padStart(16, "0"))
     );
     const script = new Uint8Array([
-      ...(0, import_utils38.arrayify)(withdrawScript.bytes),
+      ...(0, import_utils39.arrayify)(withdrawScript.bytes),
       ...recipientDataArray,
       ...amountDataArray
     ]);
     const params = { script, ...txParams };
     const baseAssetId = await this.provider.getBaseAssetId();
     let request = new ScriptTransactionRequest(params);
-    const quantities = [{ amount: (0, import_math23.bn)(amount), assetId: baseAssetId }];
-    const { gasPrice, transactionRequest } = await this.assembleTx(request, quantities);
+    const quantities = [{ amount: (0, import_math24.bn)(amount), assetId: baseAssetId }];
+    const { gasPrice, transactionRequest } = await this.assembleTx({
+      transactionRequest: request,
+      quantities,
+      skipAutoConsolidation
+    });
     request = await setAndValidateGasAndFeeForAssembledTx({
       gasPrice,
       provider: this.provider,
@@ -8165,6 +8549,25 @@ var Account = class extends AbstractAccount {
     });
     return this.sendTransaction(request);
   }
+  /**
+   * Start the consolidation process
+   *
+   * @param owner - The B256 address of the owner.
+   * @param assetId - The asset ID that requires consolidation.
+   */
+  async startConsolidation(opts) {
+    if (this._connector) {
+      await this._connector.startConsolidation(opts);
+      return false;
+    }
+    const { owner, assetId } = opts;
+    if (owner !== this.address.toB256()) {
+      return false;
+    }
+    const { submitAll } = await consolidateCoins({ account: this, assetId });
+    await submitAll();
+    return true;
+  }
   /**
    * Consolidates base asset UTXOs into fewer, larger ones.
    *
@@ -8184,6 +8587,7 @@ var Account = class extends AbstractAccount {
     const isBaseAsset = baseAssetId === assetId;
     let submitAll;
     const consolidationParams = {
+      assetId,
       coins,
       mode: params.mode,
       outputNum: params.outputNum
@@ -8191,10 +8595,7 @@ var Account = class extends AbstractAccount {
     if (isBaseAsset) {
       ({ submitAll } = await this.assembleBaseAssetConsolidationTxs(consolidationParams));
     } else {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.UNSUPPORTED_FEATURE,
-        "Consolidation for non-base assets is not supported yet."
-      );
+      ({ submitAll } = await this.assembleNonBaseAssetConsolidationTxs(consolidationParams));
     }
     return submitAll();
   }
@@ -8215,7 +8616,7 @@ var Account = class extends AbstractAccount {
     this.validateConsolidationTxsCoins(coins, baseAssetId);
     const chainInfo = await this.provider.getChain();
     const maxInputsNumber = chainInfo.consensusParameters.txParameters.maxInputs.toNumber();
-    let totalFeeCost = (0, import_math23.bn)(0);
+    let totalFeeCost = (0, import_math24.bn)(0);
     const txs = [];
     const coinsBatches = splitCoinsIntoBatches(coins, maxInputsNumber);
     const gasPrice = await this.provider.estimateGasPrice(10);
@@ -8239,15 +8640,79 @@ var Account = class extends AbstractAccount {
       });
       request.maxFee = fee;
       if (consolidateMoreThanOneCoin) {
-        const total = request.inputs.filter(isRequestInputCoin).reduce((acc, input) => acc.add(input.amount), (0, import_math23.bn)(0));
+        const total = request.inputs.filter(isRequestInputCoin).reduce((acc, input) => acc.add(input.amount), (0, import_math24.bn)(0));
+        const amountPerNewUtxo = total.div(outputNum + 1);
+        request.outputs.forEach((output) => {
+          if (output.type === import_transactions29.OutputType.Coin) {
+            output.amount = amountPerNewUtxo;
+          }
+        });
+      }
+      totalFeeCost = totalFeeCost.add(fee);
+      txs.push(request);
+    });
+    const submitAll = this.prepareSubmitAll({ txs, mode });
+    return { txs, totalFeeCost, submitAll };
+  }
+  async assembleNonBaseAssetConsolidationTxs(params) {
+    const { assetId, coins, mode = "parallel", outputNum = 1 } = params;
+    this.validateConsolidationTxsCoins(coins, assetId);
+    const chainInfo = await this.provider.getChain();
+    const maxInputsNumber = chainInfo.consensusParameters.txParameters.maxInputs.toNumber();
+    const baseAssetId = chainInfo.consensusParameters.baseAssetId;
+    const { coins: baseAssetCoins } = await this.provider.getCoins(this.address, baseAssetId);
+    let totalFeeCost = (0, import_math24.bn)(0);
+    const txs = [];
+    const gasPrice = await this.provider.estimateGasPrice(10);
+    const consolidateMoreThanOneCoin = outputNum > 1;
+    const assetCoinBatches = splitCoinsIntoBatches(coins, maxInputsNumber);
+    assetCoinBatches.filter((batch) => batch.length > 1).forEach((coinBatch) => {
+      const request = new ScriptTransactionRequest({
+        script: "0x"
+      });
+      request.addResources(coinBatch);
+      if (consolidateMoreThanOneCoin) {
+        Array.from({ length: outputNum - 1 }).forEach(() => {
+          request.addCoinOutput(this.address, 0, assetId);
+        });
+      }
+      const minGas = request.calculateMinGas(chainInfo);
+      const fee = calculateGasFee({
+        gasPrice,
+        gas: minGas,
+        priceFactor: chainInfo.consensusParameters.feeParameters.gasPriceFactor,
+        tip: request.tip
+      });
+      request.maxFee = fee;
+      if (consolidateMoreThanOneCoin) {
+        const total = request.inputs.filter(isRequestInputCoin).reduce((acc, input) => acc.add(input.amount), (0, import_math24.bn)(0));
         const amountPerNewUtxo = total.div(outputNum + 1);
         request.outputs.forEach((output) => {
-          if (output.type === import_transactions28.OutputType.Coin) {
+          if (output.type === import_transactions29.OutputType.Coin) {
             output.amount = amountPerNewUtxo;
           }
         });
       }
       totalFeeCost = totalFeeCost.add(fee);
+      const baseAssetResources = [];
+      let fundingFeeTotal = (0, import_math24.bn)(0);
+      while (fundingFeeTotal.lt(fee)) {
+        const baseAssetCoin = baseAssetCoins.pop();
+        if (!baseAssetCoin) {
+          break;
+        }
+        baseAssetResources.push(baseAssetCoin);
+        fundingFeeTotal = fundingFeeTotal.add(baseAssetCoin.amount);
+      }
+      const { inputs } = request;
+      request.inputs = inputs.slice(0, maxInputsNumber - baseAssetResources.length);
+      const removedCoins = coinBatch.slice(maxInputsNumber - baseAssetResources.length);
+      request.addResources(baseAssetResources);
+      const lastCoinBatch = assetCoinBatches[assetCoinBatches.length - 1];
+      lastCoinBatch.push(...removedCoins);
+      if (lastCoinBatch.length > maxInputsNumber) {
+        assetCoinBatches.push(lastCoinBatch.slice(maxInputsNumber));
+      }
       txs.push(request);
     });
     const submitAll = this.prepareSubmitAll({ txs, mode });
@@ -8307,13 +8772,13 @@ var Account = class extends AbstractAccount {
    * Check the migration guide https://docs.fuel.network/docs/fuels-ts/transactions/assemble-tx-migration-guide/ for more information.
    */
   async getTransactionCost(transactionRequestLike, { signatureCallback, quantities = [], gasPrice } = {}) {
-    const txRequestClone = (0, import_ramda9.clone)(transactionRequestify(transactionRequestLike));
+    const txRequestClone = (0, import_ramda10.clone)(transactionRequestify(transactionRequestLike));
     const baseAssetId = await this.provider.getBaseAssetId();
     const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
     const requiredQuantities = mergeQuantities(coinOutputsQuantities, quantities);
-    const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: (0, import_math23.bn)("100000000000000000") }];
+    const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: (0, import_math24.bn)("100000000000000000") }];
     const findAssetInput = /* @__PURE__ */ __name((assetId) => txRequestClone.inputs.find((input) => {
-      if (input.type === import_transactions28.InputType.Coin) {
+      if (input.type === import_transactions29.InputType.Coin) {
         return input.assetId === assetId;
       }
       if (isRequestInputMessageWithoutData(input)) {
@@ -8359,7 +8824,7 @@ var Account = class extends AbstractAccount {
    */
   async signMessage(message) {
     if (!this._connector) {
-      throw new import_errors23.FuelError(import_errors23.ErrorCode.MISSING_CONNECTOR, "A connector is required to sign messages.");
+      throw new import_errors24.FuelError(import_errors24.ErrorCode.MISSING_CONNECTOR, "A connector is required to sign messages.");
     }
     return this._connector.signMessage(this.address.toString(), message);
   }
@@ -8371,8 +8836,8 @@ var Account = class extends AbstractAccount {
    */
   async signTransaction(transactionRequestLike, connectorOptions = {}) {
     if (!this._connector) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.MISSING_CONNECTOR,
+      throw new import_errors24.FuelError(
+        import_errors24.ErrorCode.MISSING_CONNECTOR,
         "A connector is required to sign transactions."
       );
     }
@@ -8437,17 +8902,17 @@ var Account = class extends AbstractAccount {
    */
   generateFakeResources(coins) {
     return coins.map((coin) => ({
-      id: (0, import_utils38.hexlify)((0, import_crypto5.randomBytes)(import_abi_coder8.UTXO_ID_LEN)),
+      id: (0, import_utils39.hexlify)((0, import_crypto5.randomBytes)(import_abi_coder10.UTXO_ID_LEN)),
       owner: this.address,
-      blockCreated: (0, import_math23.bn)(1),
-      txCreatedIdx: (0, import_math23.bn)(1),
+      blockCreated: (0, import_math24.bn)(1),
+      txCreatedIdx: (0, import_math24.bn)(1),
       ...coin
     }));
   }
   /** @hidden */
   async prepareTransactionForSend(request) {
     const { transactionId } = request.flag;
-    if (!(0, import_utils38.isDefined)(transactionId)) {
+    if (!(0, import_utils39.isDefined)(transactionId)) {
       return request;
     }
     const chainId = await this.provider.getChainId();
@@ -8460,80 +8925,57 @@ var Account = class extends AbstractAccount {
   /** @hidden */
   async prepareTransactionSummary(request) {
     const chainId = await this.provider.getChainId();
-    return (0, import_utils38.isDefined)(request.flag.summary) ? {
+    return (0, import_utils39.isDefined)(request.flag.summary) ? {
       ...request.flag.summary,
       id: request.getTransactionId(chainId),
-      transactionBytes: (0, import_utils38.hexlify)(request.toTransactionBytes())
+      transactionBytes: (0, import_utils39.hexlify)(request.toTransactionBytes())
     } : void 0;
   }
   /** @hidden * */
-  async assembleTx(transactionRequest, quantities = []) {
-    const outputQuantities = transactionRequest.outputs.filter((o) => o.type === import_transactions28.OutputType.Coin).map(({ amount, assetId }) => ({ assetId: String(assetId), amount: (0, import_math23.bn)(amount) }));
-    transactionRequest.gasLimit = (0, import_math23.bn)(0);
-    transactionRequest.maxFee = (0, import_math23.bn)(0);
-    const { assembledRequest, gasPrice } = await this.provider.assembleTx({
-      request: transactionRequest,
-      accountCoinQuantities: mergeQuantities(outputQuantities, quantities),
-      feePayerAccount: this
-    });
-    return { transactionRequest: assembledRequest, gasPrice };
+  async assembleTx(opts) {
+    const { transactionRequest, quantities = [], skipAutoConsolidation } = opts;
+    const outputQuantities = transactionRequest.outputs.filter((o) => o.type === import_transactions29.OutputType.Coin).map(({ amount, assetId }) => ({ assetId: String(assetId), amount: (0, import_math24.bn)(amount) }));
+    transactionRequest.gasLimit = (0, import_math24.bn)(0);
+    transactionRequest.maxFee = (0, import_math24.bn)(0);
+    const assembleTx = /* @__PURE__ */ __name(async () => {
+      const { assembledRequest, gasPrice } = await this.provider.assembleTx({
+        request: transactionRequest,
+        accountCoinQuantities: mergeQuantities(outputQuantities, quantities),
+        feePayerAccount: this
+      });
+      return { transactionRequest: assembledRequest, gasPrice };
+    }, "assembleTx");
+    try {
+      return await assembleTx();
+    } catch (error) {
+      const shouldRetry = await consolidateCoinsIfRequired({
+        error,
+        account: this,
+        skipAutoConsolidation
+      });
+      if (!shouldRetry) {
+        throw error;
+      }
+      return await assembleTx();
+    }
   }
   /** @hidden * */
   validateTransferAmount(amount) {
-    if ((0, import_math23.bn)(amount).lte(0)) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.INVALID_TRANSFER_AMOUNT,
+    if ((0, import_math24.bn)(amount).lte(0)) {
+      throw new import_errors24.FuelError(
+        import_errors24.ErrorCode.INVALID_TRANSFER_AMOUNT,
         "Transfer amount must be a positive number."
       );
     }
   }
   /** @hidden * */
-  async estimateAndFundTransaction(transactionRequest, txParams, costParams) {
-    let request = transactionRequest;
-    const txCost = await this.getTransactionCost(request, costParams);
-    request = this.validateGasLimitAndMaxFee({
-      transactionRequest: request,
-      gasUsed: txCost.gasUsed,
-      maxFee: txCost.maxFee,
-      txParams
-    });
-    request = await this.fund(request, txCost);
-    return request;
-  }
-  /** @hidden * */
-  validateGasLimitAndMaxFee({
-    gasUsed,
-    maxFee,
-    transactionRequest,
-    txParams: { gasLimit: setGasLimit, maxFee: setMaxFee }
-  }) {
-    const request = transactionRequestify(transactionRequest);
-    if (!(0, import_utils38.isDefined)(setGasLimit)) {
-      request.gasLimit = gasUsed;
-    } else if (gasUsed.gt(setGasLimit)) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.GAS_LIMIT_TOO_LOW,
-        `Gas limit '${setGasLimit}' is lower than the required: '${gasUsed}'.`
-      );
-    }
-    if (!(0, import_utils38.isDefined)(setMaxFee)) {
-      request.maxFee = maxFee;
-    } else if (maxFee.gt(setMaxFee)) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.MAX_FEE_TOO_LOW,
-        `Max fee '${setMaxFee}' is lower than the required: '${maxFee}'.`
-      );
-    }
-    return request;
-  }
-  /** @hidden * */
   validateConsolidationTxsCoins(coins, assetId) {
     if (coins.length <= 1) {
-      throw new import_errors23.FuelError(import_errors23.ErrorCode.NO_COINS_TO_CONSOLIDATE, "No coins to consolidate.");
+      throw new import_errors24.FuelError(import_errors24.ErrorCode.NO_COINS_TO_CONSOLIDATE, "No coins to consolidate.");
     }
     if (!coins.every((c) => c.assetId === assetId)) {
-      throw new import_errors23.FuelError(
-        import_errors23.ErrorCode.COINS_ASSET_ID_MISMATCH,
+      throw new import_errors24.FuelError(
+        import_errors24.ErrorCode.COINS_ASSET_ID_MISMATCH,
         "All coins to consolidate must be from the same asset id."
       );
     }
@@ -8558,10 +9000,10 @@ var Account = class extends AbstractAccount {
 };
 
 // src/wallet/keystore-wallet.ts
-var import_address7 = require("@fuel-ts/address");
+var import_address8 = require("@fuel-ts/address");
 var import_crypto6 = require("@fuel-ts/crypto");
-var import_errors24 = require("@fuel-ts/errors");
-var import_utils39 = require("@fuel-ts/utils");
+var import_errors25 = require("@fuel-ts/errors");
+var import_utils40 = require("@fuel-ts/utils");
 var DEFAULT_KDF_PARAMS_LOG_N = 13;
 var DEFAULT_KDF_PARAMS_R = 8;
 var DEFAULT_KDF_PARAMS_P = 1;
@@ -8575,7 +9017,7 @@ var removeHexPrefix = /* @__PURE__ */ __name((hexString) => {
 }, "removeHexPrefix");
 async function encryptKeystoreWallet(privateKey, address, password) {
   const privateKeyBuffer = (0, import_crypto6.bufferFromString)(removeHexPrefix(privateKey), "hex");
-  const ownerAddress = new import_address7.Address(address);
+  const ownerAddress = new import_address8.Address(address);
   const salt = (0, import_crypto6.randomBytes)(DEFAULT_KEY_SIZE);
   const key = (0, import_crypto6.scrypt)({
     password: (0, import_crypto6.bufferFromString)(password),
@@ -8638,13 +9080,13 @@ async function decryptKeystoreWallet(jsonWallet, password) {
   const macHashUint8Array = (0, import_crypto6.keccak256)(data);
   const macHash = (0, import_crypto6.stringFromBuffer)(macHashUint8Array, "hex");
   if (mac !== macHash) {
-    throw new import_errors24.FuelError(
-      import_errors24.ErrorCode.INVALID_PASSWORD,
+    throw new import_errors25.FuelError(
+      import_errors25.ErrorCode.INVALID_PASSWORD,
       "Failed to decrypt the keystore wallet, the provided password is incorrect."
     );
   }
   const buffer = await (0, import_crypto6.decryptJsonWalletData)(ciphertextBuffer, key, ivBuffer);
-  const privateKey = (0, import_utils39.hexlify)(buffer);
+  const privateKey = (0, import_utils40.hexlify)(buffer);
   return privateKey;
 }
 __name(decryptKeystoreWallet, "decryptKeystoreWallet");
@@ -8697,7 +9139,7 @@ var BaseWalletUnlocked = class extends Account {
    */
   async signMessage(message) {
     const signedMessage = await this.signer().sign((0, import_hasher4.hashMessage)(message));
-    return (0, import_utils40.hexlify)(signedMessage);
+    return (0, import_utils41.hexlify)(signedMessage);
   }
   /**
    * Signs a transaction with the wallet's private key.
@@ -8710,7 +9152,7 @@ var BaseWalletUnlocked = class extends Account {
     const chainId = await this.provider.getChainId();
     const hashedTransaction = transactionRequest.getTransactionId(chainId);
     const signature = await this.signer().sign(hashedTransaction);
-    return (0, import_utils40.hexlify)(signature);
+    return (0, import_utils41.hexlify)(signature);
   }
   /**
    * Populates a transaction with the witnesses signature.
@@ -8778,16 +9220,16 @@ var BaseWalletUnlocked = class extends Account {
 
 // src/hdwallet/hdwallet.ts
 var import_crypto8 = require("@fuel-ts/crypto");
-var import_errors27 = require("@fuel-ts/errors");
+var import_errors28 = require("@fuel-ts/errors");
 var import_hasher7 = require("@fuel-ts/hasher");
-var import_math24 = require("@fuel-ts/math");
-var import_utils44 = require("@fuel-ts/utils");
+var import_math25 = require("@fuel-ts/math");
+var import_utils45 = require("@fuel-ts/utils");
 
 // src/mnemonic/mnemonic.ts
 var import_crypto7 = require("@fuel-ts/crypto");
-var import_errors26 = require("@fuel-ts/errors");
+var import_errors27 = require("@fuel-ts/errors");
 var import_hasher6 = require("@fuel-ts/hasher");
-var import_utils42 = require("@fuel-ts/utils");
+var import_utils43 = require("@fuel-ts/utils");
 
 // src/wordlists/words/english.ts
 var english = [
@@ -10842,9 +11284,9 @@ var english = [
 ];
 
 // src/mnemonic/utils.ts
-var import_errors25 = require("@fuel-ts/errors");
+var import_errors26 = require("@fuel-ts/errors");
 var import_hasher5 = require("@fuel-ts/hasher");
-var import_utils41 = require("@fuel-ts/utils");
+var import_utils42 = require("@fuel-ts/utils");
 function getLowerMask(bits) {
   return (1 << bits) - 1;
 }
@@ -10883,7 +11325,7 @@ function entropyToMnemonicIndices(entropy) {
     }
   }
   const checksumBits = entropy.length / 4;
-  const checksum = (0, import_utils41.arrayify)((0, import_hasher5.sha256)(entropy))[0] & getUpperMask(checksumBits);
+  const checksum = (0, import_utils42.arrayify)((0, import_hasher5.sha256)(entropy))[0] & getUpperMask(checksumBits);
   indices[indices.length - 1] <<= checksumBits;
   indices[indices.length - 1] |= checksum >> 8 - checksumBits;
   return indices;
@@ -10891,13 +11333,13 @@ function entropyToMnemonicIndices(entropy) {
 __name(entropyToMnemonicIndices, "entropyToMnemonicIndices");
 function mnemonicWordsToEntropy(words, wordlist) {
   const size = Math.ceil(11 * words.length / 8);
-  const entropy = (0, import_utils41.arrayify)(new Uint8Array(size));
+  const entropy = (0, import_utils42.arrayify)(new Uint8Array(size));
   let offset = 0;
   for (let i = 0; i < words.length; i += 1) {
     const index = wordlist.indexOf(words[i].normalize("NFKD"));
     if (index === -1) {
-      throw new import_errors25.FuelError(
-        import_errors25.ErrorCode.INVALID_MNEMONIC,
+      throw new import_errors26.FuelError(
+        import_errors26.ErrorCode.INVALID_MNEMONIC,
         `Invalid mnemonic: the word '${words[i]}' is not found in the provided wordlist.`
       );
     }
@@ -10911,10 +11353,10 @@ function mnemonicWordsToEntropy(words, wordlist) {
   const entropyBits = 32 * words.length / 3;
   const checksumBits = words.length / 3;
   const checksumMask = getUpperMask(checksumBits);
-  const checksum = (0, import_utils41.arrayify)((0, import_hasher5.sha256)(entropy.slice(0, entropyBits / 8)))[0] & checksumMask;
+  const checksum = (0, import_utils42.arrayify)((0, import_hasher5.sha256)(entropy.slice(0, entropyBits / 8)))[0] & checksumMask;
   if (checksum !== (entropy[entropy.length - 1] & checksumMask)) {
-    throw new import_errors25.FuelError(
-      import_errors25.ErrorCode.INVALID_CHECKSUM,
+    throw new import_errors26.FuelError(
+      import_errors26.ErrorCode.INVALID_CHECKSUM,
       "Checksum validation failed for the provided mnemonic."
     );
   }
@@ -10923,14 +11365,14 @@ function mnemonicWordsToEntropy(words, wordlist) {
 __name(mnemonicWordsToEntropy, "mnemonicWordsToEntropy");
 
 // src/mnemonic/mnemonic.ts
-var MasterSecret = (0, import_utils42.toUtf8Bytes)("Bitcoin seed");
+var MasterSecret = (0, import_utils43.toUtf8Bytes)("Bitcoin seed");
 var MainnetPRV = "0x0488ade4";
 var TestnetPRV = "0x04358394";
 var MNEMONIC_SIZES = [12, 15, 18, 21, 24];
 function assertWordList(wordlist) {
   if (wordlist.length !== 2048) {
-    throw new import_errors26.FuelError(
-      import_errors26.ErrorCode.INVALID_WORD_LIST,
+    throw new import_errors27.FuelError(
+      import_errors27.ErrorCode.INVALID_WORD_LIST,
       `Expected word list length of 2048, but got ${wordlist.length}.`
     );
   }
@@ -10938,8 +11380,8 @@ function assertWordList(wordlist) {
 __name(assertWordList, "assertWordList");
 function assertEntropy(entropy) {
   if (entropy.length % 4 !== 0 || entropy.length < 16 || entropy.length > 32) {
-    throw new import_errors26.FuelError(
-      import_errors26.ErrorCode.INVALID_ENTROPY,
+    throw new import_errors27.FuelError(
+      import_errors27.ErrorCode.INVALID_ENTROPY,
       `Entropy should be between 16 and 32 bytes and a multiple of 4, but got ${entropy.length} bytes.`
     );
   }
@@ -10950,7 +11392,7 @@ function assertMnemonic(words) {
     const errorMsg = `Invalid mnemonic size. Expected one of [${MNEMONIC_SIZES.join(
       ", "
     )}] words, but got ${words.length}.`;
-    throw new import_errors26.FuelError(import_errors26.ErrorCode.INVALID_MNEMONIC, errorMsg);
+    throw new import_errors27.FuelError(import_errors27.ErrorCode.INVALID_MNEMONIC, errorMsg);
   }
 }
 __name(assertMnemonic, "assertMnemonic");
@@ -10993,7 +11435,7 @@ var Mnemonic = class _Mnemonic {
   static mnemonicToEntropy(phrase, wordlist = english) {
     const words = getWords(phrase);
     assertMnemonic(words);
-    return (0, import_utils42.hexlify)(mnemonicWordsToEntropy(words, wordlist));
+    return (0, import_utils43.hexlify)(mnemonicWordsToEntropy(words, wordlist));
   }
   /**
    * @param entropy - Entropy source to the mnemonic phrase.
@@ -11001,7 +11443,7 @@ var Mnemonic = class _Mnemonic {
    * @returns 64-byte array contains privateKey and chainCode as described on BIP39
    */
   static entropyToMnemonic(entropy, wordlist = english) {
-    const entropyBytes = (0, import_utils42.arrayify)(entropy);
+    const entropyBytes = (0, import_utils43.arrayify)(entropy);
     assertWordList(wordlist);
     assertEntropy(entropyBytes);
     return entropyToMnemonicIndices(entropyBytes).map((i) => wordlist[i]).join(" ");
@@ -11013,8 +11455,8 @@ var Mnemonic = class _Mnemonic {
    */
   static mnemonicToSeed(phrase, passphrase = "") {
     assertMnemonic(getWords(phrase));
-    const phraseBytes = (0, import_utils42.toUtf8Bytes)(getPhrase(phrase));
-    const salt = (0, import_utils42.toUtf8Bytes)(`mnemonic${passphrase}`);
+    const phraseBytes = (0, import_utils43.toUtf8Bytes)(getPhrase(phrase));
+    const salt = (0, import_utils43.toUtf8Bytes)(`mnemonic${passphrase}`);
     return (0, import_crypto7.pbkdf2)(phraseBytes, salt, 2048, 64, "sha512");
   }
   /**
@@ -11070,14 +11512,14 @@ var Mnemonic = class _Mnemonic {
    * @returns 64-byte array contains privateKey and chainCode as described on BIP39
    */
   static masterKeysFromSeed(seed) {
-    const seedArray = (0, import_utils42.arrayify)(seed);
+    const seedArray = (0, import_utils43.arrayify)(seed);
     if (seedArray.length < 16 || seedArray.length > 64) {
-      throw new import_errors26.FuelError(
-        import_errors26.ErrorCode.INVALID_SEED,
+      throw new import_errors27.FuelError(
+        import_errors27.ErrorCode.INVALID_SEED,
         `Seed length should be between 16 and 64 bytes, but received ${seedArray.length} bytes.`
       );
     }
-    return (0, import_utils42.arrayify)((0, import_crypto7.computeHmac)("sha512", MasterSecret, seedArray));
+    return (0, import_utils43.arrayify)((0, import_crypto7.computeHmac)("sha512", MasterSecret, seedArray));
   }
   /**
    * Get the extendKey as defined on BIP-32 from the provided seed
@@ -11088,22 +11530,22 @@ var Mnemonic = class _Mnemonic {
    */
   static seedToExtendedKey(seed, testnet = false) {
     const masterKey = _Mnemonic.masterKeysFromSeed(seed);
-    const prefix = (0, import_utils42.arrayify)(testnet ? TestnetPRV : MainnetPRV);
+    const prefix = (0, import_utils43.arrayify)(testnet ? TestnetPRV : MainnetPRV);
     const depth = "0x00";
     const fingerprint = "0x00000000";
     const index = "0x00000000";
     const chainCode = masterKey.slice(32);
     const privateKey = masterKey.slice(0, 32);
-    const extendedKey = (0, import_utils42.concat)([
+    const extendedKey = (0, import_utils43.concat)([
       prefix,
       depth,
       fingerprint,
       index,
       chainCode,
-      (0, import_utils42.concat)(["0x00", privateKey])
+      (0, import_utils43.concat)(["0x00", privateKey])
     ]);
-    const checksum = (0, import_utils42.dataSlice)((0, import_hasher6.sha256)((0, import_hasher6.sha256)(extendedKey)), 0, 4);
-    return (0, import_utils42.encodeBase58)((0, import_utils42.concat)([extendedKey, checksum]));
+    const checksum = (0, import_utils43.dataSlice)((0, import_hasher6.sha256)((0, import_hasher6.sha256)(extendedKey)), 0, 4);
+    return (0, import_utils43.encodeBase58)((0, import_utils43.concat)([extendedKey, checksum]));
   }
   /**
    *  Create a new mnemonic using a randomly generated number as entropy.
@@ -11118,7 +11560,7 @@ var Mnemonic = class _Mnemonic {
    * @returns A randomly generated mnemonic
    */
   static generate(size = 32, extraEntropy = "") {
-    const entropy = extraEntropy ? (0, import_hasher6.sha256)((0, import_utils42.concat)([(0, import_crypto7.randomBytes)(size), (0, import_utils42.arrayify)(extraEntropy)])) : (0, import_crypto7.randomBytes)(size);
+    const entropy = extraEntropy ? (0, import_hasher6.sha256)((0, import_utils43.concat)([(0, import_crypto7.randomBytes)(size), (0, import_utils43.arrayify)(extraEntropy)])) : (0, import_crypto7.randomBytes)(size);
     return _Mnemonic.entropyToMnemonic(entropy);
   }
 };
@@ -11126,12 +11568,12 @@ var mnemonic_default = Mnemonic;
 
 // src/hdwallet/hdwallet.ts
 var HARDENED_INDEX = 2147483648;
-var MainnetPRV2 = (0, import_utils44.hexlify)("0x0488ade4");
-var MainnetPUB = (0, import_utils44.hexlify)("0x0488b21e");
-var TestnetPRV2 = (0, import_utils44.hexlify)("0x04358394");
-var TestnetPUB = (0, import_utils44.hexlify)("0x043587cf");
+var MainnetPRV2 = (0, import_utils45.hexlify)("0x0488ade4");
+var MainnetPUB = (0, import_utils45.hexlify)("0x0488b21e");
+var TestnetPRV2 = (0, import_utils45.hexlify)("0x04358394");
+var TestnetPUB = (0, import_utils45.hexlify)("0x043587cf");
 function base58check(data) {
-  return (0, import_utils44.encodeBase58)((0, import_utils44.concat)([data, (0, import_utils44.dataSlice)((0, import_hasher7.sha256)((0, import_hasher7.sha256)(data)), 0, 4)]));
+  return (0, import_utils45.encodeBase58)((0, import_utils45.concat)([data, (0, import_utils45.dataSlice)((0, import_hasher7.sha256)((0, import_hasher7.sha256)(data)), 0, 4)]));
 }
 __name(base58check, "base58check");
 function getExtendedKeyPrefix(isPublic = false, testnet = false) {
@@ -11142,19 +11584,19 @@ function getExtendedKeyPrefix(isPublic = false, testnet = false) {
 }
 __name(getExtendedKeyPrefix, "getExtendedKeyPrefix");
 function isPublicExtendedKey(extendedKey) {
-  return [MainnetPUB, TestnetPUB].includes((0, import_utils44.hexlify)(extendedKey.slice(0, 4)));
+  return [MainnetPUB, TestnetPUB].includes((0, import_utils45.hexlify)(extendedKey.slice(0, 4)));
 }
 __name(isPublicExtendedKey, "isPublicExtendedKey");
 function isValidExtendedKey(extendedKey) {
   return [MainnetPRV2, TestnetPRV2, MainnetPUB, TestnetPUB].includes(
-    (0, import_utils44.hexlify)(extendedKey.slice(0, 4))
+    (0, import_utils45.hexlify)(extendedKey.slice(0, 4))
   );
 }
 __name(isValidExtendedKey, "isValidExtendedKey");
 function parsePath(path2, depth = 0) {
   const components = path2.split("/");
   if (components.length === 0 || components[0] === "m" && depth !== 0) {
-    throw new import_errors27.FuelError(import_errors27.ErrorCode.HD_WALLET_ERROR, `invalid path - ${path2}`);
+    throw new import_errors28.FuelError(import_errors28.ErrorCode.HD_WALLET_ERROR, `invalid path - ${path2}`);
   }
   if (components[0] === "m") {
     components.shift();
@@ -11170,8 +11612,8 @@ var HDWallet = class _HDWallet {
   }
   depth = 0;
   index = 0;
-  fingerprint = (0, import_utils44.hexlify)("0x00000000");
-  parentFingerprint = (0, import_utils44.hexlify)("0x00000000");
+  fingerprint = (0, import_utils45.hexlify)("0x00000000");
+  parentFingerprint = (0, import_utils45.hexlify)("0x00000000");
   privateKey;
   publicKey;
   chainCode;
@@ -11183,19 +11625,19 @@ var HDWallet = class _HDWallet {
   constructor(config) {
     if (config.privateKey) {
       const signer = new Signer(config.privateKey);
-      this.publicKey = (0, import_utils44.hexlify)(signer.compressedPublicKey);
-      this.privateKey = (0, import_utils44.hexlify)(config.privateKey);
+      this.publicKey = (0, import_utils45.hexlify)(signer.compressedPublicKey);
+      this.privateKey = (0, import_utils45.hexlify)(config.privateKey);
     } else {
       if (!config.publicKey) {
-        throw new import_errors27.FuelError(
-          import_errors27.ErrorCode.HD_WALLET_ERROR,
+        throw new import_errors28.FuelError(
+          import_errors28.ErrorCode.HD_WALLET_ERROR,
           "Both public and private Key cannot be missing. At least one should be provided."
         );
       }
-      this.publicKey = (0, import_utils44.hexlify)(config.publicKey);
+      this.publicKey = (0, import_utils45.hexlify)(config.publicKey);
     }
     this.parentFingerprint = config.parentFingerprint || this.parentFingerprint;
-    this.fingerprint = (0, import_utils44.dataSlice)((0, import_crypto8.ripemd160)((0, import_hasher7.sha256)(this.publicKey)), 0, 4);
+    this.fingerprint = (0, import_utils45.dataSlice)((0, import_crypto8.ripemd160)((0, import_hasher7.sha256)(this.publicKey)), 0, 4);
     this.depth = config.depth || this.depth;
     this.index = config.index || this.index;
     this.chainCode = config.chainCode;
@@ -11211,28 +11653,28 @@ var HDWallet = class _HDWallet {
    * @returns A new instance of HDWallet on the derived index
    */
   deriveIndex(index) {
-    const privateKey = this.privateKey && (0, import_utils44.arrayify)(this.privateKey);
-    const publicKey = (0, import_utils44.arrayify)(this.publicKey);
-    const chainCode = (0, import_utils44.arrayify)(this.chainCode);
+    const privateKey = this.privateKey && (0, import_utils45.arrayify)(this.privateKey);
+    const publicKey = (0, import_utils45.arrayify)(this.publicKey);
+    const chainCode = (0, import_utils45.arrayify)(this.chainCode);
     const data = new Uint8Array(37);
     if (index & HARDENED_INDEX) {
       if (!privateKey) {
-        throw new import_errors27.FuelError(
-          import_errors27.ErrorCode.HD_WALLET_ERROR,
+        throw new import_errors28.FuelError(
+          import_errors28.ErrorCode.HD_WALLET_ERROR,
           "Cannot derive a hardened index without a private Key."
         );
       }
       data.set(privateKey, 1);
     } else {
-      data.set((0, import_utils44.arrayify)(this.publicKey));
+      data.set((0, import_utils45.arrayify)(this.publicKey));
     }
-    data.set((0, import_math24.toBytes)(index, 4), 33);
-    const bytes = (0, import_utils44.arrayify)((0, import_crypto8.computeHmac)("sha512", chainCode, data));
+    data.set((0, import_math25.toBytes)(index, 4), 33);
+    const bytes = (0, import_utils45.arrayify)((0, import_crypto8.computeHmac)("sha512", chainCode, data));
     const IL = bytes.slice(0, 32);
     const IR = bytes.slice(32);
     if (privateKey) {
       const N = "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141";
-      const ki = (0, import_math24.bn)(IL).add(privateKey).mod(N).toBytes(32);
+      const ki = (0, import_math25.bn)(IL).add(privateKey).mod(N).toBytes(32);
       return new _HDWallet({
         privateKey: ki,
         chainCode: IR,
@@ -11241,7 +11683,7 @@ var HDWallet = class _HDWallet {
         parentFingerprint: this.fingerprint
       });
     }
-    const signer = new Signer((0, import_utils44.hexlify)(IL));
+    const signer = new Signer((0, import_utils45.hexlify)(IL));
     const Ki = signer.addPoint(publicKey);
     return new _HDWallet({
       publicKey: Ki,
@@ -11270,18 +11712,18 @@ var HDWallet = class _HDWallet {
    */
   toExtendedKey(isPublic = false, testnet = false) {
     if (this.depth >= 256) {
-      throw new import_errors27.FuelError(
-        import_errors27.ErrorCode.HD_WALLET_ERROR,
+      throw new import_errors28.FuelError(
+        import_errors28.ErrorCode.HD_WALLET_ERROR,
         `Exceeded max depth of 255. Current depth: ${this.depth}.`
       );
     }
     const prefix = getExtendedKeyPrefix(this.privateKey == null || isPublic, testnet);
-    const depth = (0, import_utils44.hexlify)(Uint8Array.from([this.depth]));
+    const depth = (0, import_utils45.hexlify)(Uint8Array.from([this.depth]));
     const parentFingerprint = this.parentFingerprint;
-    const index = (0, import_math24.toHex)(this.index, 4);
+    const index = (0, import_math25.toHex)(this.index, 4);
     const chainCode = this.chainCode;
-    const key = this.privateKey != null && !isPublic ? (0, import_utils44.concat)(["0x00", this.privateKey]) : this.publicKey;
-    const extendedKey = (0, import_utils44.arrayify)((0, import_utils44.concat)([prefix, depth, parentFingerprint, index, chainCode, key]));
+    const key = this.privateKey != null && !isPublic ? (0, import_utils45.concat)(["0x00", this.privateKey]) : this.publicKey;
+    const extendedKey = (0, import_utils45.arrayify)((0, import_utils45.concat)([prefix, depth, parentFingerprint, index, chainCode, key]));
     return base58check(extendedKey);
   }
   /**
@@ -11293,34 +11735,34 @@ var HDWallet = class _HDWallet {
   static fromSeed(seed) {
     const masterKey = mnemonic_default.masterKeysFromSeed(seed);
     return new _HDWallet({
-      chainCode: (0, import_utils44.arrayify)(masterKey.slice(32)),
-      privateKey: (0, import_utils44.arrayify)(masterKey.slice(0, 32))
+      chainCode: (0, import_utils45.arrayify)(masterKey.slice(32)),
+      privateKey: (0, import_utils45.arrayify)(masterKey.slice(0, 32))
     });
   }
   static fromExtendedKey(extendedKey) {
-    const decoded = (0, import_utils44.hexlify)((0, import_math24.toBytes)((0, import_utils44.decodeBase58)(extendedKey)));
-    const bytes = (0, import_utils44.arrayify)(decoded);
+    const decoded = (0, import_utils45.hexlify)((0, import_math25.toBytes)((0, import_utils45.decodeBase58)(extendedKey)));
+    const bytes = (0, import_utils45.arrayify)(decoded);
     const validChecksum = base58check(bytes.slice(0, 78)) === extendedKey;
     if (bytes.length !== 82 || !isValidExtendedKey(bytes)) {
-      throw new import_errors27.FuelError(import_errors27.ErrorCode.HD_WALLET_ERROR, "Provided key is not a valid extended key.");
+      throw new import_errors28.FuelError(import_errors28.ErrorCode.HD_WALLET_ERROR, "Provided key is not a valid extended key.");
     }
     if (!validChecksum) {
-      throw new import_errors27.FuelError(import_errors27.ErrorCode.HD_WALLET_ERROR, "Provided key has an invalid checksum.");
+      throw new import_errors28.FuelError(import_errors28.ErrorCode.HD_WALLET_ERROR, "Provided key has an invalid checksum.");
     }
     const depth = bytes[4];
-    const parentFingerprint = (0, import_utils44.hexlify)(bytes.slice(5, 9));
-    const index = parseInt((0, import_utils44.hexlify)(bytes.slice(9, 13)).substring(2), 16);
-    const chainCode = (0, import_utils44.hexlify)(bytes.slice(13, 45));
+    const parentFingerprint = (0, import_utils45.hexlify)(bytes.slice(5, 9));
+    const index = parseInt((0, import_utils45.hexlify)(bytes.slice(9, 13)).substring(2), 16);
+    const chainCode = (0, import_utils45.hexlify)(bytes.slice(13, 45));
     const key = bytes.slice(45, 78);
     if (depth === 0 && parentFingerprint !== "0x00000000" || depth === 0 && index !== 0) {
-      throw new import_errors27.FuelError(
-        import_errors27.ErrorCode.HD_WALLET_ERROR,
+      throw new import_errors28.FuelError(
+        import_errors28.ErrorCode.HD_WALLET_ERROR,
         "Inconsistency detected: Depth is zero but fingerprint/index is non-zero."
       );
     }
     if (isPublicExtendedKey(bytes)) {
       if (key[0] !== 3) {
-        throw new import_errors27.FuelError(import_errors27.ErrorCode.HD_WALLET_ERROR, "Invalid public extended key.");
+        throw new import_errors28.FuelError(import_errors28.ErrorCode.HD_WALLET_ERROR, "Invalid public extended key.");
       }
       return new _HDWallet({
         publicKey: key,
@@ -11331,7 +11773,7 @@ var HDWallet = class _HDWallet {
       });
     }
     if (key[0] !== 0) {
-      throw new import_errors27.FuelError(import_errors27.ErrorCode.HD_WALLET_ERROR, "Invalid private extended key.");
+      throw new import_errors28.FuelError(import_errors28.ErrorCode.HD_WALLET_ERROR, "Invalid private extended key.");
     }
     return new _HDWallet({
       privateKey: key.slice(1),
@@ -11540,7 +11982,7 @@ var WalletsConfig = class _WalletsConfig {
     return {
       ...snapshotConfig,
       stateConfig: {
-        ...snapshotConfig?.stateConfig ?? import_utils45.defaultSnapshotConfigs.stateConfig,
+        ...snapshotConfig?.stateConfig ?? import_utils46.defaultSnapshotConfigs.stateConfig,
         coins: this.initialState.coins.concat(snapshotConfig?.stateConfig?.coins || []),
         messages: this.initialState.messages.concat(snapshotConfig?.stateConfig?.messages ?? [])
       }
@@ -11567,13 +12009,13 @@ var WalletsConfig = class _WalletsConfig {
       assetIds.forEach((assetId) => {
         for (let index = 0; index < coinsPerAsset; index++) {
           coins.push({
-            amount: (0, import_math25.bn)(amountPerCoin).toString(),
+            amount: (0, import_math26.bn)(amountPerCoin).toString(),
             asset_id: assetId,
             owner: walletAddress,
             tx_pointer_block_height: 0,
             tx_pointer_tx_idx: 0,
             output_index: 0,
-            tx_id: (0, import_utils45.hexlify)((0, import_crypto9.randomBytes)(32))
+            tx_id: (0, import_utils46.hexlify)((0, import_crypto9.randomBytes)(32))
           });
         }
       });
@@ -11587,26 +12029,26 @@ var WalletsConfig = class _WalletsConfig {
     amountPerCoin
   }) {
     if (Array.isArray(wallets) && wallets.length === 0 || typeof wallets === "number" && wallets <= 0) {
-      throw new import_errors28.FuelError(
-        import_errors28.FuelError.CODES.INVALID_INPUT_PARAMETERS,
+      throw new import_errors29.FuelError(
+        import_errors29.FuelError.CODES.INVALID_INPUT_PARAMETERS,
         "Number of wallets must be greater than zero."
       );
     }
     if (Array.isArray(assets) && assets.length === 0 || typeof assets === "number" && assets <= 0) {
-      throw new import_errors28.FuelError(
-        import_errors28.FuelError.CODES.INVALID_INPUT_PARAMETERS,
+      throw new import_errors29.FuelError(
+        import_errors29.FuelError.CODES.INVALID_INPUT_PARAMETERS,
         "Number of assets per wallet must be greater than zero."
       );
     }
     if (coinsPerAsset <= 0) {
-      throw new import_errors28.FuelError(
-        import_errors28.FuelError.CODES.INVALID_INPUT_PARAMETERS,
+      throw new import_errors29.FuelError(
+        import_errors29.FuelError.CODES.INVALID_INPUT_PARAMETERS,
         "Number of coins per asset must be greater than zero."
       );
     }
-    if ((0, import_math25.bn)(amountPerCoin).lt(0)) {
-      throw new import_errors28.FuelError(
-        import_errors28.FuelError.CODES.INVALID_INPUT_PARAMETERS,
+    if ((0, import_math26.bn)(amountPerCoin).lt(0)) {
+      throw new import_errors29.FuelError(
+        import_errors29.FuelError.CODES.INVALID_INPUT_PARAMETERS,
         "Amount per coin must be greater than or equal to zero."
       );
     }
@@ -11629,7 +12071,7 @@ async function setupTestProviderAndWallets({
 } = {}) {
   Symbol.dispose ??= Symbol("Symbol.dispose");
   const walletsConfig = new WalletsConfig(
-    nodeOptions.snapshotConfig?.chainConfig?.consensus_parameters?.V2?.base_asset_id ?? import_utils46.defaultSnapshotConfigs.chainConfig.consensus_parameters.V2.base_asset_id,
+    nodeOptions.snapshotConfig?.chainConfig?.consensus_parameters?.V2?.base_asset_id ?? import_utils47.defaultSnapshotConfigs.chainConfig.consensus_parameters.V2.base_asset_id,
     {
       ...defaultWalletConfigOptions,
       ...walletsConfigOptions
@@ -11638,8 +12080,8 @@ async function setupTestProviderAndWallets({
   const launchNodeOptions = {
     loggingEnabled: false,
     ...nodeOptions,
-    snapshotConfig: (0, import_ramda10.mergeDeepRight)(
-      import_utils46.defaultSnapshotConfigs,
+    snapshotConfig: (0, import_ramda11.mergeDeepRight)(
+      import_utils47.defaultSnapshotConfigs,
       walletsConfig.apply(nodeOptions?.snapshotConfig)
     ),
     port: nodeOptions.port || "0"
@@ -11682,10 +12124,10 @@ async function setupTestProviderAndWallets({
 __name(setupTestProviderAndWallets, "setupTestProviderAndWallets");
 
 // src/test-utils/test-message.ts
-var import_address8 = require("@fuel-ts/address");
+var import_address9 = require("@fuel-ts/address");
 var import_crypto10 = require("@fuel-ts/crypto");
-var import_math26 = require("@fuel-ts/math");
-var import_utils47 = require("@fuel-ts/utils");
+var import_math27 = require("@fuel-ts/math");
+var import_utils48 = require("@fuel-ts/utils");
 var TestMessage = class {
   static {
     __name(this, "TestMessage");
@@ -11703,9 +12145,9 @@ var TestMessage = class {
    * It can also be used standalone and passed into the initial state of a chain via the `.toChainMessage` method.
    */
   constructor({
-    sender = import_address8.Address.fromRandom(),
-    recipient = import_address8.Address.fromRandom(),
-    nonce = (0, import_utils47.hexlify)((0, import_crypto10.randomBytes)(32)),
+    sender = import_address9.Address.fromRandom(),
+    recipient = import_address9.Address.fromRandom(),
+    nonce = (0, import_utils48.hexlify)((0, import_crypto10.randomBytes)(32)),
     amount = 1e6,
     data = "",
     // Will default to empty data in order to be a spendable message
@@ -11724,7 +12166,7 @@ var TestMessage = class {
       sender: this.sender.toB256(),
       recipient: recipient?.toB256() ?? this.recipient.toB256(),
       nonce: this.nonce,
-      amount: (0, import_math26.bn)(this.amount).toNumber(),
+      amount: (0, import_math27.bn)(this.amount).toNumber(),
       data,
       da_height: this.da_height
     };