@fuel-ts/account 0.101.1 → 0.101.3

package/dist/test-utils.mjs

@@ -217,8 +217,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") || defaultConsensusKey;
@@ -408,8 +409,8 @@ var addAmountToCoinQuantities = /* @__PURE__ */ __name((params) => {
 import { Address as Address3, isB256 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode17, FuelError as FuelError20 } from "@fuel-ts/errors";
 import { bn as bn18 } from "@fuel-ts/math";
-import { InputMessageCoder as InputMessageCoder2, TransactionCoder as TransactionCoder6, TransactionType as TransactionType11 } from "@fuel-ts/transactions";
-import { arrayify as arrayify13, hexlify as hexlify19, DateTime as DateTime2, isDefined as isDefined3, sleep as sleep2 } from "@fuel-ts/utils";
+import { InputMessageCoder as InputMessageCoder2, TransactionCoder as TransactionCoder7, TransactionType as TransactionType11 } from "@fuel-ts/transactions";
+import { arrayify as arrayify14, hexlify as hexlify19, DateTime as DateTime2, isDefined as isDefined3, sleep as sleep2 } from "@fuel-ts/utils";
 import { checkFuelCoreVersionCompatibility, versions } from "@fuel-ts/versions";
 import { GraphQLClient } from "graphql-request";
 import gql2 from "graphql-tag";
@@ -1809,8 +1810,11 @@ import { print } from "graphql";
 
 // src/providers/utils/handle-gql-error-message.ts
 import { ErrorCode as ErrorCode2, FuelError as FuelError3 } from "@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/,
@@ -1826,6 +1830,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 FuelError3(
+      ErrorCode2.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 FuelError3(
+      ErrorCode2.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] || "";
@@ -2856,7 +2900,8 @@ import {
   FAILED_ASSERT_SIGNAL,
   FAILED_TRANSFER_TO_ADDRESS_SIGNAL as FAILED_TRANSFER_TO_ADDRESS_SIGNAL2,
   PANIC_REASONS,
-  PANIC_DOC_URL
+  PANIC_DOC_URL,
+  SwaySignalErrors
 } from "@fuel-ts/transactions/configs";
 var assemblePanicError = /* @__PURE__ */ __name((statusReason, metadata) => {
   let errorMessage = `The transaction reverted with reason: "${statusReason}".`;
@@ -2873,58 +2918,98 @@ ${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 === ReceiptType4.Revert);
   let reason = "";
-  if (revertReceipt) {
-    const reasonHex = bn7(revertReceipt.val).toHex();
-    const lastLog = logs[logs.length - 1];
-    const lastButOneLog = logs[logs.length - 2];
-    switch (reasonHex) {
-      case FAILED_REQUIRE_SIGNAL: {
-        reason = "require";
-        errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
-        break;
-      }
-      case 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 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 FAILED_ASSERT_SIGNAL:
-        reason = "assert";
-        errorMessage = `The transaction reverted because an "assert" statement failed to evaluate to true.`;
-        break;
-      case FAILED_TRANSFER_TO_ADDRESS_SIGNAL2:
-        reason = "MissingOutputVariable";
-        errorMessage = `The transaction reverted because it's missing an "OutputVariable".`;
-        break;
-      default:
-        throw new FuelError9(
-          ErrorCode8.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 FAILED_REQUIRE_SIGNAL: {
+      reason = "require";
+      errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(lastLog) : "an error."}.`;
+      break;
+    }
+    case 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 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 FAILED_ASSERT_SIGNAL:
+      reason = "assert";
+      errorMessage = `The transaction reverted because an "assert" statement failed to evaluate to true.`;
+      break;
+    case FAILED_TRANSFER_TO_ADDRESS_SIGNAL2:
+      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 FuelError9(ErrorCode8.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 FuelError9(ErrorCode8.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 = bn7(reason).toHex();
+  if (Object.values(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 FuelError9(ErrorCode8.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 === ReceiptType4.Panic);
   const isRevert = receipts.some(({ type }) => type === ReceiptType4.Revert);
   const metadata = {
@@ -2938,7 +3023,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
@@ -3911,11 +3996,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;
   }
   /**
@@ -4484,12 +4573,12 @@ var ResourceCache = class {
 // src/providers/transaction-response/transaction-response.ts
 import { ErrorCode as ErrorCode15, FuelError as FuelError18 } from "@fuel-ts/errors";
 import { bn as bn17 } from "@fuel-ts/math";
-import { TransactionCoder as TransactionCoder5, TxPointerCoder } from "@fuel-ts/transactions";
-import { arrayify as arrayify12 } from "@fuel-ts/utils";
+import { TransactionCoder as TransactionCoder6, TxPointerCoder } from "@fuel-ts/transactions";
+import { arrayify as arrayify13 } from "@fuel-ts/utils";
 
 // src/providers/transaction-summary/assemble-transaction-summary.ts
 import { bn as bn16 } from "@fuel-ts/math";
-import { PolicyType as PolicyType3, TransactionCoder as TransactionCoder4 } from "@fuel-ts/transactions";
+import { PolicyType as PolicyType3, TransactionCoder as TransactionCoder5 } from "@fuel-ts/transactions";
 import { DateTime, hexlify as hexlify18 } from "@fuel-ts/utils";
 
 // src/providers/transaction-summary/calculate-tx-fee-for-summary.ts
@@ -4561,8 +4650,47 @@ var calculateTXFeeForSummary = /* @__PURE__ */ __name((params) => {
 // src/providers/transaction-summary/operations.ts
 import { ZeroBytes32 as ZeroBytes329 } from "@fuel-ts/address/configs";
 import { ErrorCode as ErrorCode13, FuelError as FuelError16 } from "@fuel-ts/errors";
-import { bn as bn14 } from "@fuel-ts/math";
-import { ReceiptType as ReceiptType5, TransactionType as TransactionType10 } from "@fuel-ts/transactions";
+import { bn as bn14, toBytes as toBytes2 } from "@fuel-ts/math";
+import { ReceiptType as ReceiptType5, TransactionCoder as TransactionCoder4, TransactionType as TransactionType10 } from "@fuel-ts/transactions";
+import { arrayify as arrayify12, concat as concat4 } from "@fuel-ts/utils";
+
+// src/providers/transaction-summary/call.ts
+import { StdStringCoder } from "@fuel-ts/abi-coder";
+import { Interface as Interface2 } from "@fuel-ts/abi-coder";
+var getFunctionCall = /* @__PURE__ */ __name(({
+  abi,
+  receipt,
+  offset,
+  scriptData
+}) => {
+  const [functionSelector, argumentsOffset] = new StdStringCoder().decode(scriptData, offset);
+  const abiInterface = new Interface2(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
 import { ErrorCode as ErrorCode12, FuelError as FuelError15 } from "@fuel-ts/errors";
@@ -4846,12 +4974,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 = concat4([
+    arrayify12(receipt.to),
+    // Contract ID (32 bytes)
+    toBytes2(receipt.param1.toHex(), 8),
+    // Function selector offset (8 bytes)
+    toBytes2(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) {
@@ -4863,14 +5024,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 === ZeroBytes329 ? 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 */,
@@ -4895,7 +5056,6 @@ function getContractCallOperations({
   receipts,
   abiMap,
   rawPayload,
-  maxInputs,
   baseAssetId
 }) {
   const contractCallReceipts = getReceiptsCall(receipts);
@@ -4905,16 +5065,15 @@ function getContractCallOperations({
     if (!contractInput) {
       return [];
     }
+    let scriptData;
+    if (rawPayload) {
+      const [transaction] = new TransactionCoder4().decode(arrayify12(rawPayload), 0);
+      if (transaction.type === TransactionType10.Script) {
+        scriptData = arrayify12(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)
     );
   });
 }
@@ -5330,7 +5489,7 @@ function assemblePreConfirmationTransactionSummary(params) {
     type = getTransactionTypeName(transaction.type);
     tip = bn16(transaction.policies?.find((policy) => policy.type === PolicyType3.Tip)?.data);
     if (receipts) {
-      const rawPayload = hexlify18(new TransactionCoder4().encode(transaction));
+      const rawPayload = hexlify18(new TransactionCoder5().encode(transaction));
       operations = getOperations({
         transactionType: transaction.type,
         inputs: transaction.inputs || [],
@@ -5376,7 +5535,7 @@ function assemblePreConfirmationTransactionSummary(params) {
 __name(assemblePreConfirmationTransactionSummary, "assemblePreConfirmationTransactionSummary");
 
 // src/providers/transaction-response/getAllDecodedLogs.ts
-import { Interface as Interface2, BigNumberCoder } from "@fuel-ts/abi-coder";
+import { Interface as Interface3, BigNumberCoder } from "@fuel-ts/abi-coder";
 import { ZeroBytes32 as ZeroBytes3210 } from "@fuel-ts/address/configs";
 import { ReceiptType as ReceiptType7 } from "@fuel-ts/transactions";
 function getAllDecodedLogs(opts) {
@@ -5396,7 +5555,7 @@ function getAllDecodedLogs(opts) {
         const isLogFromMainAbi = receipt.id === ZeroBytes3210 || mainContract === receipt.id;
         const isDecodable = isLogFromMainAbi || externalAbis[receipt.id];
         if (isDecodable) {
-          const interfaceToUse = isLogFromMainAbi ? new Interface2(mainAbi) : new Interface2(externalAbis[receipt.id]);
+          const interfaceToUse = isLogFromMainAbi ? new Interface3(mainAbi) : new Interface3(externalAbis[receipt.id]);
           const data = receipt.type === ReceiptType7.Log ? new BigNumberCoder("u64").encode(receipt.ra) : receipt.data;
           const [decodedLog] = interfaceToUse.decodeLog(data, receipt.rb.toString());
           logs.push(decodedLog);
@@ -5412,25 +5571,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");
   }
@@ -5445,9 +5585,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
@@ -5496,8 +5669,8 @@ var TransactionResponse = class _TransactionResponse {
     }
     const gqlTransaction = this.gqlTransaction ?? await this.fetch();
     const { rawPayload } = gqlTransaction;
-    const bytes = arrayify12(rawPayload);
-    const [tx] = new TransactionCoder5().decode(bytes, 0);
+    const bytes = arrayify13(rawPayload);
+    const [tx] = new TransactionCoder6().decode(bytes, 0);
     return {
       tx,
       bytes
@@ -5684,6 +5857,7 @@ var TransactionResponse = class _TransactionResponse {
       ...transactionSummary
     };
     let { logs, groupedLogs } = { logs: [], groupedLogs: {} };
+    let abis;
     if (this.abis) {
       ({ logs, groupedLogs } = getAllDecodedLogs({
         receipts: transactionSummary.receipts,
@@ -5692,6 +5866,7 @@ var TransactionResponse = class _TransactionResponse {
       }));
       transactionResult.logs = logs;
       transactionResult.groupedLogs = groupedLogs;
+      abis = this.abis;
     }
     const { receipts } = transactionResult;
     const status = this.getTransactionStatus();
@@ -5701,7 +5876,8 @@ var TransactionResponse = class _TransactionResponse {
         receipts,
         statusReason: reason,
         logs,
-        groupedLogs
+        groupedLogs,
+        abis
       });
     }
     return transactionResult;
@@ -5763,7 +5939,7 @@ var TransactionResponse = class _TransactionResponse {
 };
 
 // src/providers/transaction-response/getDecodedLogs.ts
-import { Interface as Interface3, BigNumberCoder as BigNumberCoder2 } from "@fuel-ts/abi-coder";
+import { Interface as Interface4, BigNumberCoder as BigNumberCoder2 } from "@fuel-ts/abi-coder";
 import { ZeroBytes32 as ZeroBytes3211 } from "@fuel-ts/address/configs";
 import { ReceiptType as ReceiptType8 } from "@fuel-ts/transactions";
 
@@ -5961,7 +6137,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 FuelError20(
+          ErrorCode17.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) {
@@ -5984,13 +6168,15 @@ 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);
@@ -6413,7 +6599,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.
@@ -7143,7 +7335,7 @@ var Provider = class _Provider {
       },
       transactionIds: block.transactions.map((tx) => tx.id),
       transactions: block.transactions.map(
-        (tx) => new TransactionCoder6().decode(arrayify13(tx.rawPayload), 0)?.[0]
+        (tx) => new TransactionCoder7().decode(arrayify14(tx.rawPayload), 0)?.[0]
       )
     };
   }
@@ -7159,8 +7351,8 @@ var Provider = class _Provider {
       return null;
     }
     try {
-      return new TransactionCoder6().decode(
-        arrayify13(transaction.rawPayload),
+      return new TransactionCoder7().decode(
+        arrayify14(transaction.rawPayload),
         0
       )?.[0];
     } catch (error) {
@@ -7185,10 +7377,10 @@ var Provider = class _Provider {
         paginationLimit: TRANSACTIONS_PAGE_SIZE_LIMIT
       })
     });
-    const coder = new TransactionCoder6();
+    const coder = new TransactionCoder7();
     const transactions = edges.map(({ node: { rawPayload } }) => {
       try {
-        return coder.decode(arrayify13(rawPayload), 0)[0];
+        return coder.decode(arrayify14(rawPayload), 0)[0];
       } catch (error) {
         if (error instanceof FuelError20 && error.code === ErrorCode17.UNSUPPORTED_TRANSACTION_TYPE) {
           console.warn("Unsupported transaction type encountered");
@@ -7508,7 +7700,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.
@@ -7559,18 +7755,21 @@ var Provider = class _Provider {
   extractDryRunError(transactionRequest, receipts, reason) {
     let logs = [];
     let groupedLogs = {};
+    let abis;
     if (transactionRequest.type === TransactionType11.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
     });
   }
   /**
@@ -7641,13 +7840,13 @@ var Provider = class _Provider {
 // src/providers/transaction-summary/get-transaction-summary.ts
 import { ErrorCode as ErrorCode18, FuelError as FuelError21 } from "@fuel-ts/errors";
 import { bn as bn19 } from "@fuel-ts/math";
-import { TransactionCoder as TransactionCoder7 } from "@fuel-ts/transactions";
-import { arrayify as arrayify14 } from "@fuel-ts/utils";
+import { TransactionCoder as TransactionCoder8 } from "@fuel-ts/transactions";
+import { arrayify as arrayify15 } from "@fuel-ts/utils";
 
 // src/providers/transaction-summary/assemble-transaction-summary-from-serialized.ts
 import { bn as bn20 } from "@fuel-ts/math";
-import { TransactionCoder as TransactionCoder8 } from "@fuel-ts/transactions";
-import { arrayify as arrayify15 } from "@fuel-ts/utils";
+import { TransactionCoder as TransactionCoder9 } from "@fuel-ts/transactions";
+import { arrayify as arrayify16 } from "@fuel-ts/utils";
 
 // src/test-utils/test-asset-id.ts
 import { randomBytes as randomBytes4 } from "@fuel-ts/crypto";
@@ -7676,8 +7875,8 @@ var TestAssetId = class _TestAssetId {
 
 // src/test-utils/wallet-config.ts
 import { randomBytes as randomBytes8 } from "@fuel-ts/crypto";
-import { FuelError as FuelError27 } from "@fuel-ts/errors";
-import { bn as bn23 } from "@fuel-ts/math";
+import { FuelError as FuelError28 } from "@fuel-ts/errors";
+import { bn as bn24 } from "@fuel-ts/math";
 import { defaultSnapshotConfigs as defaultSnapshotConfigs2, hexlify as hexlify26 } from "@fuel-ts/utils";
 
 // src/wallet/base-wallet-unlocked.ts
@@ -7686,12 +7885,12 @@ import { hexlify as hexlify23 } from "@fuel-ts/utils";
 
 // src/account.ts
 import { UTXO_ID_LEN as UTXO_ID_LEN3 } from "@fuel-ts/abi-coder";
-import { Address as Address5 } from "@fuel-ts/address";
+import { Address as Address6 } from "@fuel-ts/address";
 import { randomBytes as randomBytes5 } from "@fuel-ts/crypto";
-import { ErrorCode as ErrorCode19, FuelError as FuelError22 } from "@fuel-ts/errors";
-import { bn as bn21 } from "@fuel-ts/math";
-import { InputType as InputType8, OutputType as OutputType9 } from "@fuel-ts/transactions";
-import { arrayify as arrayify17, hexlify as hexlify21, isDefined as isDefined4 } from "@fuel-ts/utils";
+import { ErrorCode as ErrorCode20, FuelError as FuelError23 } from "@fuel-ts/errors";
+import { bn as bn22 } from "@fuel-ts/math";
+import { InputType as InputType8, OutputType as OutputType10 } from "@fuel-ts/transactions";
+import { arrayify as arrayify18, hexlify as hexlify21, isDefined as isDefined4 } from "@fuel-ts/utils";
 import { clone as clone9 } from "ramda";
 
 // src/types.ts
@@ -7701,18 +7900,166 @@ var AbstractAccount = class {
   }
 };
 
+// src/utils/consolidate-coins.ts
+import { Address as Address4 } from "@fuel-ts/address";
+import { ErrorCode as ErrorCode19, FuelError as FuelError22 } from "@fuel-ts/errors";
+import { bn as bn21 } from "@fuel-ts/math";
+import { OutputType as OutputType9 } from "@fuel-ts/transactions";
+import { splitEvery } from "ramda";
+var CONSOLIDATABLE_ERROR_CODES = [ErrorCode19.MAX_COINS_REACHED];
+var consolidateCoinsIfRequired = /* @__PURE__ */ __name(async (opts) => {
+  const { error: errorUnknown, account, skipAutoConsolidation = false } = opts;
+  if (skipAutoConsolidation) {
+    return false;
+  }
+  const error = FuelError22.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 === OutputType9.Change && output.assetId === baseAssetId
+  );
+  if (outputChangeIndex === -1) {
+    throw new FuelError22(ErrorCode19.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 Address4(outputCoin.to),
+    blockCreated: bn21(0),
+    txCreatedIdx: bn21(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 FuelError22(
+      ErrorCode19.INSUFFICIENT_FUNDS,
+      `Insufficient funds to consolidate.
+	Asset ID: ${baseAssetId}
+	Owner: ${account.address.toB256()}`
+    );
+  }
+  const batches = [
+    ...splitEvery(batchSize, funding),
+    // We leave one coin for the funding coin
+    ...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 = bn21(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), bn21(0)),
+    submitAll
+  };
+}, "consolidateCoins");
+
 // src/utils/formatTransferToContractScriptData.ts
 import { ASSET_ID_LEN, BigNumberCoder as BigNumberCoder3, CONTRACT_ID_LEN, WORD_SIZE } from "@fuel-ts/abi-coder";
-import { Address as Address4 } from "@fuel-ts/address";
-import { arrayify as arrayify16, concat as concat4 } from "@fuel-ts/utils";
+import { Address as Address5 } from "@fuel-ts/address";
+import { arrayify as arrayify17, concat as concat5 } from "@fuel-ts/utils";
 import * as asm from "@fuels/vm-asm";
 var formatTransferToContractScriptData = /* @__PURE__ */ __name((transferParams) => {
   const numberCoder = new BigNumberCoder3("u64");
   return transferParams.reduce((acc, transferParam) => {
     const { assetId, amount, contractId } = transferParam;
     const encoded = numberCoder.encode(amount);
-    const scriptData = concat4([new Address4(contractId).toBytes(), encoded, arrayify16(assetId)]);
-    return concat4([acc, scriptData]);
+    const scriptData = concat5([new Address5(contractId).toBytes(), encoded, arrayify17(assetId)]);
+    return concat5([acc, scriptData]);
   }, new Uint8Array());
 }, "formatTransferToContractScriptData");
 var assembleTransferToContractScript = /* @__PURE__ */ __name(async (transferParams) => {
@@ -7721,7 +8068,7 @@ var assembleTransferToContractScript = /* @__PURE__ */ __name(async (transferPar
   let script = new Uint8Array();
   transferParams.forEach((_, i) => {
     const offset = (CONTRACT_ID_LEN + WORD_SIZE + ASSET_ID_LEN) * i;
-    script = concat4([
+    script = concat5([
       script,
       // Load ScriptData into register 0x10.
       asm.gtf(16, 0, asm.GTFArgs.ScriptData).to_bytes(),
@@ -7737,7 +8084,7 @@ var assembleTransferToContractScript = /* @__PURE__ */ __name(async (transferPar
       asm.tr(17, 19, 20).to_bytes()
     ]);
   });
-  script = concat4([script, asm.ret(1).to_bytes()]);
+  script = concat5([script, asm.ret(1).to_bytes()]);
   return { script, scriptData };
 }, "assembleTransferToContractScript");
 
@@ -7782,7 +8129,7 @@ var Account = class extends AbstractAccount {
     super();
     this._provider = provider;
     this._connector = connector;
-    this.address = new Address5(address);
+    this.address = new Address6(address);
   }
   /**
    * The provider used to interact with the network.
@@ -7793,7 +8140,7 @@ var Account = class extends AbstractAccount {
    */
   get provider() {
     if (!this._provider) {
-      throw new FuelError22(ErrorCode19.MISSING_PROVIDER, "Provider not set");
+      throw new FuelError23(ErrorCode20.MISSING_PROVIDER, "Provider not set");
     }
     return this._provider;
   }
@@ -7820,10 +8167,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.
@@ -7872,7 +8233,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,
@@ -7884,9 +8245,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 || bn21(0);
+    const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || bn22(0);
     const requiredQuantitiesWithFee = addAmountToCoinQuantities({
-      amount: bn21(fee),
+      amount: bn22(fee),
       assetId: baseAssetId,
       coinQuantities: requiredQuantities
     });
@@ -7894,7 +8255,7 @@ var Account = class extends AbstractAccount {
     requiredQuantitiesWithFee.forEach(({ amount, assetId }) => {
       quantitiesDict[assetId] = {
         required: amount,
-        owned: bn21(0)
+        owned: bn22(0)
       };
     });
     request.inputs.filter(isRequestInputResource).forEach((input) => {
@@ -7918,7 +8279,8 @@ 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);
@@ -7955,8 +8317,8 @@ var Account = class extends AbstractAccount {
       fundingAttempts += 1;
     }
     if (needsToBeFunded) {
-      throw new FuelError22(
-        ErrorCode19.INSUFFICIENT_FUNDS_OR_MAX_COINS,
+      throw new FuelError23(
+        ErrorCode20.INSUFFICIENT_FUNDS,
         `The account ${this.address} does not have enough base asset funds to cover the transaction execution.`
       );
     }
@@ -7984,16 +8346,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,
@@ -8010,10 +8376,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 });
   }
   /**
@@ -8021,12 +8390,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,
@@ -8046,7 +8419,7 @@ var Account = class extends AbstractAccount {
   addTransfer(request, transferParams) {
     const { destination, amount, assetId } = transferParams;
     this.validateTransferAmount(amount);
-    request.addCoinOutput(new Address5(destination), amount, assetId);
+    request.addCoinOutput(new Address6(destination), amount, assetId);
     return request;
   }
   /**
@@ -8073,24 +8446,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 = bn21(transferParam.amount);
-      const contractAddress = new Address5(transferParam.contractId);
+      const amount = bn22(transferParam.amount);
+      const contractAddress = new Address6(transferParam.contractId);
       const assetId = transferParam.assetId ? hexlify21(transferParam.assetId) : defaultAssetId;
       if (amount.lte(0)) {
-        throw new FuelError22(
-          ErrorCode19.INVALID_TRANSFER_AMOUNT,
+        throw new FuelError23(
+          ErrorCode20.INVALID_TRANSFER_AMOUNT,
           "Transfer amount must be a positive number."
         );
       }
@@ -8105,7 +8481,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,
@@ -8121,26 +8501,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 Address5(recipient);
-    const recipientDataArray = arrayify17(
+  async withdrawToBaseLayer(recipient, amount, txParams = {}, { skipAutoConsolidation } = {}) {
+    const recipientAddress = new Address6(recipient);
+    const recipientDataArray = arrayify18(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
     );
-    const amountDataArray = arrayify17(
-      "0x".concat(bn21(amount).toHex().substring(2).padStart(16, "0"))
+    const amountDataArray = arrayify18(
+      "0x".concat(bn22(amount).toHex().substring(2).padStart(16, "0"))
     );
     const script = new Uint8Array([
-      ...arrayify17(withdrawScript.bytes),
+      ...arrayify18(withdrawScript.bytes),
       ...recipientDataArray,
       ...amountDataArray
     ]);
     const params = { script, ...txParams };
     const baseAssetId = await this.provider.getBaseAssetId();
     let request = new ScriptTransactionRequest(params);
-    const quantities = [{ amount: bn21(amount), assetId: baseAssetId }];
-    const { gasPrice, transactionRequest } = await this.assembleTx(request, quantities);
+    const quantities = [{ amount: bn22(amount), assetId: baseAssetId }];
+    const { gasPrice, transactionRequest } = await this.assembleTx({
+      transactionRequest: request,
+      quantities,
+      skipAutoConsolidation
+    });
     request = await setAndValidateGasAndFeeForAssembledTx({
       gasPrice,
       provider: this.provider,
@@ -8150,6 +8535,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.
    *
@@ -8169,6 +8573,7 @@ var Account = class extends AbstractAccount {
     const isBaseAsset = baseAssetId === assetId;
     let submitAll;
     const consolidationParams = {
+      assetId,
       coins,
       mode: params.mode,
       outputNum: params.outputNum
@@ -8176,10 +8581,7 @@ var Account = class extends AbstractAccount {
     if (isBaseAsset) {
       ({ submitAll } = await this.assembleBaseAssetConsolidationTxs(consolidationParams));
     } else {
-      throw new FuelError22(
-        ErrorCode19.UNSUPPORTED_FEATURE,
-        "Consolidation for non-base assets is not supported yet."
-      );
+      ({ submitAll } = await this.assembleNonBaseAssetConsolidationTxs(consolidationParams));
     }
     return submitAll();
   }
@@ -8200,7 +8602,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 = bn21(0);
+    let totalFeeCost = bn22(0);
     const txs = [];
     const coinsBatches = splitCoinsIntoBatches(coins, maxInputsNumber);
     const gasPrice = await this.provider.estimateGasPrice(10);
@@ -8224,15 +8626,79 @@ var Account = class extends AbstractAccount {
       });
       request.maxFee = fee;
       if (consolidateMoreThanOneCoin) {
-        const total = request.inputs.filter(isRequestInputCoin).reduce((acc, input) => acc.add(input.amount), bn21(0));
+        const total = request.inputs.filter(isRequestInputCoin).reduce((acc, input) => acc.add(input.amount), bn22(0));
+        const amountPerNewUtxo = total.div(outputNum + 1);
+        request.outputs.forEach((output) => {
+          if (output.type === OutputType10.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 = bn22(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), bn22(0));
         const amountPerNewUtxo = total.div(outputNum + 1);
         request.outputs.forEach((output) => {
-          if (output.type === OutputType9.Coin) {
+          if (output.type === OutputType10.Coin) {
             output.amount = amountPerNewUtxo;
           }
         });
       }
       totalFeeCost = totalFeeCost.add(fee);
+      const baseAssetResources = [];
+      let fundingFeeTotal = bn22(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 });
@@ -8296,7 +8762,7 @@ var Account = class extends AbstractAccount {
     const baseAssetId = await this.provider.getBaseAssetId();
     const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
     const requiredQuantities = mergeQuantities(coinOutputsQuantities, quantities);
-    const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: bn21("100000000000000000") }];
+    const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: bn22("100000000000000000") }];
     const findAssetInput = /* @__PURE__ */ __name((assetId) => txRequestClone.inputs.find((input) => {
       if (input.type === InputType8.Coin) {
         return input.assetId === assetId;
@@ -8344,7 +8810,7 @@ var Account = class extends AbstractAccount {
    */
   async signMessage(message) {
     if (!this._connector) {
-      throw new FuelError22(ErrorCode19.MISSING_CONNECTOR, "A connector is required to sign messages.");
+      throw new FuelError23(ErrorCode20.MISSING_CONNECTOR, "A connector is required to sign messages.");
     }
     return this._connector.signMessage(this.address.toString(), message);
   }
@@ -8356,8 +8822,8 @@ var Account = class extends AbstractAccount {
    */
   async signTransaction(transactionRequestLike, connectorOptions = {}) {
     if (!this._connector) {
-      throw new FuelError22(
-        ErrorCode19.MISSING_CONNECTOR,
+      throw new FuelError23(
+        ErrorCode20.MISSING_CONNECTOR,
         "A connector is required to sign transactions."
       );
     }
@@ -8424,8 +8890,8 @@ var Account = class extends AbstractAccount {
     return coins.map((coin) => ({
       id: hexlify21(randomBytes5(UTXO_ID_LEN3)),
       owner: this.address,
-      blockCreated: bn21(1),
-      txCreatedIdx: bn21(1),
+      blockCreated: bn22(1),
+      txCreatedIdx: bn22(1),
       ...coin
     }));
   }
@@ -8452,73 +8918,50 @@ var Account = class extends AbstractAccount {
     } : void 0;
   }
   /** @hidden * */
-  async assembleTx(transactionRequest, quantities = []) {
-    const outputQuantities = transactionRequest.outputs.filter((o) => o.type === OutputType9.Coin).map(({ amount, assetId }) => ({ assetId: String(assetId), amount: bn21(amount) }));
-    transactionRequest.gasLimit = bn21(0);
-    transactionRequest.maxFee = bn21(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 === OutputType10.Coin).map(({ amount, assetId }) => ({ assetId: String(assetId), amount: bn22(amount) }));
+    transactionRequest.gasLimit = bn22(0);
+    transactionRequest.maxFee = bn22(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 (bn21(amount).lte(0)) {
-      throw new FuelError22(
-        ErrorCode19.INVALID_TRANSFER_AMOUNT,
+    if (bn22(amount).lte(0)) {
+      throw new FuelError23(
+        ErrorCode20.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 (!isDefined4(setGasLimit)) {
-      request.gasLimit = gasUsed;
-    } else if (gasUsed.gt(setGasLimit)) {
-      throw new FuelError22(
-        ErrorCode19.GAS_LIMIT_TOO_LOW,
-        `Gas limit '${setGasLimit}' is lower than the required: '${gasUsed}'.`
-      );
-    }
-    if (!isDefined4(setMaxFee)) {
-      request.maxFee = maxFee;
-    } else if (maxFee.gt(setMaxFee)) {
-      throw new FuelError22(
-        ErrorCode19.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 FuelError22(ErrorCode19.NO_COINS_TO_CONSOLIDATE, "No coins to consolidate.");
+      throw new FuelError23(ErrorCode20.NO_COINS_TO_CONSOLIDATE, "No coins to consolidate.");
     }
     if (!coins.every((c) => c.assetId === assetId)) {
-      throw new FuelError22(
-        ErrorCode19.COINS_ASSET_ID_MISMATCH,
+      throw new FuelError23(
+        ErrorCode20.COINS_ASSET_ID_MISMATCH,
         "All coins to consolidate must be from the same asset id."
       );
     }
@@ -8543,7 +8986,7 @@ var Account = class extends AbstractAccount {
 };
 
 // src/wallet/keystore-wallet.ts
-import { Address as Address6 } from "@fuel-ts/address";
+import { Address as Address7 } from "@fuel-ts/address";
 import {
   bufferFromString,
   keccak256,
@@ -8554,7 +8997,7 @@ import {
   encryptJsonWalletData,
   randomUUID as randomUUID2
 } from "@fuel-ts/crypto";
-import { ErrorCode as ErrorCode20, FuelError as FuelError23 } from "@fuel-ts/errors";
+import { ErrorCode as ErrorCode21, FuelError as FuelError24 } from "@fuel-ts/errors";
 import { hexlify as hexlify22 } from "@fuel-ts/utils";
 var DEFAULT_KDF_PARAMS_LOG_N = 13;
 var DEFAULT_KDF_PARAMS_R = 8;
@@ -8569,7 +9012,7 @@ var removeHexPrefix = /* @__PURE__ */ __name((hexString) => {
 }, "removeHexPrefix");
 async function encryptKeystoreWallet(privateKey, address, password) {
   const privateKeyBuffer = bufferFromString(removeHexPrefix(privateKey), "hex");
-  const ownerAddress = new Address6(address);
+  const ownerAddress = new Address7(address);
   const salt = randomBytes6(DEFAULT_KEY_SIZE);
   const key = scrypt({
     password: bufferFromString(password),
@@ -8632,8 +9075,8 @@ async function decryptKeystoreWallet(jsonWallet, password) {
   const macHashUint8Array = keccak256(data);
   const macHash = stringFromBuffer(macHashUint8Array, "hex");
   if (mac !== macHash) {
-    throw new FuelError23(
-      ErrorCode20.INVALID_PASSWORD,
+    throw new FuelError24(
+      ErrorCode21.INVALID_PASSWORD,
       "Failed to decrypt the keystore wallet, the provided password is incorrect."
     );
   }
@@ -8772,16 +9215,16 @@ var BaseWalletUnlocked = class extends Account {
 
 // src/hdwallet/hdwallet.ts
 import { computeHmac as computeHmac2, ripemd160 } from "@fuel-ts/crypto";
-import { ErrorCode as ErrorCode23, FuelError as FuelError26 } from "@fuel-ts/errors";
+import { ErrorCode as ErrorCode24, FuelError as FuelError27 } from "@fuel-ts/errors";
 import { sha256 as sha2564 } from "@fuel-ts/hasher";
-import { bn as bn22, toBytes as toBytes2, toHex } from "@fuel-ts/math";
-import { arrayify as arrayify20, hexlify as hexlify25, concat as concat6, dataSlice as dataSlice2, encodeBase58 as encodeBase582, decodeBase58 } from "@fuel-ts/utils";
+import { bn as bn23, toBytes as toBytes3, toHex } from "@fuel-ts/math";
+import { arrayify as arrayify21, hexlify as hexlify25, concat as concat7, dataSlice as dataSlice2, encodeBase58 as encodeBase582, decodeBase58 } from "@fuel-ts/utils";
 
 // src/mnemonic/mnemonic.ts
 import { randomBytes as randomBytes7, pbkdf2, computeHmac } from "@fuel-ts/crypto";
-import { ErrorCode as ErrorCode22, FuelError as FuelError25 } from "@fuel-ts/errors";
+import { ErrorCode as ErrorCode23, FuelError as FuelError26 } from "@fuel-ts/errors";
 import { sha256 as sha2563 } from "@fuel-ts/hasher";
-import { arrayify as arrayify19, hexlify as hexlify24, concat as concat5, dataSlice, encodeBase58, toUtf8Bytes } from "@fuel-ts/utils";
+import { arrayify as arrayify20, hexlify as hexlify24, concat as concat6, dataSlice, encodeBase58, toUtf8Bytes } from "@fuel-ts/utils";
 
 // src/wordlists/words/english.ts
 var english = [
@@ -10836,9 +11279,9 @@ var english = [
 ];
 
 // src/mnemonic/utils.ts
-import { ErrorCode as ErrorCode21, FuelError as FuelError24 } from "@fuel-ts/errors";
+import { ErrorCode as ErrorCode22, FuelError as FuelError25 } from "@fuel-ts/errors";
 import { sha256 as sha2562 } from "@fuel-ts/hasher";
-import { arrayify as arrayify18 } from "@fuel-ts/utils";
+import { arrayify as arrayify19 } from "@fuel-ts/utils";
 function getLowerMask(bits) {
   return (1 << bits) - 1;
 }
@@ -10877,7 +11320,7 @@ function entropyToMnemonicIndices(entropy) {
     }
   }
   const checksumBits = entropy.length / 4;
-  const checksum = arrayify18(sha2562(entropy))[0] & getUpperMask(checksumBits);
+  const checksum = arrayify19(sha2562(entropy))[0] & getUpperMask(checksumBits);
   indices[indices.length - 1] <<= checksumBits;
   indices[indices.length - 1] |= checksum >> 8 - checksumBits;
   return indices;
@@ -10885,13 +11328,13 @@ function entropyToMnemonicIndices(entropy) {
 __name(entropyToMnemonicIndices, "entropyToMnemonicIndices");
 function mnemonicWordsToEntropy(words, wordlist) {
   const size = Math.ceil(11 * words.length / 8);
-  const entropy = arrayify18(new Uint8Array(size));
+  const entropy = arrayify19(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 FuelError24(
-        ErrorCode21.INVALID_MNEMONIC,
+      throw new FuelError25(
+        ErrorCode22.INVALID_MNEMONIC,
         `Invalid mnemonic: the word '${words[i]}' is not found in the provided wordlist.`
       );
     }
@@ -10905,10 +11348,10 @@ function mnemonicWordsToEntropy(words, wordlist) {
   const entropyBits = 32 * words.length / 3;
   const checksumBits = words.length / 3;
   const checksumMask = getUpperMask(checksumBits);
-  const checksum = arrayify18(sha2562(entropy.slice(0, entropyBits / 8)))[0] & checksumMask;
+  const checksum = arrayify19(sha2562(entropy.slice(0, entropyBits / 8)))[0] & checksumMask;
   if (checksum !== (entropy[entropy.length - 1] & checksumMask)) {
-    throw new FuelError24(
-      ErrorCode21.INVALID_CHECKSUM,
+    throw new FuelError25(
+      ErrorCode22.INVALID_CHECKSUM,
       "Checksum validation failed for the provided mnemonic."
     );
   }
@@ -10923,8 +11366,8 @@ var TestnetPRV = "0x04358394";
 var MNEMONIC_SIZES = [12, 15, 18, 21, 24];
 function assertWordList(wordlist) {
   if (wordlist.length !== 2048) {
-    throw new FuelError25(
-      ErrorCode22.INVALID_WORD_LIST,
+    throw new FuelError26(
+      ErrorCode23.INVALID_WORD_LIST,
       `Expected word list length of 2048, but got ${wordlist.length}.`
     );
   }
@@ -10932,8 +11375,8 @@ function assertWordList(wordlist) {
 __name(assertWordList, "assertWordList");
 function assertEntropy(entropy) {
   if (entropy.length % 4 !== 0 || entropy.length < 16 || entropy.length > 32) {
-    throw new FuelError25(
-      ErrorCode22.INVALID_ENTROPY,
+    throw new FuelError26(
+      ErrorCode23.INVALID_ENTROPY,
       `Entropy should be between 16 and 32 bytes and a multiple of 4, but got ${entropy.length} bytes.`
     );
   }
@@ -10944,7 +11387,7 @@ function assertMnemonic(words) {
     const errorMsg = `Invalid mnemonic size. Expected one of [${MNEMONIC_SIZES.join(
       ", "
     )}] words, but got ${words.length}.`;
-    throw new FuelError25(ErrorCode22.INVALID_MNEMONIC, errorMsg);
+    throw new FuelError26(ErrorCode23.INVALID_MNEMONIC, errorMsg);
   }
 }
 __name(assertMnemonic, "assertMnemonic");
@@ -10995,7 +11438,7 @@ var Mnemonic = class _Mnemonic {
    * @returns 64-byte array contains privateKey and chainCode as described on BIP39
    */
   static entropyToMnemonic(entropy, wordlist = english) {
-    const entropyBytes = arrayify19(entropy);
+    const entropyBytes = arrayify20(entropy);
     assertWordList(wordlist);
     assertEntropy(entropyBytes);
     return entropyToMnemonicIndices(entropyBytes).map((i) => wordlist[i]).join(" ");
@@ -11064,14 +11507,14 @@ var Mnemonic = class _Mnemonic {
    * @returns 64-byte array contains privateKey and chainCode as described on BIP39
    */
   static masterKeysFromSeed(seed) {
-    const seedArray = arrayify19(seed);
+    const seedArray = arrayify20(seed);
     if (seedArray.length < 16 || seedArray.length > 64) {
-      throw new FuelError25(
-        ErrorCode22.INVALID_SEED,
+      throw new FuelError26(
+        ErrorCode23.INVALID_SEED,
         `Seed length should be between 16 and 64 bytes, but received ${seedArray.length} bytes.`
       );
     }
-    return arrayify19(computeHmac("sha512", MasterSecret, seedArray));
+    return arrayify20(computeHmac("sha512", MasterSecret, seedArray));
   }
   /**
    * Get the extendKey as defined on BIP-32 from the provided seed
@@ -11082,22 +11525,22 @@ var Mnemonic = class _Mnemonic {
    */
   static seedToExtendedKey(seed, testnet = false) {
     const masterKey = _Mnemonic.masterKeysFromSeed(seed);
-    const prefix = arrayify19(testnet ? TestnetPRV : MainnetPRV);
+    const prefix = arrayify20(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 = concat5([
+    const extendedKey = concat6([
       prefix,
       depth,
       fingerprint,
       index,
       chainCode,
-      concat5(["0x00", privateKey])
+      concat6(["0x00", privateKey])
     ]);
     const checksum = dataSlice(sha2563(sha2563(extendedKey)), 0, 4);
-    return encodeBase58(concat5([extendedKey, checksum]));
+    return encodeBase58(concat6([extendedKey, checksum]));
   }
   /**
    *  Create a new mnemonic using a randomly generated number as entropy.
@@ -11112,7 +11555,7 @@ var Mnemonic = class _Mnemonic {
    * @returns A randomly generated mnemonic
    */
   static generate(size = 32, extraEntropy = "") {
-    const entropy = extraEntropy ? sha2563(concat5([randomBytes7(size), arrayify19(extraEntropy)])) : randomBytes7(size);
+    const entropy = extraEntropy ? sha2563(concat6([randomBytes7(size), arrayify20(extraEntropy)])) : randomBytes7(size);
     return _Mnemonic.entropyToMnemonic(entropy);
   }
 };
@@ -11125,7 +11568,7 @@ var MainnetPUB = hexlify25("0x0488b21e");
 var TestnetPRV2 = hexlify25("0x04358394");
 var TestnetPUB = hexlify25("0x043587cf");
 function base58check(data) {
-  return encodeBase582(concat6([data, dataSlice2(sha2564(sha2564(data)), 0, 4)]));
+  return encodeBase582(concat7([data, dataSlice2(sha2564(sha2564(data)), 0, 4)]));
 }
 __name(base58check, "base58check");
 function getExtendedKeyPrefix(isPublic = false, testnet = false) {
@@ -11148,7 +11591,7 @@ __name(isValidExtendedKey, "isValidExtendedKey");
 function parsePath(path2, depth = 0) {
   const components = path2.split("/");
   if (components.length === 0 || components[0] === "m" && depth !== 0) {
-    throw new FuelError26(ErrorCode23.HD_WALLET_ERROR, `invalid path - ${path2}`);
+    throw new FuelError27(ErrorCode24.HD_WALLET_ERROR, `invalid path - ${path2}`);
   }
   if (components[0] === "m") {
     components.shift();
@@ -11181,8 +11624,8 @@ var HDWallet = class _HDWallet {
       this.privateKey = hexlify25(config.privateKey);
     } else {
       if (!config.publicKey) {
-        throw new FuelError26(
-          ErrorCode23.HD_WALLET_ERROR,
+        throw new FuelError27(
+          ErrorCode24.HD_WALLET_ERROR,
           "Both public and private Key cannot be missing. At least one should be provided."
         );
       }
@@ -11205,28 +11648,28 @@ var HDWallet = class _HDWallet {
    * @returns A new instance of HDWallet on the derived index
    */
   deriveIndex(index) {
-    const privateKey = this.privateKey && arrayify20(this.privateKey);
-    const publicKey = arrayify20(this.publicKey);
-    const chainCode = arrayify20(this.chainCode);
+    const privateKey = this.privateKey && arrayify21(this.privateKey);
+    const publicKey = arrayify21(this.publicKey);
+    const chainCode = arrayify21(this.chainCode);
     const data = new Uint8Array(37);
     if (index & HARDENED_INDEX) {
       if (!privateKey) {
-        throw new FuelError26(
-          ErrorCode23.HD_WALLET_ERROR,
+        throw new FuelError27(
+          ErrorCode24.HD_WALLET_ERROR,
           "Cannot derive a hardened index without a private Key."
         );
       }
       data.set(privateKey, 1);
     } else {
-      data.set(arrayify20(this.publicKey));
+      data.set(arrayify21(this.publicKey));
     }
-    data.set(toBytes2(index, 4), 33);
-    const bytes = arrayify20(computeHmac2("sha512", chainCode, data));
+    data.set(toBytes3(index, 4), 33);
+    const bytes = arrayify21(computeHmac2("sha512", chainCode, data));
     const IL = bytes.slice(0, 32);
     const IR = bytes.slice(32);
     if (privateKey) {
       const N = "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141";
-      const ki = bn22(IL).add(privateKey).mod(N).toBytes(32);
+      const ki = bn23(IL).add(privateKey).mod(N).toBytes(32);
       return new _HDWallet({
         privateKey: ki,
         chainCode: IR,
@@ -11264,8 +11707,8 @@ var HDWallet = class _HDWallet {
    */
   toExtendedKey(isPublic = false, testnet = false) {
     if (this.depth >= 256) {
-      throw new FuelError26(
-        ErrorCode23.HD_WALLET_ERROR,
+      throw new FuelError27(
+        ErrorCode24.HD_WALLET_ERROR,
         `Exceeded max depth of 255. Current depth: ${this.depth}.`
       );
     }
@@ -11274,8 +11717,8 @@ var HDWallet = class _HDWallet {
     const parentFingerprint = this.parentFingerprint;
     const index = toHex(this.index, 4);
     const chainCode = this.chainCode;
-    const key = this.privateKey != null && !isPublic ? concat6(["0x00", this.privateKey]) : this.publicKey;
-    const extendedKey = arrayify20(concat6([prefix, depth, parentFingerprint, index, chainCode, key]));
+    const key = this.privateKey != null && !isPublic ? concat7(["0x00", this.privateKey]) : this.publicKey;
+    const extendedKey = arrayify21(concat7([prefix, depth, parentFingerprint, index, chainCode, key]));
     return base58check(extendedKey);
   }
   /**
@@ -11287,19 +11730,19 @@ var HDWallet = class _HDWallet {
   static fromSeed(seed) {
     const masterKey = mnemonic_default.masterKeysFromSeed(seed);
     return new _HDWallet({
-      chainCode: arrayify20(masterKey.slice(32)),
-      privateKey: arrayify20(masterKey.slice(0, 32))
+      chainCode: arrayify21(masterKey.slice(32)),
+      privateKey: arrayify21(masterKey.slice(0, 32))
     });
   }
   static fromExtendedKey(extendedKey) {
-    const decoded = hexlify25(toBytes2(decodeBase58(extendedKey)));
-    const bytes = arrayify20(decoded);
+    const decoded = hexlify25(toBytes3(decodeBase58(extendedKey)));
+    const bytes = arrayify21(decoded);
     const validChecksum = base58check(bytes.slice(0, 78)) === extendedKey;
     if (bytes.length !== 82 || !isValidExtendedKey(bytes)) {
-      throw new FuelError26(ErrorCode23.HD_WALLET_ERROR, "Provided key is not a valid extended key.");
+      throw new FuelError27(ErrorCode24.HD_WALLET_ERROR, "Provided key is not a valid extended key.");
     }
     if (!validChecksum) {
-      throw new FuelError26(ErrorCode23.HD_WALLET_ERROR, "Provided key has an invalid checksum.");
+      throw new FuelError27(ErrorCode24.HD_WALLET_ERROR, "Provided key has an invalid checksum.");
     }
     const depth = bytes[4];
     const parentFingerprint = hexlify25(bytes.slice(5, 9));
@@ -11307,14 +11750,14 @@ var HDWallet = class _HDWallet {
     const chainCode = hexlify25(bytes.slice(13, 45));
     const key = bytes.slice(45, 78);
     if (depth === 0 && parentFingerprint !== "0x00000000" || depth === 0 && index !== 0) {
-      throw new FuelError26(
-        ErrorCode23.HD_WALLET_ERROR,
+      throw new FuelError27(
+        ErrorCode24.HD_WALLET_ERROR,
         "Inconsistency detected: Depth is zero but fingerprint/index is non-zero."
       );
     }
     if (isPublicExtendedKey(bytes)) {
       if (key[0] !== 3) {
-        throw new FuelError26(ErrorCode23.HD_WALLET_ERROR, "Invalid public extended key.");
+        throw new FuelError27(ErrorCode24.HD_WALLET_ERROR, "Invalid public extended key.");
       }
       return new _HDWallet({
         publicKey: key,
@@ -11325,7 +11768,7 @@ var HDWallet = class _HDWallet {
       });
     }
     if (key[0] !== 0) {
-      throw new FuelError26(ErrorCode23.HD_WALLET_ERROR, "Invalid private extended key.");
+      throw new FuelError27(ErrorCode24.HD_WALLET_ERROR, "Invalid private extended key.");
     }
     return new _HDWallet({
       privateKey: key.slice(1),
@@ -11561,7 +12004,7 @@ var WalletsConfig = class _WalletsConfig {
       assetIds.forEach((assetId) => {
         for (let index = 0; index < coinsPerAsset; index++) {
           coins.push({
-            amount: bn23(amountPerCoin).toString(),
+            amount: bn24(amountPerCoin).toString(),
             asset_id: assetId,
             owner: walletAddress,
             tx_pointer_block_height: 0,
@@ -11581,26 +12024,26 @@ var WalletsConfig = class _WalletsConfig {
     amountPerCoin
   }) {
     if (Array.isArray(wallets) && wallets.length === 0 || typeof wallets === "number" && wallets <= 0) {
-      throw new FuelError27(
-        FuelError27.CODES.INVALID_INPUT_PARAMETERS,
+      throw new FuelError28(
+        FuelError28.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 FuelError27(
-        FuelError27.CODES.INVALID_INPUT_PARAMETERS,
+      throw new FuelError28(
+        FuelError28.CODES.INVALID_INPUT_PARAMETERS,
         "Number of assets per wallet must be greater than zero."
       );
     }
     if (coinsPerAsset <= 0) {
-      throw new FuelError27(
-        FuelError27.CODES.INVALID_INPUT_PARAMETERS,
+      throw new FuelError28(
+        FuelError28.CODES.INVALID_INPUT_PARAMETERS,
         "Number of coins per asset must be greater than zero."
       );
     }
-    if (bn23(amountPerCoin).lt(0)) {
-      throw new FuelError27(
-        FuelError27.CODES.INVALID_INPUT_PARAMETERS,
+    if (bn24(amountPerCoin).lt(0)) {
+      throw new FuelError28(
+        FuelError28.CODES.INVALID_INPUT_PARAMETERS,
         "Amount per coin must be greater than or equal to zero."
       );
     }
@@ -11676,9 +12119,9 @@ async function setupTestProviderAndWallets({
 __name(setupTestProviderAndWallets, "setupTestProviderAndWallets");
 
 // src/test-utils/test-message.ts
-import { Address as Address7 } from "@fuel-ts/address";
+import { Address as Address8 } from "@fuel-ts/address";
 import { randomBytes as randomBytes9 } from "@fuel-ts/crypto";
-import { bn as bn24 } from "@fuel-ts/math";
+import { bn as bn25 } from "@fuel-ts/math";
 import { hexlify as hexlify27 } from "@fuel-ts/utils";
 var TestMessage = class {
   static {
@@ -11697,8 +12140,8 @@ var TestMessage = class {
    * It can also be used standalone and passed into the initial state of a chain via the `.toChainMessage` method.
    */
   constructor({
-    sender = Address7.fromRandom(),
-    recipient = Address7.fromRandom(),
+    sender = Address8.fromRandom(),
+    recipient = Address8.fromRandom(),
     nonce = hexlify27(randomBytes9(32)),
     amount = 1e6,
     data = "",
@@ -11718,7 +12161,7 @@ var TestMessage = class {
       sender: this.sender.toB256(),
       recipient: recipient?.toB256() ?? this.recipient.toB256(),
       nonce: this.nonce,
-      amount: bn24(this.amount).toNumber(),
+      amount: bn25(this.amount).toNumber(),
       data,
       da_height: this.da_height
     };