@fuel-ts/account 0.0.0-rc-1976-20240410103621 → 0.0.0-rc-2034-20240410113328

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);
@@ -1035,7 +1037,7 @@ var inputify = (value) => {
       return {
         type: InputType.Coin,
         txID: hexlify3(arrayify(value.id).slice(0, 32)),
-        outputIndex: arrayify(value.id)[32],
+        outputIndex: toNumber(arrayify(value.id).slice(32, 33)),
         owner: hexlify3(value.owner),
         amount: bn2(value.amount),
         assetId: hexlify3(value.assetId),
@@ -1154,7 +1156,7 @@ var outputify = (value) => {
 
 // src/providers/transaction-request/transaction-request.ts
 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 { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
@@ -1164,6 +1166,7 @@ import {
   TransactionType
 } from "@fuel-ts/transactions";
 import { concat, hexlify as hexlify7 } from "@fuel-ts/utils";
+import { randomBytes } from "ethers";
 
 // src/providers/resource.ts
 var isRawCoin = (resource) => "utxoId" in resource;
@@ -1688,8 +1691,6 @@ var BaseTransactionRequest = class {
   outputs = [];
   /** List of witnesses */
   witnesses = [];
-  /** Base asset ID - should be fetched from the chain */
-  baseAssetId = ZeroBytes324;
   /**
    * Constructor for initializing a base transaction request.
    *
@@ -1702,8 +1703,7 @@ var BaseTransactionRequest = class {
     witnessLimit,
     inputs,
     outputs,
-    witnesses,
-    baseAssetId
+    witnesses
   } = {}) {
     this.gasPrice = bn7(gasPrice);
     this.maturity = maturity ?? 0;
@@ -1712,7 +1712,6 @@ var BaseTransactionRequest = class {
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
-    this.baseAssetId = baseAssetId ?? ZeroBytes324;
   }
   static getPolicyMeta(req) {
     let policyTypes = 0;
@@ -1937,9 +1936,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;
+    const assetId = BaseAssetId2;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -1960,7 +1961,7 @@ var BaseTransactionRequest = class {
       predicateData: predicate?.predicateDataBytes
     };
     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
@@ -2021,12 +2022,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;
   }
@@ -2053,7 +2054,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
     );
@@ -2061,7 +2062,7 @@ var BaseTransactionRequest = class {
       this.pushOutput({
         type: OutputType2.Change,
         to: addressify(to).toB256(),
-        assetId: assetId ?? this.baseAssetId
+        assetId
       });
     }
   }
@@ -2112,12 +2113,6 @@ var BaseTransactionRequest = class {
    * @param quantities - CoinQuantity Array.
    */
   fundWithFakeUtxos(quantities, resourcesOwner) {
-    let idCounter = 0;
-    const generateId = () => {
-      const counterString = String(idCounter++);
-      const id = ZeroBytes324.slice(0, -counterString.length).concat(counterString);
-      return id;
-    };
     const findAssetInput = (assetId) => this.inputs.find((input) => {
       if ("assetId" in input) {
         return input.assetId === assetId;
@@ -2127,12 +2122,12 @@ var BaseTransactionRequest = class {
     const updateAssetInput = (assetId, quantity) => {
       const assetInput = findAssetInput(assetId);
       if (assetInput && "assetId" in assetInput) {
-        assetInput.id = generateId();
+        assetInput.id = hexlify7(randomBytes(33));
         assetInput.amount = quantity;
       } else {
         this.addResources([
           {
-            id: generateId(),
+            id: hexlify7(randomBytes(33)),
             amount: quantity,
             assetId,
             owner: resourcesOwner || Address.fromRandom(),
@@ -2143,7 +2138,7 @@ var BaseTransactionRequest = class {
         ]);
       }
     };
-    updateAssetInput(this.baseAssetId, bn7(1e11));
+    updateAssetInput(BaseAssetId2, bn7(1e11));
     quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
   }
   /**
@@ -3617,7 +3612,6 @@ var processGqlChain = (chain) => {
       gasPerByte: bn15(feeParams.gasPerByte),
       maxMessageDataLength: bn15(predicateParams.maxMessageDataLength),
       chainId: bn15(consensusParameters.chainId),
-      baseAssetId: consensusParameters.baseAssetId,
       gasCosts
     },
     gasCosts,
@@ -3860,17 +3854,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.
    *
@@ -4021,6 +4004,37 @@ var _Provider = class {
       missingContractIds
     };
   }
+  /**
+   * Estimates the transaction gas and fee based on the provided transaction request.
+   * @param transactionRequest - The transaction request object.
+   * @param optimizeGas - Optional. Specifies whether to optimize the gas. Default is false.
+   * @returns An object containing the estimated minimum gas, minimum fee, maximum gas, and maximum fee.
+   */
+  estimateTxGasAndFee(params) {
+    const { transactionRequest } = params;
+    const { gasPriceFactor, minGasPrice, maxGasPerTx } = this.getGasConfig();
+    const chainInfo = this.getChain();
+    const gasPrice = transactionRequest.gasPrice.eq(0) ? minGasPrice : transactionRequest.gasPrice;
+    transactionRequest.gasPrice = gasPrice;
+    const minGas = transactionRequest.calculateMinGas(chainInfo);
+    const minFee = calculatePriceWithFactor(minGas, gasPrice, gasPriceFactor).normalizeZeroToOne();
+    if (transactionRequest.type === TransactionType8.Script) {
+      if (transactionRequest.gasLimit.eq(0)) {
+        transactionRequest.gasLimit = minGas;
+        transactionRequest.gasLimit = maxGasPerTx.sub(
+          transactionRequest.calculateMaxGas(chainInfo, minGas)
+        );
+      }
+    }
+    const maxGas = transactionRequest.calculateMaxGas(chainInfo, minGas);
+    const maxFee = calculatePriceWithFactor(maxGas, gasPrice, gasPriceFactor).normalizeZeroToOne();
+    return {
+      minGas,
+      minFee,
+      maxGas,
+      maxFee
+    };
+  }
   /**
    * Executes a signed transaction without applying the states changes
    * on the chain.
@@ -4068,17 +4082,16 @@ var _Provider = class {
     signatureCallback
   } = {}) {
     const txRequestClone = clone3(transactionRequestify(transactionRequestLike));
-    const chainInfo = this.getChain();
-    const { gasPriceFactor, minGasPrice, maxGasPerTx } = this.getGasConfig();
-    const gasPrice = max(txRequestClone.gasPrice, minGasPrice);
+    const { minGasPrice } = this.getGasConfig();
+    const setGasPrice = max(txRequestClone.gasPrice, minGasPrice);
     const isScriptTransaction = txRequestClone.type === TransactionType8.Script;
     const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
     const allQuantities = mergeQuantities(coinOutputsQuantities, forwardingQuantities);
     txRequestClone.fundWithFakeUtxos(allQuantities, resourcesOwner?.address);
+    if (isScriptTransaction) {
+      txRequestClone.gasLimit = bn15(0);
+    }
     if (estimatePredicates) {
-      if (isScriptTransaction) {
-        txRequestClone.gasLimit = bn15(0);
-      }
       if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
         resourcesOwner.populateTransactionPredicateData(txRequestClone);
       }
@@ -4087,36 +4100,34 @@ var _Provider = class {
     if (signatureCallback && isScriptTransaction) {
       await signatureCallback(txRequestClone);
     }
-    const minGas = txRequestClone.calculateMinGas(chainInfo);
-    const maxGas = txRequestClone.calculateMaxGas(chainInfo, minGas);
+    let { maxFee, maxGas, minFee, minGas } = this.estimateTxGasAndFee({
+      transactionRequest: txRequestClone
+    });
     let receipts = [];
     let missingContractIds = [];
     let outputVariables = 0;
+    let gasUsed = bn15(0);
     if (isScriptTransaction && estimateTxDependencies) {
       txRequestClone.gasPrice = bn15(0);
-      txRequestClone.gasLimit = bn15(maxGasPerTx.sub(maxGas).toNumber() * 0.9);
       const result = await this.estimateTxDependencies(txRequestClone);
       receipts = result.receipts;
       outputVariables = result.outputVariables;
       missingContractIds = result.missingContractIds;
+      gasUsed = isScriptTransaction ? getGasUsedFromReceipts(receipts) : gasUsed;
+      txRequestClone.gasLimit = gasUsed;
+      txRequestClone.gasPrice = setGasPrice;
+      ({ maxFee, maxGas, minFee, minGas } = this.estimateTxGasAndFee({
+        transactionRequest: txRequestClone
+      }));
     }
-    const gasUsed = isScriptTransaction ? getGasUsedFromReceipts(receipts) : minGas;
-    const usedFee = calculatePriceWithFactor(
-      gasUsed,
-      gasPrice,
-      gasPriceFactor
-    ).normalizeZeroToOne();
-    const minFee = calculatePriceWithFactor(minGas, gasPrice, gasPriceFactor).normalizeZeroToOne();
-    const maxFee = calculatePriceWithFactor(maxGas, gasPrice, gasPriceFactor).normalizeZeroToOne();
     return {
       requiredQuantities: allQuantities,
       receipts,
       gasUsed,
       minGasPrice,
-      gasPrice,
+      gasPrice: setGasPrice,
       minGas,
       maxGas,
-      usedFee,
       minFee,
       maxFee,
       estimatedInputs: txRequestClone.inputs,
@@ -4907,9 +4918,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;
   }
   /**
@@ -4947,10 +4957,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 = {};
@@ -4974,8 +4983,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);
         }
       }
@@ -5007,12 +5016,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 assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
     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
@@ -5038,15 +5046,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 });
   }
   /**
@@ -5058,7 +5065,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,
@@ -5067,12 +5074,11 @@ var Account = class extends AbstractAccount {
     }
     const contractAddress = Address3.fromAddressOrString(contractId);
     const { minGasPrice } = this.provider.getGasConfig();
-    const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
     const params = { gasPrice: minGasPrice, ...txParams };
     const { script, scriptData } = await assembleTransferToContractScript({
       hexlifiedContractId: contractAddress.toB256(),
       amountToTransfer: bn17(amount),
-      assetId: assetIdToTransfer
+      assetId
     });
     const request = new ScriptTransactionRequest({
       ...params,
@@ -5082,7 +5088,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({
@@ -5104,7 +5110,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"))
@@ -5119,7 +5124,7 @@ var Account = class extends AbstractAccount {
     ]);
     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
@@ -5216,7 +5221,7 @@ import { hexlify as hexlify15 } from "@fuel-ts/utils";
 
 // src/signer/signer.ts
 import { Address as Address4 } from "@fuel-ts/address";
-import { randomBytes } from "@fuel-ts/crypto";
+import { randomBytes as randomBytes2 } from "@fuel-ts/crypto";
 import { hash } from "@fuel-ts/hasher";
 import { toBytes } from "@fuel-ts/math";
 import { hexlify as hexlify13, concat as concat3, arrayify as arrayify15 } from "@fuel-ts/utils";
@@ -5309,7 +5314,7 @@ var Signer = class {
    * @returns random 32-byte hashed
    */
   static generatePrivateKey(entropy) {
-    return entropy ? hash(concat3([randomBytes(32), arrayify15(entropy)])) : randomBytes(32);
+    return entropy ? hash(concat3([randomBytes2(32), arrayify15(entropy)])) : randomBytes2(32);
   }
   /**
    * Extended publicKey from a compact publicKey
@@ -5328,7 +5333,7 @@ import { Address as Address5 } from "@fuel-ts/address";
 import {
   bufferFromString,
   keccak256,
-  randomBytes as randomBytes2,
+  randomBytes as randomBytes3,
   scrypt,
   stringFromBuffer,
   decryptJsonWalletData,
@@ -5351,7 +5356,7 @@ var removeHexPrefix = (hexString) => {
 async function encryptKeystoreWallet(privateKey, address, password) {
   const privateKeyBuffer = bufferFromString(removeHexPrefix(privateKey), "hex");
   const ownerAddress = Address5.fromAddressOrString(address);
-  const salt = randomBytes2(DEFAULT_KEY_SIZE);
+  const salt = randomBytes3(DEFAULT_KEY_SIZE);
   const key = scrypt({
     password: bufferFromString(password),
     salt,
@@ -5360,7 +5365,7 @@ async function encryptKeystoreWallet(privateKey, address, password) {
     r: DEFAULT_KDF_PARAMS_R,
     p: DEFAULT_KDF_PARAMS_P
   });
-  const iv = randomBytes2(DEFAULT_IV_SIZE);
+  const iv = randomBytes3(DEFAULT_IV_SIZE);
   const ciphertext = await encryptJsonWalletData(privateKeyBuffer, key, iv);
   const data = Uint8Array.from([...key.subarray(16, 32), ...ciphertext]);
   const macHashUint8Array = keccak256(data);
@@ -5542,7 +5547,7 @@ import { arrayify as arrayify18, hexlify as hexlify17, concat as concat5 } from
 import { toBeHex, dataSlice as dataSlice2, encodeBase58 as encodeBase582, decodeBase58, computeHmac as computeHmac2, ripemd160 } from "ethers";
 
 // src/mnemonic/mnemonic.ts
-import { randomBytes as randomBytes3 } from "@fuel-ts/crypto";
+import { randomBytes as randomBytes4 } from "@fuel-ts/crypto";
 import { ErrorCode as ErrorCode18, FuelError as FuelError18 } from "@fuel-ts/errors";
 import { sha256 as sha2563 } from "@fuel-ts/hasher";
 import { arrayify as arrayify17, hexlify as hexlify16, concat as concat4 } from "@fuel-ts/utils";
@@ -7903,7 +7908,7 @@ var Mnemonic = class {
    * @returns A randomly generated mnemonic
    */
   static generate(size = 32, extraEntropy = "") {
-    const entropy = extraEntropy ? sha2563(concat4([randomBytes3(size), arrayify17(extraEntropy)])) : randomBytes3(size);
+    const entropy = extraEntropy ? sha2563(concat4([randomBytes4(size), arrayify17(extraEntropy)])) : randomBytes4(size);
     return Mnemonic.entropyToMnemonic(entropy);
   }
 };
@@ -8696,6 +8701,7 @@ 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";
@@ -8774,9 +8780,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);
   }
   /**