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

package/dist/index.js

@@ -1187,7 +1187,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),
@@ -1307,7 +1307,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");
@@ -2036,8 +2035,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;
@@ -2048,14 +2047,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);
@@ -2068,8 +2067,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) {
@@ -2081,13 +2080,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);
@@ -2118,32 +2117,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.
    *
@@ -2242,6 +2215,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;
@@ -2251,12 +2230,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(),
@@ -4133,36 +4112,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.
@@ -4210,16 +4159,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);
       }
@@ -4228,34 +4178,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,
@@ -5349,7 +5301,7 @@ var import_utils31 = require("@fuel-ts/utils");
 
 // 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");
@@ -5442,7 +5394,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
@@ -5458,7 +5410,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");
@@ -5474,22 +5426,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,
@@ -5497,15 +5449,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")
       }
     }
   };
@@ -5521,11 +5473,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,
@@ -5534,15 +5486,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;
 }
@@ -5667,7 +5619,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");
@@ -8028,7 +7980,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);
   }
 };
@@ -8400,7 +8352,7 @@ __publicField(Wallet, "fromEncryptedJson", WalletUnlocked.fromEncryptedJson);
 
 // src/wallet-manager/wallet-manager.ts
 var import_address9 = require("@fuel-ts/address");
-var import_crypto5 = require("@fuel-ts/crypto");
+var import_crypto4 = require("@fuel-ts/crypto");
 var import_errors23 = require("@fuel-ts/errors");
 var import_events = require("events");
 
@@ -8728,7 +8680,7 @@ var _WalletManager = class extends import_events.EventEmitter {
     await assert(!__privateGet(this, _isLocked), ERROR_MESSAGES.wallet_not_unlocked);
     const data = await this.storage.getItem(this.STORAGE_KEY);
     if (data) {
-      const state = await (0, import_crypto5.decrypt)(__privateGet(this, _passphrase), JSON.parse(data));
+      const state = await (0, import_crypto4.decrypt)(__privateGet(this, _passphrase), JSON.parse(data));
       __privateSet(this, _vaults, __privateMethod(this, _deserializeVaults, deserializeVaults_fn).call(this, state.vaults));
     }
   }
@@ -8737,7 +8689,7 @@ var _WalletManager = class extends import_events.EventEmitter {
    */
   async saveState() {
     await assert(!__privateGet(this, _isLocked), ERROR_MESSAGES.wallet_not_unlocked);
-    const encryptedData = await (0, import_crypto5.encrypt)(__privateGet(this, _passphrase), {
+    const encryptedData = await (0, import_crypto4.encrypt)(__privateGet(this, _passphrase), {
       vaults: __privateMethod(this, _serializeVaults, serializeVaults_fn).call(this, __privateGet(this, _vaults))
     });
     await this.storage.setItem(this.STORAGE_KEY, JSON.stringify(encryptedData));
@@ -8880,6 +8832,7 @@ var Predicate = class extends Account {
       if (input.type === import_transactions20.InputType.Coin && (0, import_utils37.hexlify)(input.owner) === this.address.toB256()) {
         input.predicate = this.bytes;
         input.predicateData = this.getPredicateData(policies.length);
+        input.witnessIndex = 0;
       }
     });
     return request;
@@ -8917,6 +8870,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: (0, import_utils37.hexlify)(this.bytes)
+    }));
+  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();