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

package/dist/index.global.js

@@ -38864,7 +38864,7 @@ ${MessageCoinFragmentFragmentDoc}`;
         return {
           type: InputType.Coin,
           txID: hexlify(arrayify(value.id).slice(0, 32)),
-          outputIndex: toNumber2(arrayify(value.id).slice(32, 33)),
+          outputIndex: arrayify(value.id)[32],
           owner: hexlify(value.owner),
           amount: bn(value.amount),
           assetId: hexlify(value.assetId),
@@ -39744,8 +39744,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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;
@@ -39756,14 +39756,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...coin,
+        id,
         type: InputType.Coin,
         owner: owner.toB256(),
         amount,
         assetId,
         txPointer: "0x00000000000000000000000000000000",
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(owner, assetId);
@@ -39776,8 +39776,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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 = BaseAssetId;
       let witnessIndex;
       if (predicate) {
@@ -39789,13 +39789,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...message,
+        nonce,
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
         amount,
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(recipient, assetId);
@@ -39826,32 +39826,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       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.
      *
@@ -39950,6 +39924,12 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param quantities - CoinQuantity Array.
      */
     fundWithFakeUtxos(quantities, resourcesOwner) {
+      let idCounter = 0;
+      const generateId = () => {
+        const counterString = String(idCounter++);
+        const id = ZeroBytes32.slice(0, -counterString.length).concat(counterString);
+        return id;
+      };
       const findAssetInput = (assetId) => this.inputs.find((input) => {
         if ("assetId" in input) {
           return input.assetId === assetId;
@@ -39959,12 +39939,12 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       const updateAssetInput = (assetId, quantity) => {
         const assetInput = findAssetInput(assetId);
         if (assetInput && "assetId" in assetInput) {
-          assetInput.id = hexlify(randomBytes22(33));
+          assetInput.id = generateId();
           assetInput.amount = quantity;
         } else {
           this.addResources([
             {
-              id: hexlify(randomBytes22(33)),
+              id: generateId(),
               amount: quantity,
               assetId,
               owner: resourcesOwner || Address.fromRandom(),
@@ -41790,36 +41770,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         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 === 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.
@@ -41867,16 +41817,17 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       signatureCallback
     } = {}) {
       const txRequestClone = clone_default(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 === TransactionType.Script;
       const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
       const allQuantities = mergeQuantities(coinOutputsQuantities, forwardingQuantities);
       txRequestClone.fundWithFakeUtxos(allQuantities, resourcesOwner?.address);
-      if (isScriptTransaction) {
-        txRequestClone.gasLimit = bn(0);
-      }
       if (estimatePredicates) {
+        if (isScriptTransaction) {
+          txRequestClone.gasLimit = bn(0);
+        }
         if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
           resourcesOwner.populateTransactionPredicateData(txRequestClone);
         }
@@ -41885,34 +41836,36 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       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 = bn(0);
       if (isScriptTransaction && estimateTxDependencies) {
         txRequestClone.gasPrice = bn(0);
+        txRequestClone.gasLimit = 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,
@@ -44366,12 +44319,12 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
   };
 
   // ../../node_modules/.pnpm/uuid@9.0.0/node_modules/uuid/dist/esm-node/rng.js
-  var import_crypto16 = __toESM(__require("crypto"));
+  var import_crypto15 = __toESM(__require("crypto"));
   var rnds8Pool = new Uint8Array(256);
   var poolPtr = rnds8Pool.length;
   function rng() {
     if (poolPtr > rnds8Pool.length - 16) {
-      import_crypto16.default.randomFillSync(rnds8Pool);
+      import_crypto15.default.randomFillSync(rnds8Pool);
       poolPtr = 0;
     }
     return rnds8Pool.slice(poolPtr, poolPtr += 16);
@@ -44387,9 +44340,9 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
   }
 
   // ../../node_modules/.pnpm/uuid@9.0.0/node_modules/uuid/dist/esm-node/native.js
-  var import_crypto17 = __toESM(__require("crypto"));
+  var import_crypto16 = __toESM(__require("crypto"));
   var native_default = {
-    randomUUID: import_crypto17.default.randomUUID
+    randomUUID: import_crypto16.default.randomUUID
   };
 
   // ../../node_modules/.pnpm/uuid@9.0.0/node_modules/uuid/dist/esm-node/v4.js
@@ -47852,6 +47805,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         if (input.type === InputType.Coin && hexlify(input.owner) === this.address.toB256()) {
           input.predicate = this.bytes;
           input.predicateData = this.getPredicateData(policies.length);
+          input.witnessIndex = 0;
         }
       });
       return request;
@@ -47889,6 +47843,20 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       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: hexlify(this.bytes)
+      }));
+    }
     getPredicateData(policiesLength) {
       if (!this.predicateData.length) {
         return new Uint8Array();