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

package/dist/test-utils.js

@@ -1065,7 +1065,7 @@ var inputify = (value) => {
       return {
         type: import_transactions.InputType.Coin,
         txID: (0, import_utils3.hexlify)((0, import_utils3.arrayify)(value.id).slice(0, 32)),
-        outputIndex: (0, import_math2.toNumber)((0, import_utils3.arrayify)(value.id).slice(32, 33)),
+        outputIndex: (0, import_utils3.arrayify)(value.id)[32],
         owner: (0, import_utils3.hexlify)(value.owner),
         amount: (0, import_math2.bn)(value.amount),
         assetId: (0, import_utils3.hexlify)(value.assetId),
@@ -1185,7 +1185,6 @@ var outputify = (value) => {
 // src/providers/transaction-request/transaction-request.ts
 var import_address = require("@fuel-ts/address");
 var import_configs7 = 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");
 var import_utils9 = require("@fuel-ts/utils");
@@ -1840,8 +1839,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;
@@ -1852,14 +1851,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...coin,
+      id,
       type: import_transactions6.InputType.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1872,8 +1871,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 = import_configs7.BaseAssetId;
     let witnessIndex;
     if (predicate) {
@@ -1885,13 +1884,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...message,
+      nonce,
       type: import_transactions6.InputType.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate: predicate?.bytes
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -1922,32 +1921,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.
    *
@@ -2046,6 +2019,12 @@ var BaseTransactionRequest = class {
    * @param quantities - CoinQuantity Array.
    */
   fundWithFakeUtxos(quantities, resourcesOwner) {
+    let idCounter = 0;
+    const generateId = () => {
+      const counterString = String(idCounter++);
+      const id = import_configs7.ZeroBytes32.slice(0, -counterString.length).concat(counterString);
+      return id;
+    };
     const findAssetInput = (assetId) => this.inputs.find((input) => {
       if ("assetId" in input) {
         return input.assetId === assetId;
@@ -2055,12 +2034,12 @@ var BaseTransactionRequest = class {
     const updateAssetInput = (assetId, quantity) => {
       const assetInput = findAssetInput(assetId);
       if (assetInput && "assetId" in assetInput) {
-        assetInput.id = (0, import_utils9.hexlify)((0, import_crypto.randomBytes)(33));
+        assetInput.id = generateId();
         assetInput.amount = quantity;
       } else {
         this.addResources([
           {
-            id: (0, import_utils9.hexlify)((0, import_crypto.randomBytes)(33)),
+            id: generateId(),
             amount: quantity,
             assetId,
             owner: resourcesOwner || import_address.Address.fromRandom(),
@@ -3890,36 +3869,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 === import_transactions18.TransactionType.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.
@@ -3967,16 +3916,17 @@ var _Provider = class {
     signatureCallback
   } = {}) {
     const txRequestClone = (0, import_ramda3.clone)(transactionRequestify(transactionRequestLike));
-    const { minGasPrice } = this.getGasConfig();
-    const setGasPrice = (0, import_math15.max)(txRequestClone.gasPrice, minGasPrice);
+    const chainInfo = this.getChain();
+    const { gasPriceFactor, minGasPrice, maxGasPerTx } = this.getGasConfig();
+    const gasPrice = (0, import_math15.max)(txRequestClone.gasPrice, minGasPrice);
     const isScriptTransaction = txRequestClone.type === import_transactions18.TransactionType.Script;
     const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
     const allQuantities = mergeQuantities(coinOutputsQuantities, forwardingQuantities);
     txRequestClone.fundWithFakeUtxos(allQuantities, resourcesOwner?.address);
-    if (isScriptTransaction) {
-      txRequestClone.gasLimit = (0, import_math15.bn)(0);
-    }
     if (estimatePredicates) {
+      if (isScriptTransaction) {
+        txRequestClone.gasLimit = (0, import_math15.bn)(0);
+      }
       if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
         resourcesOwner.populateTransactionPredicateData(txRequestClone);
       }
@@ -3985,34 +3935,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 = (0, import_math15.bn)(0);
     if (isScriptTransaction && estimateTxDependencies) {
       txRequestClone.gasPrice = (0, import_math15.bn)(0);
+      txRequestClone.gasLimit = (0, import_math15.bn)(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,
@@ -4936,7 +4888,7 @@ var Account = class extends import_interfaces.AbstractAccount {
 
 // src/signer/signer.ts
 var import_address5 = require("@fuel-ts/address");
-var import_crypto2 = require("@fuel-ts/crypto");
+var import_crypto = require("@fuel-ts/crypto");
 var import_hasher2 = require("@fuel-ts/hasher");
 var import_math19 = require("@fuel-ts/math");
 var import_utils29 = require("@fuel-ts/utils");
@@ -5029,7 +4981,7 @@ var Signer = class {
    * @returns random 32-byte hashed
    */
   static generatePrivateKey(entropy) {
-    return entropy ? (0, import_hasher2.hash)((0, import_utils29.concat)([(0, import_crypto2.randomBytes)(32), (0, import_utils29.arrayify)(entropy)])) : (0, import_crypto2.randomBytes)(32);
+    return entropy ? (0, import_hasher2.hash)((0, import_utils29.concat)([(0, import_crypto.randomBytes)(32), (0, import_utils29.arrayify)(entropy)])) : (0, import_crypto.randomBytes)(32);
   }
   /**
    * Extended publicKey from a compact publicKey
@@ -5045,7 +4997,7 @@ var Signer = class {
 
 // src/wallet/keystore-wallet.ts
 var import_address6 = require("@fuel-ts/address");
-var import_crypto3 = require("@fuel-ts/crypto");
+var import_crypto2 = require("@fuel-ts/crypto");
 var import_errors17 = require("@fuel-ts/errors");
 var import_utils30 = require("@fuel-ts/utils");
 var import_uuid = require("uuid");
@@ -5061,22 +5013,22 @@ var removeHexPrefix = (hexString) => {
   return hexString;
 };
 async function encryptKeystoreWallet(privateKey, address, password) {
-  const privateKeyBuffer = (0, import_crypto3.bufferFromString)(removeHexPrefix(privateKey), "hex");
+  const privateKeyBuffer = (0, import_crypto2.bufferFromString)(removeHexPrefix(privateKey), "hex");
   const ownerAddress = import_address6.Address.fromAddressOrString(address);
-  const salt = (0, import_crypto3.randomBytes)(DEFAULT_KEY_SIZE);
-  const key = (0, import_crypto3.scrypt)({
-    password: (0, import_crypto3.bufferFromString)(password),
+  const salt = (0, import_crypto2.randomBytes)(DEFAULT_KEY_SIZE);
+  const key = (0, import_crypto2.scrypt)({
+    password: (0, import_crypto2.bufferFromString)(password),
     salt,
     dklen: DEFAULT_KEY_SIZE,
     n: 2 ** DEFAULT_KDF_PARAMS_LOG_N,
     r: DEFAULT_KDF_PARAMS_R,
     p: DEFAULT_KDF_PARAMS_P
   });
-  const iv = (0, import_crypto3.randomBytes)(DEFAULT_IV_SIZE);
-  const ciphertext = await (0, import_crypto3.encryptJsonWalletData)(privateKeyBuffer, key, iv);
+  const iv = (0, import_crypto2.randomBytes)(DEFAULT_IV_SIZE);
+  const ciphertext = await (0, import_crypto2.encryptJsonWalletData)(privateKeyBuffer, key, iv);
   const data = Uint8Array.from([...key.subarray(16, 32), ...ciphertext]);
-  const macHashUint8Array = (0, import_crypto3.keccak256)(data);
-  const mac = (0, import_crypto3.stringFromBuffer)(macHashUint8Array, "hex");
+  const macHashUint8Array = (0, import_crypto2.keccak256)(data);
+  const mac = (0, import_crypto2.stringFromBuffer)(macHashUint8Array, "hex");
   const keystore = {
     id: (0, import_uuid.v4)(),
     version: 3,
@@ -5084,15 +5036,15 @@ async function encryptKeystoreWallet(privateKey, address, password) {
     crypto: {
       cipher: "aes-128-ctr",
       mac,
-      cipherparams: { iv: (0, import_crypto3.stringFromBuffer)(iv, "hex") },
-      ciphertext: (0, import_crypto3.stringFromBuffer)(ciphertext, "hex"),
+      cipherparams: { iv: (0, import_crypto2.stringFromBuffer)(iv, "hex") },
+      ciphertext: (0, import_crypto2.stringFromBuffer)(ciphertext, "hex"),
       kdf: "scrypt",
       kdfparams: {
         dklen: DEFAULT_KEY_SIZE,
         n: 2 ** DEFAULT_KDF_PARAMS_LOG_N,
         p: DEFAULT_KDF_PARAMS_P,
         r: DEFAULT_KDF_PARAMS_R,
-        salt: (0, import_crypto3.stringFromBuffer)(salt, "hex")
+        salt: (0, import_crypto2.stringFromBuffer)(salt, "hex")
       }
     }
   };
@@ -5108,11 +5060,11 @@ async function decryptKeystoreWallet(jsonWallet, password) {
       kdfparams: { dklen, n, r, p, salt }
     }
   } = keystoreWallet;
-  const ciphertextBuffer = (0, import_crypto3.bufferFromString)(ciphertext, "hex");
-  const ivBuffer = (0, import_crypto3.bufferFromString)(iv, "hex");
-  const saltBuffer = (0, import_crypto3.bufferFromString)(salt, "hex");
-  const passwordBuffer = (0, import_crypto3.bufferFromString)(password);
-  const key = (0, import_crypto3.scrypt)({
+  const ciphertextBuffer = (0, import_crypto2.bufferFromString)(ciphertext, "hex");
+  const ivBuffer = (0, import_crypto2.bufferFromString)(iv, "hex");
+  const saltBuffer = (0, import_crypto2.bufferFromString)(salt, "hex");
+  const passwordBuffer = (0, import_crypto2.bufferFromString)(password);
+  const key = (0, import_crypto2.scrypt)({
     password: passwordBuffer,
     salt: saltBuffer,
     n,
@@ -5121,15 +5073,15 @@ async function decryptKeystoreWallet(jsonWallet, password) {
     dklen
   });
   const data = Uint8Array.from([...key.subarray(16, 32), ...ciphertextBuffer]);
-  const macHashUint8Array = (0, import_crypto3.keccak256)(data);
-  const macHash = (0, import_crypto3.stringFromBuffer)(macHashUint8Array, "hex");
+  const macHashUint8Array = (0, import_crypto2.keccak256)(data);
+  const macHash = (0, import_crypto2.stringFromBuffer)(macHashUint8Array, "hex");
   if (mac !== macHash) {
     throw new import_errors17.FuelError(
       import_errors17.ErrorCode.INVALID_PASSWORD,
       "Failed to decrypt the keystore wallet, the provided password is incorrect."
     );
   }
-  const buffer = await (0, import_crypto3.decryptJsonWalletData)(ciphertextBuffer, key, ivBuffer);
+  const buffer = await (0, import_crypto2.decryptJsonWalletData)(ciphertextBuffer, key, ivBuffer);
   const privateKey = (0, import_utils30.hexlify)(buffer);
   return privateKey;
 }
@@ -5254,7 +5206,7 @@ var import_utils35 = require("@fuel-ts/utils");
 var import_ethers3 = require("ethers");
 
 // src/mnemonic/mnemonic.ts
-var import_crypto4 = require("@fuel-ts/crypto");
+var import_crypto3 = require("@fuel-ts/crypto");
 var import_errors19 = require("@fuel-ts/errors");
 var import_hasher5 = require("@fuel-ts/hasher");
 var import_utils33 = require("@fuel-ts/utils");
@@ -7609,7 +7561,7 @@ var Mnemonic = class {
    * @returns A randomly generated mnemonic
    */
   static generate(size = 32, extraEntropy = "") {
-    const entropy = extraEntropy ? (0, import_hasher5.sha256)((0, import_utils33.concat)([(0, import_crypto4.randomBytes)(size), (0, import_utils33.arrayify)(extraEntropy)])) : (0, import_crypto4.randomBytes)(size);
+    const entropy = extraEntropy ? (0, import_hasher5.sha256)((0, import_utils33.concat)([(0, import_crypto3.randomBytes)(size), (0, import_utils33.arrayify)(extraEntropy)])) : (0, import_crypto3.randomBytes)(size);
     return Mnemonic.entropyToMnemonic(entropy);
   }
 };
@@ -7980,10 +7932,10 @@ __publicField(Wallet, "fromExtendedKey", WalletUnlocked.fromExtendedKey);
 __publicField(Wallet, "fromEncryptedJson", WalletUnlocked.fromEncryptedJson);
 
 // src/test-utils/seedTestWallet.ts
-var import_crypto5 = require("@fuel-ts/crypto");
+var import_crypto4 = require("@fuel-ts/crypto");
 var seedTestWallet = async (wallet, quantities) => {
   const genesisWallet = new WalletUnlocked(
-    process.env.GENESIS_SECRET || (0, import_crypto5.randomBytes)(32),
+    process.env.GENESIS_SECRET || (0, import_crypto4.randomBytes)(32),
     wallet.provider
   );
   const resources = await genesisWallet.getResourcesToSpend(quantities);
@@ -8012,7 +7964,7 @@ var import_math21 = require("@fuel-ts/math");
 var import_utils36 = require("@fuel-ts/utils");
 var import_cli_utils = require("@fuel-ts/utils/cli-utils");
 var import_child_process = require("child_process");
-var import_crypto6 = require("crypto");
+var import_crypto5 = require("crypto");
 var import_fs = require("fs");
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
@@ -8084,7 +8036,7 @@ var launchNode = async ({
     })).toString();
     let chainConfigPathToUse;
     const prefix = basePath || import_os.default.tmpdir();
-    const suffix = basePath ? "" : (0, import_crypto6.randomUUID)();
+    const suffix = basePath ? "" : (0, import_crypto5.randomUUID)();
     const tempDirPath = import_path.default.join(prefix, ".fuels", suffix);
     if (chainConfigPath) {
       chainConfigPathToUse = chainConfigPath;