@fuel-ts/account 0.0.0-rc-2037-20240412171107 → 0.0.0-rc-1976-20240415100843

package/dist/index.js

@@ -184,14 +184,12 @@ module.exports = __toCommonJS(src_exports);
 
 // src/account.ts
 var import_address4 = require("@fuel-ts/address");
-var import_configs12 = require("@fuel-ts/address/configs");
 var import_errors16 = require("@fuel-ts/errors");
 var import_interfaces = require("@fuel-ts/interfaces");
 var import_math18 = require("@fuel-ts/math");
 var import_utils28 = require("@fuel-ts/utils");
 
 // src/providers/coin-quantity.ts
-var import_configs = require("@fuel-ts/address/configs");
 var import_math = require("@fuel-ts/math");
 var import_utils = require("@fuel-ts/utils");
 var coinQuantityfy = (coinQuantityLike) => {
@@ -200,11 +198,11 @@ var coinQuantityfy = (coinQuantityLike) => {
   let max2;
   if (Array.isArray(coinQuantityLike)) {
     amount = coinQuantityLike[0];
-    assetId = coinQuantityLike[1] ?? import_configs.BaseAssetId;
-    max2 = coinQuantityLike[2] ?? void 0;
+    assetId = coinQuantityLike[1];
+    max2 = coinQuantityLike[2];
   } else {
     amount = coinQuantityLike.amount;
-    assetId = coinQuantityLike.assetId ?? import_configs.BaseAssetId;
+    assetId = coinQuantityLike.assetId;
     max2 = coinQuantityLike.max ?? void 0;
   }
   const bnAmount = (0, import_math.bn)(amount);
@@ -1174,7 +1172,7 @@ var MemoryCache = class {
 
 // src/providers/transaction-request/input.ts
 var import_abi_coder = require("@fuel-ts/abi-coder");
-var import_configs2 = require("@fuel-ts/address/configs");
+var import_configs = require("@fuel-ts/address/configs");
 var import_errors3 = require("@fuel-ts/errors");
 var import_math2 = require("@fuel-ts/math");
 var import_transactions = require("@fuel-ts/transactions");
@@ -1208,10 +1206,10 @@ var inputify = (value) => {
     case import_transactions.InputType.Contract: {
       return {
         type: import_transactions.InputType.Contract,
-        txID: import_configs2.ZeroBytes32,
+        txID: import_configs.ZeroBytes32,
         outputIndex: 0,
-        balanceRoot: import_configs2.ZeroBytes32,
-        stateRoot: import_configs2.ZeroBytes32,
+        balanceRoot: import_configs.ZeroBytes32,
+        stateRoot: import_configs.ZeroBytes32,
         txPointer: {
           blockHeight: (0, import_math2.toNumber)((0, import_utils3.arrayify)(value.txPointer).slice(0, 8)),
           txIndex: (0, import_math2.toNumber)((0, import_utils3.arrayify)(value.txPointer).slice(8, 16))
@@ -1249,7 +1247,7 @@ var inputify = (value) => {
 };
 
 // src/providers/transaction-request/output.ts
-var import_configs3 = require("@fuel-ts/address/configs");
+var import_configs2 = require("@fuel-ts/address/configs");
 var import_errors4 = require("@fuel-ts/errors");
 var import_math3 = require("@fuel-ts/math");
 var import_transactions2 = require("@fuel-ts/transactions");
@@ -1269,8 +1267,8 @@ var outputify = (value) => {
       return {
         type: import_transactions2.OutputType.Contract,
         inputIndex: value.inputIndex,
-        balanceRoot: import_configs3.ZeroBytes32,
-        stateRoot: import_configs3.ZeroBytes32
+        balanceRoot: import_configs2.ZeroBytes32,
+        stateRoot: import_configs2.ZeroBytes32
       };
     }
     case import_transactions2.OutputType.Change: {
@@ -1284,9 +1282,9 @@ var outputify = (value) => {
     case import_transactions2.OutputType.Variable: {
       return {
         type: import_transactions2.OutputType.Variable,
-        to: import_configs3.ZeroBytes32,
+        to: import_configs2.ZeroBytes32,
         amount: (0, import_math3.bn)(0),
-        assetId: import_configs3.ZeroBytes32
+        assetId: import_configs2.ZeroBytes32
       };
     }
     case import_transactions2.OutputType.ContractCreated: {
@@ -1308,7 +1306,7 @@ var outputify = (value) => {
 // src/providers/transaction-request/transaction-request.ts
 var import_abi_coder2 = require("@fuel-ts/abi-coder");
 var import_address = require("@fuel-ts/address");
-var import_configs7 = require("@fuel-ts/address/configs");
+var import_configs6 = require("@fuel-ts/address/configs");
 var import_crypto = require("@fuel-ts/crypto");
 var import_math7 = require("@fuel-ts/math");
 var import_transactions6 = require("@fuel-ts/transactions");
@@ -1321,13 +1319,13 @@ var isCoin = (resource) => "id" in resource;
 var isMessage = (resource) => "recipient" in resource;
 
 // src/providers/utils/receipts.ts
-var import_configs4 = require("@fuel-ts/address/configs");
+var import_configs3 = require("@fuel-ts/address/configs");
 var import_errors5 = require("@fuel-ts/errors");
 var import_math4 = require("@fuel-ts/math");
 var import_transactions3 = require("@fuel-ts/transactions");
-var import_configs5 = require("@fuel-ts/transactions/configs");
+var import_configs4 = require("@fuel-ts/transactions/configs");
 var import_utils5 = require("@fuel-ts/utils");
-var doesReceiptHaveMissingOutputVariables = (receipt) => receipt.type === import_transactions3.ReceiptType.Revert && receipt.val.toString("hex") === import_configs5.FAILED_TRANSFER_TO_ADDRESS_SIGNAL;
+var doesReceiptHaveMissingOutputVariables = (receipt) => receipt.type === import_transactions3.ReceiptType.Revert && receipt.val.toString("hex") === import_configs4.FAILED_TRANSFER_TO_ADDRESS_SIGNAL;
 var doesReceiptHaveMissingContractId = (receipt) => receipt.type === import_transactions3.ReceiptType.Panic && receipt.contractId !== "0x0000000000000000000000000000000000000000000000000000000000000000";
 var getReceiptsWithMissingData = (receipts) => receipts.reduce(
   (memo, receipt) => {
@@ -1344,7 +1342,7 @@ var getReceiptsWithMissingData = (receipts) => receipts.reduce(
     missingOutputContractIds: []
   }
 );
-var hexOrZero = (hex) => hex || import_configs4.ZeroBytes32;
+var hexOrZero = (hex) => hex || import_configs3.ZeroBytes32;
 function assembleReceiptByType(receipt) {
   const { receiptType } = receipt;
   switch (receiptType) {
@@ -1708,16 +1706,16 @@ function sleep(time) {
 var import_errors7 = require("@fuel-ts/errors");
 var import_math6 = require("@fuel-ts/math");
 var import_transactions5 = require("@fuel-ts/transactions");
-var import_configs6 = require("@fuel-ts/transactions/configs");
+var import_configs5 = require("@fuel-ts/transactions/configs");
 var assemblePanicError = (status) => {
   let errorMessage = `The transaction reverted with reason: "${status.reason}".`;
   const reason = status.reason;
-  if (import_configs6.PANIC_REASONS.includes(status.reason)) {
+  if (import_configs5.PANIC_REASONS.includes(status.reason)) {
     errorMessage = `${errorMessage}
 
 You can read more about this error at:
 
-${import_configs6.PANIC_DOC_URL}#variant.${status.reason}`;
+${import_configs5.PANIC_DOC_URL}#variant.${status.reason}`;
   }
   return { errorMessage, reason };
 };
@@ -1729,28 +1727,28 @@ var assembleRevertError = (receipts, logs) => {
   if (revertReceipt) {
     const reasonHex = (0, import_math6.bn)(revertReceipt.val).toHex();
     switch (reasonHex) {
-      case import_configs6.FAILED_REQUIRE_SIGNAL: {
+      case import_configs5.FAILED_REQUIRE_SIGNAL: {
         reason = "require";
         errorMessage = `The transaction reverted because a "require" statement has thrown ${logs.length ? stringify(logs[0]) : "an error."}.`;
         break;
       }
-      case import_configs6.FAILED_ASSERT_EQ_SIGNAL: {
+      case import_configs5.FAILED_ASSERT_EQ_SIGNAL: {
         const sufix = logs.length >= 2 ? ` comparing ${stringify(logs[1])} and ${stringify(logs[0])}.` : ".";
         reason = "assert_eq";
         errorMessage = `The transaction reverted because of an "assert_eq" statement${sufix}`;
         break;
       }
-      case import_configs6.FAILED_ASSERT_NE_SIGNAL: {
+      case import_configs5.FAILED_ASSERT_NE_SIGNAL: {
         const sufix = logs.length >= 2 ? ` comparing ${stringify(logs[1])} and ${stringify(logs[0])}.` : ".";
         reason = "assert_ne";
         errorMessage = `The transaction reverted because of an "assert_ne" statement${sufix}`;
         break;
       }
-      case import_configs6.FAILED_ASSERT_SIGNAL:
+      case import_configs5.FAILED_ASSERT_SIGNAL:
         reason = "assert";
         errorMessage = `The transaction reverted because an "assert" statement failed to evaluate to true.`;
         break;
-      case import_configs6.FAILED_TRANSFER_TO_ADDRESS_SIGNAL:
+      case import_configs5.FAILED_TRANSFER_TO_ADDRESS_SIGNAL:
         reason = "MissingOutputChange";
         errorMessage = `The transaction reverted because it's missing an "OutputChange".`;
         break;
@@ -1824,6 +1822,8 @@ var BaseTransactionRequest = class {
   outputs = [];
   /** List of witnesses */
   witnesses = [];
+  /** Base asset ID - should be fetched from the chain */
+  baseAssetId;
   /**
    * Constructor for initializing a base transaction request.
    *
@@ -1836,8 +1836,9 @@ var BaseTransactionRequest = class {
     witnessLimit,
     inputs,
     outputs,
-    witnesses
-  } = {}) {
+    witnesses,
+    baseAssetId
+  }) {
     this.gasPrice = (0, import_math7.bn)(gasPrice);
     this.maturity = maturity ?? 0;
     this.witnessLimit = witnessLimit ? (0, import_math7.bn)(witnessLimit) : void 0;
@@ -1845,6 +1846,7 @@ var BaseTransactionRequest = class {
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
+    this.baseAssetId = baseAssetId;
   }
   static getPolicyMeta(req) {
     let policyTypes = 0;
@@ -1937,7 +1939,7 @@ var BaseTransactionRequest = class {
    * @returns The index of the created witness.
    */
   addEmptyWitness() {
-    this.addWitness((0, import_utils9.concat)([import_configs7.ZeroBytes32, import_configs7.ZeroBytes32]));
+    this.addWitness((0, import_utils9.concat)([import_configs6.ZeroBytes32, import_configs6.ZeroBytes32]));
     return this.witnesses.length - 1;
   }
   /**
@@ -2038,8 +2040,8 @@ var BaseTransactionRequest = class {
    * @param predicate - Predicate bytes.
    * @param predicateData - Predicate data bytes.
    */
-  addCoinInput(coin) {
-    const { assetId, owner, amount, id, predicate } = coin;
+  addCoinInput(coin, predicate) {
+    const { assetId, owner, amount } = coin;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -2050,14 +2052,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      id,
+      ...coin,
       type: import_transactions6.InputType.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -2068,11 +2070,9 @@ var BaseTransactionRequest = class {
    *
    * @param message - Message resource.
    * @param predicate - Predicate bytes.
-   * @param predicateData - Predicate data bytes.
    */
-  addMessageInput(message) {
-    const { recipient, sender, amount, predicate, nonce } = message;
-    const assetId = import_configs7.BaseAssetId;
+  addMessageInput(message, predicate) {
+    const { recipient, sender, amount } = message;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -2083,16 +2083,16 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      nonce,
+      ...message,
       type: import_transactions6.InputType.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
-    this.addChangeOutput(recipient, assetId);
+    this.addChangeOutput(recipient, this.baseAssetId);
   }
   /**
    * Adds a single resource to the transaction by adding a coin/message input and a
@@ -2120,6 +2120,32 @@ var BaseTransactionRequest = class {
     resources.forEach((resource) => this.addResource(resource));
     return this;
   }
+  /**
+   * Adds multiple resources to the transaction by adding coin/message inputs and change
+   * outputs from the related assetIds.
+   *
+   * @param resources - The resources to add.
+   * @returns This transaction.
+   */
+  addPredicateResource(resource, predicate) {
+    if (isCoin(resource)) {
+      this.addCoinInput(resource, predicate);
+    } else {
+      this.addMessageInput(resource, predicate);
+    }
+    return this;
+  }
+  /**
+   * Adds multiple predicate coin/message inputs to the transaction and change outputs
+   * from the related assetIds.
+   *
+   * @param resources - The resources to add.
+   * @returns This transaction.
+   */
+  addPredicateResources(resources, predicate) {
+    resources.forEach((resource) => this.addPredicateResource(resource, predicate));
+    return this;
+  }
   /**
    * Adds a coin output to the transaction.
    *
@@ -2127,12 +2153,12 @@ var BaseTransactionRequest = class {
    * @param amount - Amount of coin.
    * @param assetId - Asset ID of coin.
    */
-  addCoinOutput(to, amount, assetId = import_configs7.BaseAssetId) {
+  addCoinOutput(to, amount, assetId) {
     this.pushOutput({
       type: import_transactions6.OutputType.Coin,
       to: (0, import_address.addressify)(to).toB256(),
       amount,
-      assetId
+      assetId: assetId ?? this.baseAssetId
     });
     return this;
   }
@@ -2159,7 +2185,7 @@ var BaseTransactionRequest = class {
    * @param to - Address of the owner.
    * @param assetId - Asset ID of coin.
    */
-  addChangeOutput(to, assetId = import_configs7.BaseAssetId) {
+  addChangeOutput(to, assetId) {
     const changeOutput = this.getChangeOutputs().find(
       (output) => (0, import_utils9.hexlify)(output.assetId) === assetId
     );
@@ -2167,7 +2193,7 @@ var BaseTransactionRequest = class {
       this.pushOutput({
         type: import_transactions6.OutputType.Change,
         to: (0, import_address.addressify)(to).toB256(),
-        assetId
+        assetId: assetId ?? this.baseAssetId
       });
     }
   }
@@ -2243,7 +2269,7 @@ var BaseTransactionRequest = class {
         ]);
       }
     };
-    updateAssetInput(import_configs7.BaseAssetId, (0, import_math7.bn)(1e11));
+    updateAssetInput(this.baseAssetId, (0, import_math7.bn)(1e11));
     quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
   }
   /**
@@ -2293,13 +2319,13 @@ var BaseTransactionRequest = class {
 };
 
 // src/providers/transaction-request/create-transaction-request.ts
-var import_configs9 = require("@fuel-ts/address/configs");
+var import_configs8 = require("@fuel-ts/address/configs");
 var import_math9 = require("@fuel-ts/math");
 var import_transactions8 = require("@fuel-ts/transactions");
 var import_utils13 = require("@fuel-ts/utils");
 
 // src/providers/transaction-request/hash-transaction.ts
-var import_configs8 = require("@fuel-ts/address/configs");
+var import_configs7 = require("@fuel-ts/address/configs");
 var import_hasher = require("@fuel-ts/hasher");
 var import_math8 = require("@fuel-ts/math");
 var import_transactions7 = require("@fuel-ts/transactions");
@@ -2308,7 +2334,7 @@ var import_ramda2 = require("ramda");
 function hashTransaction(transactionRequest, chainId) {
   const transaction = transactionRequest.toTransaction();
   if (transaction.type === import_transactions7.TransactionType.Script) {
-    transaction.receiptsRoot = import_configs8.ZeroBytes32;
+    transaction.receiptsRoot = import_configs7.ZeroBytes32;
   }
   transaction.inputs = transaction.inputs.map((input) => {
     const inputClone = (0, import_ramda2.clone)(input);
@@ -2330,10 +2356,10 @@ function hashTransaction(transactionRequest, chainId) {
           blockHeight: 0,
           txIndex: 0
         };
-        inputClone.txID = import_configs8.ZeroBytes32;
+        inputClone.txID = import_configs7.ZeroBytes32;
         inputClone.outputIndex = 0;
-        inputClone.balanceRoot = import_configs8.ZeroBytes32;
-        inputClone.stateRoot = import_configs8.ZeroBytes32;
+        inputClone.balanceRoot = import_configs7.ZeroBytes32;
+        inputClone.stateRoot = import_configs7.ZeroBytes32;
         return inputClone;
       }
       default:
@@ -2344,8 +2370,8 @@ function hashTransaction(transactionRequest, chainId) {
     const outputClone = (0, import_ramda2.clone)(output);
     switch (outputClone.type) {
       case import_transactions7.OutputType.Contract: {
-        outputClone.balanceRoot = import_configs8.ZeroBytes32;
-        outputClone.stateRoot = import_configs8.ZeroBytes32;
+        outputClone.balanceRoot = import_configs7.ZeroBytes32;
+        outputClone.stateRoot = import_configs7.ZeroBytes32;
         return outputClone;
       }
       case import_transactions7.OutputType.Change: {
@@ -2353,9 +2379,9 @@ function hashTransaction(transactionRequest, chainId) {
         return outputClone;
       }
       case import_transactions7.OutputType.Variable: {
-        outputClone.to = import_configs8.ZeroBytes32;
+        outputClone.to = import_configs7.ZeroBytes32;
         outputClone.amount = (0, import_math8.bn)(0);
-        outputClone.assetId = import_configs8.ZeroBytes32;
+        outputClone.assetId = import_configs7.ZeroBytes32;
         return outputClone;
       }
       default:
@@ -2413,15 +2439,10 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
    *
    * @param createTransactionRequestLike - The initial values for the instance
    */
-  constructor({
-    bytecodeWitnessIndex,
-    salt,
-    storageSlots,
-    ...rest
-  } = {}) {
+  constructor({ bytecodeWitnessIndex, salt, storageSlots, ...rest }) {
     super(rest);
     this.bytecodeWitnessIndex = bytecodeWitnessIndex ?? 0;
-    this.salt = (0, import_utils13.hexlify)(salt ?? import_configs9.ZeroBytes32);
+    this.salt = (0, import_utils13.hexlify)(salt ?? import_configs8.ZeroBytes32);
     this.storageSlots = [...storageSlots ?? []];
   }
   /**
@@ -2439,7 +2460,7 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
       bytecodeLength: baseTransaction.witnesses[bytecodeWitnessIndex].dataLength / 4,
       bytecodeWitnessIndex,
       storageSlotsCount: storageSlots.length,
-      salt: this.salt ? (0, import_utils13.hexlify)(this.salt) : import_configs9.ZeroBytes32,
+      salt: this.salt ? (0, import_utils13.hexlify)(this.salt) : import_configs8.ZeroBytes32,
       storageSlots
     };
   }
@@ -2489,7 +2510,7 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
 // src/providers/transaction-request/script-transaction-request.ts
 var import_abi_coder3 = require("@fuel-ts/abi-coder");
 var import_address2 = require("@fuel-ts/address");
-var import_configs10 = require("@fuel-ts/address/configs");
+var import_configs9 = require("@fuel-ts/address/configs");
 var import_math10 = require("@fuel-ts/math");
 var import_transactions9 = require("@fuel-ts/transactions");
 var import_utils15 = require("@fuel-ts/utils");
@@ -2542,7 +2563,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    *
    * @param scriptTransactionRequestLike - The initial values for the instance.
    */
-  constructor({ script, scriptData, gasLimit, ...rest } = {}) {
+  constructor({ script, scriptData, gasLimit, ...rest }) {
     super(rest);
     this.gasLimit = (0, import_math10.bn)(gasLimit);
     this.script = (0, import_utils15.arrayify)(script ?? returnZeroScript.bytes);
@@ -2563,7 +2584,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       ...super.getBaseTransaction(),
       scriptLength: script.length,
       scriptDataLength: scriptData.length,
-      receiptsRoot: import_configs10.ZeroBytes32,
+      receiptsRoot: import_configs9.ZeroBytes32,
       script: (0, import_utils15.hexlify)(script),
       scriptData: (0, import_utils15.hexlify)(scriptData)
     };
@@ -2795,7 +2816,7 @@ var calculateTransactionFee = (params) => {
 };
 
 // src/providers/transaction-summary/operations.ts
-var import_configs11 = require("@fuel-ts/address/configs");
+var import_configs10 = require("@fuel-ts/address/configs");
 var import_errors11 = require("@fuel-ts/errors");
 var import_math13 = require("@fuel-ts/math");
 var import_transactions14 = require("@fuel-ts/transactions");
@@ -3140,7 +3161,7 @@ function extractTransferOperationFromReceipt(receipt, contractInputs, changeOutp
   const { to: toAddress, assetId, amount } = receipt;
   let { from: fromAddress } = receipt;
   const toType = contractInputs.some((input) => input.contractID === toAddress) ? 0 /* contract */ : 1 /* account */;
-  if (import_configs11.ZeroBytes32 === fromAddress) {
+  if (import_configs10.ZeroBytes32 === fromAddress) {
     const change = changeOutputs.find((output) => output.assetId === assetId);
     fromAddress = change?.to || fromAddress;
   }
@@ -3717,6 +3738,7 @@ var processGqlChain = (chain) => {
       gasPerByte: (0, import_math15.bn)(feeParams.gasPerByte),
       maxMessageDataLength: (0, import_math15.bn)(predicateParams.maxMessageDataLength),
       chainId: (0, import_math15.bn)(consensusParameters.chainId),
+      baseAssetId: consensusParameters.baseAssetId,
       gasCosts
     },
     gasCosts,
@@ -3959,6 +3981,17 @@ var _Provider = class {
     } = this.getChain();
     return chainId.toNumber();
   }
+  /**
+   * Returns the base asset ID
+   *
+   * @returns A promise that resolves to the base asset ID
+   */
+  getBaseAssetId() {
+    const {
+      consensusParameters: { baseAssetId }
+    } = this.getChain();
+    return baseAssetId;
+  }
   /**
    * Submits a transaction to the chain to be executed.
    *
@@ -5022,8 +5055,9 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param assetId - The asset ID to check the balance for.
    * @returns A promise that resolves to the balance amount.
    */
-  async getBalance(assetId = import_configs12.BaseAssetId) {
-    const amount = await this.provider.getBalance(this.address, assetId);
+  async getBalance(assetId) {
+    const assetIdToFetch = assetId ?? this.provider.getBaseAssetId();
+    const amount = await this.provider.getBalance(this.address, assetIdToFetch);
     return amount;
   }
   /**
@@ -5061,9 +5095,10 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @returns A promise that resolves when the resources are added to the transaction.
    */
   async fund(request, coinQuantities, fee) {
+    const baseAssetId = this.provider.getBaseAssetId();
     const updatedQuantities = addAmountToAsset({
       amount: (0, import_math18.bn)(fee),
-      assetId: import_configs12.BaseAssetId,
+      assetId: baseAssetId,
       coinQuantities
     });
     const quantitiesDict = {};
@@ -5087,8 +5122,8 @@ var Account = class extends import_interfaces.AbstractAccount {
             quantitiesDict[assetId].owned = quantitiesDict[assetId].owned.add(amount);
             cachedUtxos.push(input.id);
           }
-        } else if (input.recipient === owner && input.amount && quantitiesDict[import_configs12.BaseAssetId]) {
-          quantitiesDict[import_configs12.BaseAssetId].owned = quantitiesDict[import_configs12.BaseAssetId].owned.add(input.amount);
+        } else if (input.recipient === owner && input.amount && quantitiesDict[baseAssetId]) {
+          quantitiesDict[baseAssetId].owned = quantitiesDict[baseAssetId].owned.add(input.amount);
           cachedMessages.push(input.nonce);
         }
       }
@@ -5120,11 +5155,13 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
    * @returns A promise that resolves to the prepared transaction request.
    */
-  async createTransfer(destination, amount, assetId = import_configs12.BaseAssetId, txParams = {}) {
+  async createTransfer(destination, amount, assetId, txParams = {}) {
     const { minGasPrice } = this.provider.getGasConfig();
-    const params = { gasPrice: minGasPrice, ...txParams };
+    const baseAssetId = this.provider.getBaseAssetId();
+    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
+    const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
     const request = new ScriptTransactionRequest(params);
-    request.addCoinOutput(import_address4.Address.fromAddressOrString(destination), amount, assetId);
+    request.addCoinOutput(import_address4.Address.fromAddressOrString(destination), amount, assetIdToTransfer);
     const { maxFee, requiredQuantities, gasUsed, estimatedInputs } = await this.provider.getTransactionCost(request, [], {
       estimateTxDependencies: true,
       resourcesOwner: this
@@ -5150,14 +5187,15 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
    * @returns A promise that resolves to the transaction response.
    */
-  async transfer(destination, amount, assetId = import_configs12.BaseAssetId, txParams = {}) {
+  async transfer(destination, amount, assetId, txParams = {}) {
     if ((0, import_math18.bn)(amount).lte(0)) {
       throw new import_errors16.FuelError(
         import_errors16.ErrorCode.INVALID_TRANSFER_AMOUNT,
         "Transfer amount must be a positive number."
       );
     }
-    const request = await this.createTransfer(destination, amount, assetId, txParams);
+    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
+    const request = await this.createTransfer(destination, amount, assetIdToTransfer, txParams);
     return this.sendTransaction(request, { estimateTxDependencies: false });
   }
   /**
@@ -5169,7 +5207,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param txParams - The optional transaction parameters.
    * @returns A promise that resolves to the transaction response.
    */
-  async transferToContract(contractId, amount, assetId = import_configs12.BaseAssetId, txParams = {}) {
+  async transferToContract(contractId, amount, assetId, txParams = {}) {
     if ((0, import_math18.bn)(amount).lte(0)) {
       throw new import_errors16.FuelError(
         import_errors16.ErrorCode.INVALID_TRANSFER_AMOUNT,
@@ -5178,11 +5216,13 @@ var Account = class extends import_interfaces.AbstractAccount {
     }
     const contractAddress = import_address4.Address.fromAddressOrString(contractId);
     const { minGasPrice } = this.provider.getGasConfig();
-    const params = { gasPrice: minGasPrice, ...txParams };
+    const baseAssetId = this.provider.getBaseAssetId();
+    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
+    const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
     const { script, scriptData } = await assembleTransferToContractScript({
       hexlifiedContractId: contractAddress.toB256(),
       amountToTransfer: (0, import_math18.bn)(amount),
-      assetId
+      assetId: assetIdToTransfer
     });
     const request = new ScriptTransactionRequest({
       ...params,
@@ -5192,7 +5232,7 @@ var Account = class extends import_interfaces.AbstractAccount {
     request.addContractInputAndOutput(contractAddress);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(
       request,
-      [{ amount: (0, import_math18.bn)(amount), assetId: String(assetId) }]
+      [{ amount: (0, import_math18.bn)(amount), assetId: String(assetIdToTransfer) }]
     );
     request.gasLimit = (0, import_math18.bn)(params.gasLimit ?? gasUsed);
     this.validateGas({
@@ -5214,6 +5254,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    */
   async withdrawToBaseLayer(recipient, amount, txParams = {}) {
     const { minGasPrice } = this.provider.getGasConfig();
+    const baseAssetId = this.provider.getBaseAssetId();
     const recipientAddress = import_address4.Address.fromAddressOrString(recipient);
     const recipientDataArray = (0, import_utils28.arrayify)(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -5226,9 +5267,14 @@ var Account = class extends import_interfaces.AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = { script, gasPrice: minGasPrice, ...txParams };
+    const params = {
+      script,
+      gasPrice: minGasPrice,
+      baseAssetId,
+      ...txParams
+    };
     const request = new ScriptTransactionRequest(params);
-    const forwardingQuantities = [{ amount: (0, import_math18.bn)(amount), assetId: import_configs12.BaseAssetId }];
+    const forwardingQuantities = [{ amount: (0, import_math18.bn)(amount), assetId: baseAssetId }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
@@ -8791,7 +8837,6 @@ var StorageAbstract = class {
 // src/predicate/predicate.ts
 var import_abi_coder7 = require("@fuel-ts/abi-coder");
 var import_address10 = require("@fuel-ts/address");
-var import_configs13 = require("@fuel-ts/address/configs");
 var import_errors25 = require("@fuel-ts/errors");
 var import_transactions20 = require("@fuel-ts/transactions");
 var import_utils37 = require("@fuel-ts/utils");
@@ -8856,7 +8901,6 @@ var Predicate = class extends Account {
       if (input.type === import_transactions20.InputType.Coin && (0, import_utils37.hexlify)(input.owner) === this.address.toB256()) {
         input.predicate = this.bytes;
         input.predicateData = this.getPredicateData(policies.length);
-        input.witnessIndex = 0;
       }
     });
     return request;
@@ -8870,8 +8914,9 @@ var Predicate = class extends Account {
    * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
    * @returns A promise that resolves to the prepared transaction request.
    */
-  async createTransfer(destination, amount, assetId = import_configs13.BaseAssetId, txParams = {}) {
-    const request = await super.createTransfer(destination, amount, assetId, txParams);
+  async createTransfer(destination, amount, assetId, txParams = {}) {
+    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
+    const request = await super.createTransfer(destination, amount, assetIdToTransfer, txParams);
     return this.populateTransactionPredicateData(request);
   }
   /**
@@ -8894,20 +8939,6 @@ var Predicate = class extends Account {
     const transactionRequest = this.populateTransactionPredicateData(transactionRequestLike);
     return super.simulateTransaction(transactionRequest);
   }
-  /**
-   * Retrieves resources satisfying the spend query for the account.
-   *
-   * @param quantities - IDs of coins to exclude.
-   * @param excludedIds - IDs of resources to be excluded from the query.
-   * @returns A promise that resolves to an array of Resources.
-   */
-  async getResourcesToSpend(quantities, excludedIds) {
-    const resources = await super.getResourcesToSpend(quantities, excludedIds);
-    return resources.map((resource) => ({
-      ...resource,
-      predicate: (0, import_utils37.hexlify)(this.bytes)
-    }));
-  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();