@fuel-ts/account 0.0.0-rc-2034-20240410172045 → 0.0.0-rc-2037-20240411020051

package/dist/test-utils.mjs

@@ -1032,7 +1032,7 @@ var inputify = (value) => {
       return {
         type: InputType.Coin,
         txID: hexlify3(arrayify(value.id).slice(0, 32)),
-        outputIndex: toNumber(arrayify(value.id).slice(32, 33)),
+        outputIndex: arrayify(value.id)[32],
         owner: hexlify3(value.owner),
         amount: bn2(value.amount),
         assetId: hexlify3(value.assetId),
@@ -1152,7 +1152,6 @@ 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 { randomBytes } from "@fuel-ts/crypto";
 import { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
@@ -1826,8 +1825,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;
@@ -1838,14 +1837,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...coin,
+      id,
       type: InputType2.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1858,8 +1857,8 @@ var BaseTransactionRequest = class {
    * @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) {
@@ -1871,13 +1870,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...message,
+      nonce,
       type: InputType2.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -1908,32 +1907,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.
    *
@@ -2032,6 +2005,12 @@ 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;
@@ -2041,12 +2020,12 @@ var BaseTransactionRequest = class {
     const updateAssetInput = (assetId, quantity) => {
       const assetInput = findAssetInput(assetId);
       if (assetInput && "assetId" in assetInput) {
-        assetInput.id = hexlify7(randomBytes(33));
+        assetInput.id = generateId();
         assetInput.amount = quantity;
       } else {
         this.addResources([
           {
-            id: hexlify7(randomBytes(33)),
+            id: generateId(),
             amount: quantity,
             assetId,
             owner: resourcesOwner || Address.fromRandom(),
@@ -3876,36 +3855,6 @@ var _Provider = class {
       missingContractIds
     };
   }
-  /**
-   * Estimates the transaction gas and fee based on the provided transaction request.
-   * @param transactionRequest - The transaction request object.
-   * @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.
@@ -3953,16 +3902,17 @@ var _Provider = class {
     signatureCallback
   } = {}) {
     const txRequestClone = clone3(transactionRequestify(transactionRequestLike));
-    const { minGasPrice } = this.getGasConfig();
-    const setGasPrice = max(txRequestClone.gasPrice, minGasPrice);
+    const chainInfo = this.getChain();
+    const { gasPriceFactor, minGasPrice, maxGasPerTx } = this.getGasConfig();
+    const gasPrice = 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);
       }
@@ -3971,34 +3921,36 @@ var _Provider = class {
     if (signatureCallback && isScriptTransaction) {
       await signatureCallback(txRequestClone);
     }
-    let { maxFee, maxGas, minFee, minGas } = this.estimateTxGasAndFee({
-      transactionRequest: txRequestClone
-    });
+    const minGas = txRequestClone.calculateMinGas(chainInfo);
+    const maxGas = txRequestClone.calculateMaxGas(chainInfo, minGas);
     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: setGasPrice,
+      gasPrice,
       minGas,
       maxGas,
+      usedFee,
       minFee,
       maxFee,
       estimatedInputs: txRequestClone.inputs,
@@ -4922,7 +4874,7 @@ var Account = class extends AbstractAccount {
 
 // src/signer/signer.ts
 import { Address as Address4 } from "@fuel-ts/address";
-import { randomBytes as randomBytes2 } from "@fuel-ts/crypto";
+import { randomBytes } 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";
@@ -5015,7 +4967,7 @@ var Signer = class {
    * @returns random 32-byte hashed
    */
   static generatePrivateKey(entropy) {
-    return entropy ? hash(concat3([randomBytes2(32), arrayify15(entropy)])) : randomBytes2(32);
+    return entropy ? hash(concat3([randomBytes(32), arrayify15(entropy)])) : randomBytes(32);
   }
   /**
    * Extended publicKey from a compact publicKey
@@ -5034,7 +4986,7 @@ import { Address as Address5 } from "@fuel-ts/address";
 import {
   bufferFromString,
   keccak256,
-  randomBytes as randomBytes3,
+  randomBytes as randomBytes2,
   scrypt,
   stringFromBuffer,
   decryptJsonWalletData,
@@ -5057,7 +5009,7 @@ var removeHexPrefix = (hexString) => {
 async function encryptKeystoreWallet(privateKey, address, password) {
   const privateKeyBuffer = bufferFromString(removeHexPrefix(privateKey), "hex");
   const ownerAddress = Address5.fromAddressOrString(address);
-  const salt = randomBytes3(DEFAULT_KEY_SIZE);
+  const salt = randomBytes2(DEFAULT_KEY_SIZE);
   const key = scrypt({
     password: bufferFromString(password),
     salt,
@@ -5066,7 +5018,7 @@ async function encryptKeystoreWallet(privateKey, address, password) {
     r: DEFAULT_KDF_PARAMS_R,
     p: DEFAULT_KDF_PARAMS_P
   });
-  const iv = randomBytes3(DEFAULT_IV_SIZE);
+  const iv = randomBytes2(DEFAULT_IV_SIZE);
   const ciphertext = await encryptJsonWalletData(privateKeyBuffer, key, iv);
   const data = Uint8Array.from([...key.subarray(16, 32), ...ciphertext]);
   const macHashUint8Array = keccak256(data);
@@ -5248,7 +5200,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 randomBytes4 } from "@fuel-ts/crypto";
+import { randomBytes as randomBytes3 } 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";
@@ -7603,7 +7555,7 @@ var Mnemonic = class {
    * @returns A randomly generated mnemonic
    */
   static generate(size = 32, extraEntropy = "") {
-    const entropy = extraEntropy ? sha2563(concat4([randomBytes4(size), arrayify17(extraEntropy)])) : randomBytes4(size);
+    const entropy = extraEntropy ? sha2563(concat4([randomBytes3(size), arrayify17(extraEntropy)])) : randomBytes3(size);
     return Mnemonic.entropyToMnemonic(entropy);
   }
 };
@@ -7974,10 +7926,10 @@ __publicField(Wallet, "fromExtendedKey", WalletUnlocked.fromExtendedKey);
 __publicField(Wallet, "fromEncryptedJson", WalletUnlocked.fromEncryptedJson);
 
 // src/test-utils/seedTestWallet.ts
-import { randomBytes as randomBytes5 } from "@fuel-ts/crypto";
+import { randomBytes as randomBytes4 } from "@fuel-ts/crypto";
 var seedTestWallet = async (wallet, quantities) => {
   const genesisWallet = new WalletUnlocked(
-    process.env.GENESIS_SECRET || randomBytes5(32),
+    process.env.GENESIS_SECRET || randomBytes4(32),
     wallet.provider
   );
   const resources = await genesisWallet.getResourcesToSpend(quantities);