@fuel-ts/account 0.0.0-rc-2037-20240430170043 → 0.0.0-rc-2037-20240501112942

package/dist/account.d.ts

@@ -84,7 +84,7 @@ export declare class Account extends AbstractAccount {
      * Adds resources to the transaction enough to fund it.
      *
      * @param request - The transaction request.
-     * @param coinQuantities - The coin quantities required to execute the transaction.
+     * @param requiredQuantities - The coin quantities required to execute the transaction.
      * @param fee - The estimated transaction fee.
      * @returns A promise that resolves when the resources are added to the transaction.
      */

package/dist/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}

package/dist/index.global.js

@@ -38645,7 +38645,7 @@ ${MessageCoinFragmentFragmentDoc}`;
   }
   var calculateGasFee = (params) => {
     const { gas, gasPrice, priceFactor, tip } = params;
-    return gas.mul(gasPrice).div(priceFactor).add(tip);
+    return gas.mul(gasPrice).div(priceFactor).add(bn(tip));
   };
 
   // src/providers/utils/json.ts
@@ -38782,12 +38782,21 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
   var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
   var getRequestInputResourceOwner = (input) => isRequestInputCoin(input) ? input.owner : input.recipient;
   var isRequestInputResourceFromOwner = (input, owner) => getRequestInputResourceOwner(input) === owner.toB256();
-  var cacheResources = (resources) => resources.reduce(
-    (cache2, resource) => {
-      if (isCoin(resource)) {
-        cache2.utxos.push(resource.id);
+  var getAssetAmountInRequestInputs = (inputs, assetId, baseAsset) => inputs.filter(isRequestInputResource).reduce((acc, input) => {
+    if (isRequestInputCoin(input) && input.assetId === assetId) {
+      return acc.add(input.amount);
+    }
+    if (isRequestInputMessage(input) && assetId === baseAsset) {
+      return acc.add(input.amount);
+    }
+    return acc;
+  }, bn(0));
+  var cacheRequestInputsResources = (inputs) => inputs.filter(isRequestInputResource).reduce(
+    (cache2, input) => {
+      if (isRequestInputCoin(input)) {
+        cache2.utxos.push(input.id);
       } else {
-        cache2.messages.push(resource.nonce);
+        cache2.messages.push(input.nonce);
       }
       return cache2;
     },
@@ -38796,6 +38805,20 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       messages: []
     }
   );
+  var cacheRequestInputsResourcesFromOwner = (inputs, owner) => inputs.reduce(
+    (acc, input) => {
+      if (isRequestInputCoin(input) && input.owner === owner.toB256()) {
+        acc.utxos.push(input.id);
+      } else if (isRequestInputMessage(input) && input.recipient === owner.toB256()) {
+        acc.messages.push(input.nonce);
+      }
+      return acc;
+    },
+    {
+      utxos: [],
+      messages: []
+    }
+  );
 
   // src/providers/transaction-request/witness.ts
   var witnessify = (value) => {
@@ -38836,10 +38859,10 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       outputs,
       witnesses
     } = {}) {
-      this.tip = bn(tip);
-      this.maturity = maturity ?? 0;
-      this.witnessLimit = witnessLimit ? bn(witnessLimit) : void 0;
-      this.maxFee = maxFee ? bn(maxFee) : void 0;
+      this.tip = tip ? bn(tip) : void 0;
+      this.maturity = maturity && maturity > 0 ? maturity : void 0;
+      this.witnessLimit = isDefined(witnessLimit) ? bn(witnessLimit) : void 0;
+      this.maxFee = bn(maxFee);
       this.inputs = inputs ?? [];
       this.outputs = outputs ?? [];
       this.witnesses = witnesses ?? [];
@@ -38847,22 +38870,21 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     static getPolicyMeta(req) {
       let policyTypes = 0;
       const policies = [];
-      if (req.tip) {
+      const { tip, witnessLimit, maturity } = req;
+      if (bn(tip).gt(0)) {
         policyTypes += PolicyType.Tip;
-        policies.push({ data: req.tip, type: PolicyType.Tip });
+        policies.push({ data: bn(tip), type: PolicyType.Tip });
       }
-      if (req.witnessLimit) {
+      if (isDefined(witnessLimit) && bn(witnessLimit).gte(0)) {
         policyTypes += PolicyType.WitnessLimit;
-        policies.push({ data: req.witnessLimit, type: PolicyType.WitnessLimit });
+        policies.push({ data: bn(witnessLimit), type: PolicyType.WitnessLimit });
       }
-      if (req.maturity > 0) {
+      if (maturity && maturity > 0) {
         policyTypes += PolicyType.Maturity;
-        policies.push({ data: req.maturity, type: PolicyType.Maturity });
-      }
-      if (req.maxFee) {
-        policyTypes += PolicyType.MaxFee;
-        policies.push({ data: req.maxFee, type: PolicyType.MaxFee });
+        policies.push({ data: maturity, type: PolicyType.Maturity });
       }
+      policyTypes += PolicyType.MaxFee;
+      policies.push({ data: req.maxFee, type: PolicyType.MaxFee });
       return {
         policyTypes,
         policies
@@ -39700,21 +39722,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
     }
   };
-  var cacheTxInputsFromOwner = (inputs, owner) => inputs.reduce(
-    (acc, input) => {
-      if (input.type === InputType.Coin && input.owner === owner) {
-        acc.utxos.push(input.id);
-      }
-      if (input.type === InputType.Message && input.recipient === owner) {
-        acc.messages.push(input.nonce);
-      }
-      return acc;
-    },
-    {
-      utxos: [],
-      messages: []
-    }
-  );
 
   // src/providers/transaction-summary/calculate-transaction-fee.ts
   var calculateTransactionFee = (params) => {
@@ -40861,7 +40868,18 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     createOperations() {
       const fetchFn = _Provider.getFetchFn(this.options);
       const gqlClient = new import_graphql_request.GraphQLClient(this.url, {
-        fetch: (url, requestInit) => fetchFn(url, requestInit, this.options)
+        fetch: (url, requestInit) => fetchFn(url, requestInit, this.options),
+        responseMiddleware: (response) => {
+          if ("response" in response) {
+            const graphQlResponse = response.response;
+            if (Array.isArray(graphQlResponse?.errors)) {
+              throw new FuelError(
+                FuelError.CODES.INVALID_REQUEST,
+                graphQlResponse.errors.map((err) => err.message).join("\n\n")
+              );
+            }
+          }
+        }
       });
       const executeQuery = (query, vars) => {
         const opDefinition = query.definitions.find((x) => x.kind === "OperationDefinition");
@@ -42032,6 +42050,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
   };
 
   // src/account.ts
+  var MAX_FUNDING_ATTEMPTS = 2;
   var Account = class extends AbstractAccount {
     /**
      * The address associated with the account.
@@ -42189,13 +42208,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * Adds resources to the transaction enough to fund it.
      *
      * @param request - The transaction request.
-     * @param coinQuantities - The coin quantities required to execute the transaction.
+     * @param requiredQuantities - The coin quantities required to execute the transaction.
      * @param fee - The estimated transaction fee.
      * @returns A promise that resolves when the resources are added to the transaction.
      */
     async fund(request, params) {
       const { addedSignatures, estimatedPredicates, maxFee: fee, requiredQuantities } = params;
       const baseAssetId = this.provider.getBaseAssetId();
+      const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || bn(0);
       const txRequest = request;
       const requiredQuantitiesWithFee = addAmountToCoinQuantities({
         amount: bn(fee),
@@ -42209,18 +42229,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
           owned: bn(0)
         };
       });
-      txRequest.inputs.forEach((input) => {
-        const isResource = "amount" in input;
-        if (!isResource) {
-          return;
-        }
-        const isCoin2 = "owner" in input;
+      request.inputs.filter(isRequestInputResource).forEach((input) => {
+        const isCoin2 = isRequestInputCoin(input);
         const assetId = isCoin2 ? String(input.assetId) : baseAssetId;
         if (quantitiesDict[assetId]) {
           quantitiesDict[assetId].owned = quantitiesDict[assetId].owned.add(input.amount);
         }
       });
-      const missingQuantities = [];
+      let missingQuantities = [];
       Object.entries(quantitiesDict).forEach(([assetId, { owned, required }]) => {
         if (owned.lt(required)) {
           missingQuantities.push({
@@ -42229,11 +42245,42 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
           });
         }
       });
-      const needsToBeFunded = missingQuantities.length;
-      if (needsToBeFunded) {
-        const excludedIds = cacheTxInputsFromOwner(txRequest.inputs, this.address.toB256());
-        const resources = await this.getResourcesToSpend(missingQuantities, excludedIds);
-        txRequest.addResources(resources);
+      let needsToBeFunded = missingQuantities.length > 0;
+      let fundingAttempts = 0;
+      while (needsToBeFunded && fundingAttempts < MAX_FUNDING_ATTEMPTS) {
+        const resources = await this.getResourcesToSpend(
+          missingQuantities,
+          cacheRequestInputsResourcesFromOwner(request.inputs, this.address)
+        );
+        request.addResources(resources);
+        txRequest.shiftPredicateData();
+        txRequest.updatePredicateGasUsed(estimatedPredicates);
+        const requestToReestimate2 = clone_default(txRequest);
+        if (addedSignatures) {
+          Array.from({ length: addedSignatures }).forEach(
+            () => requestToReestimate2.addEmptyWitness()
+          );
+        }
+        const { maxFee: newFee } = await this.provider.estimateTxGasAndFee({
+          transactionRequest: requestToReestimate2
+        });
+        const totalBaseAssetOnInputs = getAssetAmountInRequestInputs(
+          request.inputs,
+          baseAssetId,
+          baseAssetId
+        );
+        const totalBaseAssetRequiredWithFee = requiredInBaseAsset.add(newFee);
+        if (totalBaseAssetOnInputs.gt(totalBaseAssetRequiredWithFee)) {
+          needsToBeFunded = false;
+        } else {
+          missingQuantities = [
+            {
+              amount: totalBaseAssetRequiredWithFee.sub(totalBaseAssetOnInputs),
+              assetId: baseAssetId
+            }
+          ];
+        }
+        fundingAttempts += 1;
       }
       txRequest.shiftPredicateData();
       txRequest.updatePredicateGasUsed(estimatedPredicates);