@fuel-ts/account 0.0.0-rc-1976-20240417161625 → 0.0.0-rc-2037-20240417202046

package/dist/index.mjs

@@ -29,12 +29,14 @@ var __privateMethod = (obj, member, method) => {
 
 // src/account.ts
 import { Address as Address3 } from "@fuel-ts/address";
+import { BaseAssetId as BaseAssetId3 } from "@fuel-ts/address/configs";
 import { ErrorCode as ErrorCode15, FuelError as FuelError15 } from "@fuel-ts/errors";
 import { AbstractAccount } from "@fuel-ts/interfaces";
 import { bn as bn17 } from "@fuel-ts/math";
 import { arrayify as arrayify14 } from "@fuel-ts/utils";
 
 // src/providers/coin-quantity.ts
+import { BaseAssetId } from "@fuel-ts/address/configs";
 import { bn } from "@fuel-ts/math";
 import { hexlify } from "@fuel-ts/utils";
 var coinQuantityfy = (coinQuantityLike) => {
@@ -43,11 +45,11 @@ var coinQuantityfy = (coinQuantityLike) => {
   let max2;
   if (Array.isArray(coinQuantityLike)) {
     amount = coinQuantityLike[0];
-    assetId = coinQuantityLike[1];
-    max2 = coinQuantityLike[2];
+    assetId = coinQuantityLike[1] ?? BaseAssetId;
+    max2 = coinQuantityLike[2] ?? void 0;
   } else {
     amount = coinQuantityLike.amount;
-    assetId = coinQuantityLike.assetId;
+    assetId = coinQuantityLike.assetId ?? BaseAssetId;
     max2 = coinQuantityLike.max ?? void 0;
   }
   const bnAmount = bn(amount);
@@ -74,7 +76,7 @@ import { Address as Address2 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode13, FuelError as FuelError13 } from "@fuel-ts/errors";
 import { BN, bn as bn15, max } from "@fuel-ts/math";
 import {
-  InputType as InputType6,
+  InputType as InputType7,
   TransactionType as TransactionType8,
   InputMessageCoder,
   TransactionCoder as TransactionCoder5
@@ -1165,13 +1167,13 @@ var outputify = (value) => {
 // src/providers/transaction-request/transaction-request.ts
 import { UTXO_ID_LEN as UTXO_ID_LEN2 } from "@fuel-ts/abi-coder";
 import { Address, addressify } from "@fuel-ts/address";
-import { ZeroBytes32 as ZeroBytes324 } from "@fuel-ts/address/configs";
+import { BaseAssetId as BaseAssetId2, ZeroBytes32 as ZeroBytes324 } from "@fuel-ts/address/configs";
 import { randomBytes } from "@fuel-ts/crypto";
 import { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
   TransactionCoder,
-  InputType as InputType2,
+  InputType as InputType3,
   OutputType as OutputType2,
   TransactionType
 } from "@fuel-ts/transactions";
@@ -1674,6 +1676,33 @@ var NoWitnessByOwnerError = class extends Error {
   name = "NoWitnessByOwnerError";
 };
 
+// src/providers/transaction-request/helpers.ts
+import { InputType as InputType2 } from "@fuel-ts/transactions";
+var isRequestInputCoin = (input) => input.type === InputType2.Coin;
+var isRequestInputMessage = (input) => input.type === InputType2.Message;
+var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
+var getRequestInputResourceOwner = (input) => {
+  if (isRequestInputCoin(input)) {
+    return input.owner;
+  }
+  return input.recipient;
+};
+var isRequestInputResourceFromOwner = (input, owner) => getRequestInputResourceOwner(input) === owner.toB256();
+var cacheResources = (resources) => resources.reduce(
+  (cache2, resource) => {
+    if (isCoin(resource)) {
+      cache2.utxos.push(resource.id);
+    } else {
+      cache2.messages.push(resource.nonce);
+    }
+    return cache2;
+  },
+  {
+    utxos: [],
+    messages: []
+  }
+);
+
 // src/providers/transaction-request/witness.ts
 import { arrayify as arrayify4, hexlify as hexlify6 } from "@fuel-ts/utils";
 var witnessify = (value) => {
@@ -1700,8 +1729,6 @@ 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.
    *
@@ -1714,9 +1741,8 @@ var BaseTransactionRequest = class {
     witnessLimit,
     inputs,
     outputs,
-    witnesses,
-    baseAssetId
-  }) {
+    witnesses
+  } = {}) {
     this.gasPrice = bn7(gasPrice);
     this.maturity = maturity ?? 0;
     this.witnessLimit = witnessLimit ? bn7(witnessLimit) : void 0;
@@ -1724,7 +1750,6 @@ var BaseTransactionRequest = class {
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
-    this.baseAssetId = baseAssetId;
   }
   static getPolicyMeta(req) {
     let policyTypes = 0;
@@ -1868,7 +1893,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -1900,9 +1925,9 @@ var BaseTransactionRequest = class {
     const ownerAddress = addressify(owner);
     const found = this.inputs.find((input) => {
       switch (input.type) {
-        case InputType2.Coin:
+        case InputType3.Coin:
           return hexlify7(input.owner) === ownerAddress.toB256();
-        case InputType2.Message:
+        case InputType3.Message:
           return hexlify7(input.recipient) === ownerAddress.toB256();
         default:
           return false;
@@ -1918,8 +1943,8 @@ var BaseTransactionRequest = class {
    * @param predicate - Predicate bytes.
    * @param predicateData - Predicate data bytes.
    */
-  addCoinInput(coin, predicate) {
-    const { assetId, owner, amount } = coin;
+  addCoinInput(coin) {
+    const { assetId, owner, amount, id, predicate } = coin;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -1930,14 +1955,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...coin,
-      type: InputType2.Coin,
+      id,
+      type: InputType3.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1948,9 +1973,11 @@ var BaseTransactionRequest = class {
    *
    * @param message - Message resource.
    * @param predicate - Predicate bytes.
+   * @param predicateData - Predicate data bytes.
    */
-  addMessageInput(message, predicate) {
-    const { recipient, sender, amount } = message;
+  addMessageInput(message) {
+    const { recipient, sender, amount, predicate, nonce } = message;
+    const assetId = BaseAssetId2;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -1961,16 +1988,16 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...message,
-      type: InputType2.Message,
+      nonce,
+      type: InputType3.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
-    this.addChangeOutput(recipient, this.baseAssetId);
+    this.addChangeOutput(recipient, assetId);
   }
   /**
    * Adds a single resource to the transaction by adding a coin/message input and a
@@ -1998,32 +2025,6 @@ 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.
    *
@@ -2031,12 +2032,12 @@ var BaseTransactionRequest = class {
    * @param amount - Amount of coin.
    * @param assetId - Asset ID of coin.
    */
-  addCoinOutput(to, amount, assetId) {
+  addCoinOutput(to, amount, assetId = BaseAssetId2) {
     this.pushOutput({
       type: OutputType2.Coin,
       to: addressify(to).toB256(),
       amount,
-      assetId: assetId ?? this.baseAssetId
+      assetId
     });
     return this;
   }
@@ -2063,7 +2064,7 @@ var BaseTransactionRequest = class {
    * @param to - Address of the owner.
    * @param assetId - Asset ID of coin.
    */
-  addChangeOutput(to, assetId) {
+  addChangeOutput(to, assetId = BaseAssetId2) {
     const changeOutput = this.getChangeOutputs().find(
       (output) => hexlify7(output.assetId) === assetId
     );
@@ -2071,7 +2072,7 @@ var BaseTransactionRequest = class {
       this.pushOutput({
         type: OutputType2.Change,
         to: addressify(to).toB256(),
-        assetId: assetId ?? this.baseAssetId
+        assetId
       });
     }
   }
@@ -2147,7 +2148,7 @@ var BaseTransactionRequest = class {
         ]);
       }
     };
-    updateAssetInput(this.baseAssetId, bn7(1e11));
+    updateAssetInput(BaseAssetId2, bn7(1e11));
     quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
   }
   /**
@@ -2172,16 +2173,20 @@ var BaseTransactionRequest = class {
   toJSON() {
     return normalizeJSON(this);
   }
+  removeWitness(index) {
+    this.witnesses.splice(index, 1);
+    this.adjustWitnessIndexes(index);
+  }
   updatePredicateInputs(inputs) {
     this.inputs.forEach((i) => {
       let correspondingInput;
       switch (i.type) {
-        case InputType2.Coin:
-          correspondingInput = inputs.find((x) => x.type === InputType2.Coin && x.owner === i.owner);
+        case InputType3.Coin:
+          correspondingInput = inputs.find((x) => x.type === InputType3.Coin && x.owner === i.owner);
           break;
-        case InputType2.Message:
+        case InputType3.Message:
           correspondingInput = inputs.find(
-            (x) => x.type === InputType2.Message && x.sender === i.sender
+            (x) => x.type === InputType3.Message && x.sender === i.sender
           );
           break;
         default:
@@ -2194,6 +2199,13 @@ var BaseTransactionRequest = class {
       }
     });
   }
+  adjustWitnessIndexes(removedIndex) {
+    this.inputs.filter(isRequestInputResource).forEach((input) => {
+      if (input.witnessIndex > removedIndex) {
+        input.witnessIndex -= 1;
+      }
+    });
+  }
 };
 
 // src/providers/transaction-request/create-transaction-request.ts
@@ -2206,7 +2218,7 @@ import { arrayify as arrayify6, hexlify as hexlify9 } from "@fuel-ts/utils";
 import { ZeroBytes32 as ZeroBytes325 } from "@fuel-ts/address/configs";
 import { uint64ToBytesBE, sha256 } from "@fuel-ts/hasher";
 import { bn as bn8 } from "@fuel-ts/math";
-import { TransactionType as TransactionType2, InputType as InputType3, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
+import { TransactionType as TransactionType2, InputType as InputType4, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
 import { concat as concat2 } from "@fuel-ts/utils";
 import { clone as clone2 } from "ramda";
 function hashTransaction(transactionRequest, chainId) {
@@ -2217,7 +2229,7 @@ function hashTransaction(transactionRequest, chainId) {
   transaction.inputs = transaction.inputs.map((input) => {
     const inputClone = clone2(input);
     switch (inputClone.type) {
-      case InputType3.Coin: {
+      case InputType4.Coin: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2225,11 +2237,11 @@ function hashTransaction(transactionRequest, chainId) {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType3.Message: {
+      case InputType4.Message: {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType3.Contract: {
+      case InputType4.Contract: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2317,7 +2329,12 @@ 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 = hexlify9(salt ?? ZeroBytes326);
@@ -2390,7 +2407,7 @@ import { Interface } from "@fuel-ts/abi-coder";
 import { addressify as addressify2 } from "@fuel-ts/address";
 import { ZeroBytes32 as ZeroBytes327 } from "@fuel-ts/address/configs";
 import { bn as bn10 } from "@fuel-ts/math";
-import { InputType as InputType4, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
+import { InputType as InputType5, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
 import { arrayify as arrayify8, hexlify as hexlify10 } from "@fuel-ts/utils";
 
 // src/providers/transaction-request/scripts.ts
@@ -2441,7 +2458,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 = bn10(gasLimit);
     this.script = arrayify8(script ?? returnZeroScript.bytes);
@@ -2474,7 +2491,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2550,7 +2567,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType4.Contract,
+      type: InputType5.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2745,7 +2762,7 @@ var getFunctionCall = ({ abi, receipt, rawPayload, maxInputs }) => {
 
 // src/providers/transaction-summary/input.ts
 import { ErrorCode as ErrorCode9, FuelError as FuelError9 } from "@fuel-ts/errors";
-import { InputType as InputType5 } from "@fuel-ts/transactions";
+import { InputType as InputType6 } from "@fuel-ts/transactions";
 function getInputsByTypes(inputs, types) {
   return inputs.filter((i) => types.includes(i.type));
 }
@@ -2753,16 +2770,16 @@ function getInputsByType(inputs, type) {
   return inputs.filter((i) => i.type === type);
 }
 function getInputsCoin(inputs) {
-  return getInputsByType(inputs, InputType5.Coin);
+  return getInputsByType(inputs, InputType6.Coin);
 }
 function getInputsMessage(inputs) {
-  return getInputsByType(inputs, InputType5.Message);
+  return getInputsByType(inputs, InputType6.Message);
 }
 function getInputsCoinAndMessage(inputs) {
-  return getInputsByTypes(inputs, [InputType5.Coin, InputType5.Message]);
+  return getInputsByTypes(inputs, [InputType6.Coin, InputType6.Message]);
 }
 function getInputsContract(inputs) {
-  return getInputsByType(inputs, InputType5.Contract);
+  return getInputsByType(inputs, InputType6.Contract);
 }
 function getInputFromAssetId(inputs, assetId) {
   const coinInputs = getInputsCoin(inputs);
@@ -2781,7 +2798,7 @@ function getInputContractFromIndex(inputs, inputIndex) {
   if (!contractInput) {
     return void 0;
   }
-  if (contractInput.type !== InputType5.Contract) {
+  if (contractInput.type !== InputType6.Contract) {
     throw new FuelError9(
       ErrorCode9.INVALID_TRANSACTION_INPUT,
       `Contract input should be of type 'contract'.`
@@ -2790,10 +2807,10 @@ function getInputContractFromIndex(inputs, inputIndex) {
   return contractInput;
 }
 function getInputAccountAddress(input) {
-  if (input.type === InputType5.Coin) {
+  if (input.type === InputType6.Coin) {
     return input.owner.toString();
   }
-  if (input.type === InputType5.Message) {
+  if (input.type === InputType6.Message) {
     return input.recipient.toString();
   }
   return "";
@@ -3616,7 +3633,6 @@ var processGqlChain = (chain) => {
       gasPerByte: bn15(feeParams.gasPerByte),
       maxMessageDataLength: bn15(predicateParams.maxMessageDataLength),
       chainId: bn15(consensusParameters.chainId),
-      baseAssetId: consensusParameters.baseAssetId,
       gasCosts
     },
     gasCosts,
@@ -3859,17 +3875,6 @@ 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.
    *
@@ -4549,7 +4554,7 @@ cacheInputs_fn = function(inputs) {
     return;
   }
   inputs.forEach((input) => {
-    if (input.type === InputType6.Coin) {
+    if (input.type === InputType7.Coin) {
       this.cache?.set(input.id);
     }
   });
@@ -4933,9 +4938,8 @@ var Account = class extends AbstractAccount {
    * @param assetId - The asset ID to check the balance for.
    * @returns A promise that resolves to the balance amount.
    */
-  async getBalance(assetId) {
-    const assetIdToFetch = assetId ?? this.provider.getBaseAssetId();
-    const amount = await this.provider.getBalance(this.address, assetIdToFetch);
+  async getBalance(assetId = BaseAssetId3) {
+    const amount = await this.provider.getBalance(this.address, assetId);
     return amount;
   }
   /**
@@ -4973,10 +4977,9 @@ var Account = class extends 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: bn17(fee),
-      assetId: baseAssetId,
+      assetId: BaseAssetId3,
       coinQuantities
     });
     const quantitiesDict = {};
@@ -5000,8 +5003,8 @@ var Account = class extends AbstractAccount {
             quantitiesDict[assetId].owned = quantitiesDict[assetId].owned.add(amount);
             cachedUtxos.push(input.id);
           }
-        } else if (input.recipient === owner && input.amount && quantitiesDict[baseAssetId]) {
-          quantitiesDict[baseAssetId].owned = quantitiesDict[baseAssetId].owned.add(input.amount);
+        } else if (input.recipient === owner && input.amount && quantitiesDict[BaseAssetId3]) {
+          quantitiesDict[BaseAssetId3].owned = quantitiesDict[BaseAssetId3].owned.add(input.amount);
           cachedMessages.push(input.nonce);
         }
       }
@@ -5033,13 +5036,11 @@ var Account = class extends AbstractAccount {
    * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
    * @returns A promise that resolves to the prepared transaction request.
    */
-  async createTransfer(destination, amount, assetId, txParams = {}) {
+  async createTransfer(destination, amount, assetId = BaseAssetId3, txParams = {}) {
     const { minGasPrice } = this.provider.getGasConfig();
-    const baseAssetId = this.provider.getBaseAssetId();
-    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-    const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
+    const params = { gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
-    request.addCoinOutput(Address3.fromAddressOrString(destination), amount, assetIdToTransfer);
+    request.addCoinOutput(Address3.fromAddressOrString(destination), amount, assetId);
     const { maxFee, requiredQuantities, gasUsed, estimatedInputs } = await this.provider.getTransactionCost(request, [], {
       estimateTxDependencies: true,
       resourcesOwner: this
@@ -5065,15 +5066,14 @@ var Account = class extends AbstractAccount {
    * @param txParams - The transaction parameters (gasLimit, gasPrice, maturity).
    * @returns A promise that resolves to the transaction response.
    */
-  async transfer(destination, amount, assetId, txParams = {}) {
+  async transfer(destination, amount, assetId = BaseAssetId3, txParams = {}) {
     if (bn17(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.INVALID_TRANSFER_AMOUNT,
         "Transfer amount must be a positive number."
       );
     }
-    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-    const request = await this.createTransfer(destination, amount, assetIdToTransfer, txParams);
+    const request = await this.createTransfer(destination, amount, assetId, txParams);
     return this.sendTransaction(request, { estimateTxDependencies: false });
   }
   /**
@@ -5085,7 +5085,7 @@ var Account = class extends AbstractAccount {
    * @param txParams - The optional transaction parameters.
    * @returns A promise that resolves to the transaction response.
    */
-  async transferToContract(contractId, amount, assetId, txParams = {}) {
+  async transferToContract(contractId, amount, assetId = BaseAssetId3, txParams = {}) {
     if (bn17(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.INVALID_TRANSFER_AMOUNT,
@@ -5094,13 +5094,11 @@ var Account = class extends AbstractAccount {
     }
     const contractAddress = Address3.fromAddressOrString(contractId);
     const { minGasPrice } = this.provider.getGasConfig();
-    const baseAssetId = this.provider.getBaseAssetId();
-    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-    const params = { gasPrice: minGasPrice, baseAssetId, ...txParams };
+    const params = { gasPrice: minGasPrice, ...txParams };
     const { script, scriptData } = await assembleTransferToContractScript({
       hexlifiedContractId: contractAddress.toB256(),
       amountToTransfer: bn17(amount),
-      assetId: assetIdToTransfer
+      assetId
     });
     const request = new ScriptTransactionRequest({
       ...params,
@@ -5110,7 +5108,7 @@ var Account = class extends AbstractAccount {
     request.addContractInputAndOutput(contractAddress);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(
       request,
-      [{ amount: bn17(amount), assetId: String(assetIdToTransfer) }]
+      [{ amount: bn17(amount), assetId: String(assetId) }]
     );
     request.gasLimit = bn17(params.gasLimit ?? gasUsed);
     this.validateGas({
@@ -5132,7 +5130,6 @@ var Account = class extends AbstractAccount {
    */
   async withdrawToBaseLayer(recipient, amount, txParams = {}) {
     const { minGasPrice } = this.provider.getGasConfig();
-    const baseAssetId = this.provider.getBaseAssetId();
     const recipientAddress = Address3.fromAddressOrString(recipient);
     const recipientDataArray = arrayify14(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -5145,14 +5142,9 @@ var Account = class extends AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = {
-      script,
-      gasPrice: minGasPrice,
-      baseAssetId,
-      ...txParams
-    };
+    const params = { script, gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
-    const forwardingQuantities = [{ amount: bn17(amount), assetId: baseAssetId }];
+    const forwardingQuantities = [{ amount: bn17(amount), assetId: BaseAssetId3 }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
@@ -8729,8 +8721,9 @@ import {
   SCRIPT_FIXED_SIZE
 } from "@fuel-ts/abi-coder";
 import { Address as Address9 } from "@fuel-ts/address";
+import { BaseAssetId as BaseAssetId4 } from "@fuel-ts/address/configs";
 import { ErrorCode as ErrorCode24, FuelError as FuelError24 } from "@fuel-ts/errors";
-import { ByteArrayCoder, InputType as InputType7 } from "@fuel-ts/transactions";
+import { ByteArrayCoder } from "@fuel-ts/transactions";
 import { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
 
 // src/predicate/utils/getPredicateRoot.ts
@@ -8789,10 +8782,15 @@ var Predicate = class extends Account {
   populateTransactionPredicateData(transactionRequestLike) {
     const request = transactionRequestify(transactionRequestLike);
     const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-    request.inputs?.forEach((input) => {
-      if (input.type === InputType7.Coin && hexlify19(input.owner) === this.address.toB256()) {
+    const placeholderIndex = this.getIndexFromPlaceholderWitness(request);
+    if (placeholderIndex !== -1) {
+      request.removeWitness(placeholderIndex);
+    }
+    request.inputs.filter(isRequestInputResource).forEach((input) => {
+      if (isRequestInputResourceFromOwner(input, this.address)) {
         input.predicate = this.bytes;
         input.predicateData = this.getPredicateData(policies.length);
+        input.witnessIndex = 0;
       }
     });
     return request;
@@ -8806,9 +8804,8 @@ 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, txParams = {}) {
-    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
-    const request = await super.createTransfer(destination, amount, assetIdToTransfer, txParams);
+  async createTransfer(destination, amount, assetId = BaseAssetId4, txParams = {}) {
+    const request = await super.createTransfer(destination, amount, assetId, txParams);
     return this.populateTransactionPredicateData(request);
   }
   /**
@@ -8831,6 +8828,20 @@ 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: hexlify19(this.bytes)
+    }));
+  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();
@@ -8910,6 +8921,22 @@ var Predicate = class extends Account {
     }
     return mutatedBytes;
   }
+  getIndexFromPlaceholderWitness(request) {
+    const predicateInputs = request.inputs.filter(isRequestInputResource).filter((input) => isRequestInputResourceFromOwner(input, this.address));
+    let index = -1;
+    const hasEmptyPredicateInputs = predicateInputs.find((input) => !input.predicate);
+    if (hasEmptyPredicateInputs) {
+      index = hasEmptyPredicateInputs.witnessIndex;
+      const allInputsAreEmpty = predicateInputs.every((input) => !input.predicate);
+      if (!allInputsAreEmpty) {
+        const wasFilledInputAddedFirst = !!predicateInputs[0]?.predicate;
+        if (wasFilledInputAddedFirst) {
+          index = -1;
+        }
+      }
+    }
+    return index;
+  }
 };
 
 // src/connectors/fuel.ts
@@ -9632,6 +9659,7 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
+  cacheResources,
   calculateMetadataGasForTxCreate,
   calculateMetadataGasForTxScript,
   calculatePriceWithFactor,
@@ -9678,6 +9706,7 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
+  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -9691,6 +9720,10 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
+  isRequestInputCoin,
+  isRequestInputMessage,
+  isRequestInputResource,
+  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,