@fuel-ts/account 0.0.0-rc-2037-20240411135757 → 0.0.0-rc-1976-20240411153008

package/dist/index.mjs

@@ -29,14 +29,12 @@ 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) => {
@@ -45,11 +43,11 @@ var coinQuantityfy = (coinQuantityLike) => {
   let max2;
   if (Array.isArray(coinQuantityLike)) {
     amount = coinQuantityLike[0];
-    assetId = coinQuantityLike[1] ?? BaseAssetId;
-    max2 = coinQuantityLike[2] ?? void 0;
+    assetId = coinQuantityLike[1];
+    max2 = coinQuantityLike[2];
   } else {
     amount = coinQuantityLike.amount;
-    assetId = coinQuantityLike.assetId ?? BaseAssetId;
+    assetId = coinQuantityLike.assetId;
     max2 = coinQuantityLike.max ?? void 0;
   }
   const bnAmount = bn(amount);
@@ -1156,7 +1154,7 @@ var outputify = (value) => {
 
 // src/providers/transaction-request/transaction-request.ts
 import { Address, addressify } from "@fuel-ts/address";
-import { BaseAssetId as BaseAssetId2, ZeroBytes32 as ZeroBytes324 } from "@fuel-ts/address/configs";
+import { ZeroBytes32 as ZeroBytes324 } from "@fuel-ts/address/configs";
 import { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
@@ -1690,6 +1688,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.
    *
@@ -1702,8 +1702,9 @@ var BaseTransactionRequest = class {
     witnessLimit,
     inputs,
     outputs,
-    witnesses
-  } = {}) {
+    witnesses,
+    baseAssetId
+  }) {
     this.gasPrice = bn7(gasPrice);
     this.maturity = maturity ?? 0;
     this.witnessLimit = witnessLimit ? bn7(witnessLimit) : void 0;
@@ -1711,6 +1712,7 @@ var BaseTransactionRequest = class {
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
+    this.baseAssetId = baseAssetId;
   }
   static getPolicyMeta(req) {
     let policyTypes = 0;
@@ -1904,8 +1906,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;
@@ -1916,14 +1918,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      id,
+      ...coin,
       type: InputType2.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1934,11 +1936,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 = BaseAssetId2;
+  addMessageInput(message, predicate) {
+    const { recipient, sender, amount } = message;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -1949,16 +1949,16 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      nonce,
+      ...message,
       type: InputType2.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
@@ -1986,6 +1986,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.
    *
@@ -1993,12 +2019,12 @@ var BaseTransactionRequest = class {
    * @param amount - Amount of coin.
    * @param assetId - Asset ID of coin.
    */
-  addCoinOutput(to, amount, assetId = BaseAssetId2) {
+  addCoinOutput(to, amount, assetId) {
     this.pushOutput({
       type: OutputType2.Coin,
       to: addressify(to).toB256(),
       amount,
-      assetId
+      assetId: assetId ?? this.baseAssetId
     });
     return this;
   }
@@ -2025,7 +2051,7 @@ var BaseTransactionRequest = class {
    * @param to - Address of the owner.
    * @param assetId - Asset ID of coin.
    */
-  addChangeOutput(to, assetId = BaseAssetId2) {
+  addChangeOutput(to, assetId) {
     const changeOutput = this.getChangeOutputs().find(
       (output) => hexlify7(output.assetId) === assetId
     );
@@ -2033,7 +2059,7 @@ var BaseTransactionRequest = class {
       this.pushOutput({
         type: OutputType2.Change,
         to: addressify(to).toB256(),
-        assetId
+        assetId: assetId ?? this.baseAssetId
       });
     }
   }
@@ -2115,7 +2141,7 @@ var BaseTransactionRequest = class {
         ]);
       }
     };
-    updateAssetInput(BaseAssetId2, bn7(1e11));
+    updateAssetInput(this.baseAssetId, bn7(1e11));
     quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
   }
   /**
@@ -2285,12 +2311,7 @@ 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);
@@ -2414,7 +2435,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);
@@ -3589,6 +3610,7 @@ var processGqlChain = (chain) => {
       gasPerByte: bn15(feeParams.gasPerByte),
       maxMessageDataLength: bn15(predicateParams.maxMessageDataLength),
       chainId: bn15(consensusParameters.chainId),
+      baseAssetId: consensusParameters.baseAssetId,
       gasCosts
     },
     gasCosts,
@@ -3831,6 +3853,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.
    *
@@ -4867,8 +4900,9 @@ 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 = BaseAssetId3) {
-    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;
   }
   /**
@@ -4906,9 +4940,10 @@ 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: BaseAssetId3,
+      assetId: baseAssetId,
       coinQuantities
     });
     const quantitiesDict = {};
@@ -4932,8 +4967,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[BaseAssetId3]) {
-          quantitiesDict[BaseAssetId3].owned = quantitiesDict[BaseAssetId3].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);
         }
       }
@@ -4965,11 +5000,13 @@ 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 = BaseAssetId3, 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(Address3.fromAddressOrString(destination), amount, assetId);
+    request.addCoinOutput(Address3.fromAddressOrString(destination), amount, assetIdToTransfer);
     const { maxFee, requiredQuantities, gasUsed, estimatedInputs } = await this.provider.getTransactionCost(request, [], {
       estimateTxDependencies: true,
       resourcesOwner: this
@@ -4995,14 +5032,15 @@ 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 = BaseAssetId3, txParams = {}) {
+  async transfer(destination, amount, assetId, txParams = {}) {
     if (bn17(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.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 });
   }
   /**
@@ -5014,7 +5052,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 = BaseAssetId3, txParams = {}) {
+  async transferToContract(contractId, amount, assetId, txParams = {}) {
     if (bn17(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.INVALID_TRANSFER_AMOUNT,
@@ -5023,11 +5061,13 @@ var Account = class extends AbstractAccount {
     }
     const contractAddress = Address3.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: bn17(amount),
-      assetId
+      assetId: assetIdToTransfer
     });
     const request = new ScriptTransactionRequest({
       ...params,
@@ -5037,7 +5077,7 @@ var Account = class extends AbstractAccount {
     request.addContractInputAndOutput(contractAddress);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(
       request,
-      [{ amount: bn17(amount), assetId: String(assetId) }]
+      [{ amount: bn17(amount), assetId: String(assetIdToTransfer) }]
     );
     request.gasLimit = bn17(params.gasLimit ?? gasUsed);
     this.validateGas({
@@ -5059,6 +5099,7 @@ 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"))
@@ -5071,9 +5112,14 @@ var Account = class extends AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = { script, gasPrice: minGasPrice, ...txParams };
+    const params = {
+      script,
+      gasPrice: minGasPrice,
+      baseAssetId,
+      ...txParams
+    };
     const request = new ScriptTransactionRequest(params);
-    const forwardingQuantities = [{ amount: bn17(amount), assetId: BaseAssetId3 }];
+    const forwardingQuantities = [{ amount: bn17(amount), assetId: baseAssetId }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
@@ -8650,7 +8696,6 @@ 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 { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
@@ -8715,7 +8760,6 @@ var Predicate = class extends Account {
       if (input.type === InputType7.Coin && hexlify19(input.owner) === this.address.toB256()) {
         input.predicate = this.bytes;
         input.predicateData = this.getPredicateData(policies.length);
-        input.witnessIndex = 0;
       }
     });
     return request;
@@ -8729,8 +8773,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 = BaseAssetId4, 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);
   }
   /**
@@ -8753,20 +8798,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: hexlify19(this.bytes)
-    }));
-  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();