@fuel-ts/account 0.96.0 → 0.96.1

package/dist/index.js

@@ -73,6 +73,7 @@ __export(src_exports, {
   FuelConnectorEventType: () => FuelConnectorEventType,
   FuelConnectorEventTypes: () => FuelConnectorEventTypes,
   FuelConnectorMethods: () => FuelConnectorMethods,
+  GAS_USED_MODIFIER: () => GAS_USED_MODIFIER,
   HDWallet: () => hdwallet_default,
   Language: () => Language,
   LocalStorage: () => LocalStorage,
@@ -1092,6 +1093,17 @@ var IsUserAccountDocument = import_graphql_tag.default`
   }
 }
     `;
+var GetConsensusParametersVersionDocument = import_graphql_tag.default`
+    query getConsensusParametersVersion {
+  chain {
+    latestBlock {
+      header {
+        consensusParametersVersion
+      }
+    }
+  }
+}
+    `;
 var SubmitAndAwaitDocument = import_graphql_tag.default`
     subscription submitAndAwait($encodedTransaction: HexString!) {
   submitAndAwait(tx: $encodedTransaction) {
@@ -1211,6 +1223,9 @@ function getSdk(requester) {
     isUserAccount(variables, options) {
       return requester(IsUserAccountDocument, variables, options);
     },
+    getConsensusParametersVersion(variables, options) {
+      return requester(GetConsensusParametersVersionDocument, variables, options);
+    },
     submitAndAwait(variables, options) {
       return requester(SubmitAndAwaitDocument, variables, options);
     },
@@ -4540,6 +4555,7 @@ var RESOURCES_PAGE_SIZE_LIMIT = 512;
 var TRANSACTIONS_PAGE_SIZE_LIMIT = 60;
 var BLOCKS_PAGE_SIZE_LIMIT = 5;
 var DEFAULT_RESOURCE_CACHE_TTL = 2e4;
+var GAS_USED_MODIFIER = 1.2;
 var processGqlChain = (chain) => {
   const { name, daHeight, consensusParameters } = chain;
   const {
@@ -4615,6 +4631,8 @@ var _Provider = class {
     __publicField(this, "url");
     /** @hidden */
     __publicField(this, "urlWithoutAuth");
+    /** @hidden */
+    __publicField(this, "consensusParametersTimestamp");
     __publicField(this, "options", {
       timeout: void 0,
       resourceCacheTTL: void 0,
@@ -4767,16 +4785,19 @@ var _Provider = class {
   }
   /**
    * Return the chain and node information.
-   *
+   * @param ignoreCache - If true, ignores the cache and re-fetch configs.
    * @returns A promise that resolves to the Chain and NodeInfo.
    */
-  async fetchChainAndNodeInfo() {
+  async fetchChainAndNodeInfo(ignoreCache = false) {
     let nodeInfo;
     let chain;
     try {
+      if (ignoreCache) {
+        throw new Error(`Jumps to the catch block andre-fetch`);
+      }
       nodeInfo = this.getNode();
       chain = this.getChain();
-    } catch (error) {
+    } catch (_err) {
       const data = await this.operations.getChainAndNodeInfo();
       nodeInfo = {
         maxDepth: (0, import_math18.bn)(data.nodeInfo.maxDepth),
@@ -4789,6 +4810,7 @@ var _Provider = class {
       chain = processGqlChain(data.chain);
       _Provider.chainInfoCache[this.urlWithoutAuth] = chain;
       _Provider.nodeInfoCache[this.urlWithoutAuth] = nodeInfo;
+      this.consensusParametersTimestamp = Date.now();
     }
     return {
       chain,
@@ -4938,18 +4960,25 @@ Supported fuel-core version: ${supportedVersion}.`
     } = this.getChain();
     return baseAssetId;
   }
-  validateTransaction(tx, consensusParameters) {
-    const { maxOutputs, maxInputs } = consensusParameters.txParameters;
+  /**
+   * @hidden
+   */
+  validateTransaction(tx) {
+    const {
+      consensusParameters: {
+        txParameters: { maxInputs, maxOutputs }
+      }
+    } = this.getChain();
     if ((0, import_math18.bn)(tx.inputs.length).gt(maxInputs)) {
       throw new import_errors17.FuelError(
         import_errors17.ErrorCode.MAX_INPUTS_EXCEEDED,
-        "The transaction exceeds the maximum allowed number of inputs."
+        `The transaction exceeds the maximum allowed number of inputs. Tx inputs: ${tx.inputs.length}, max inputs: ${maxInputs}`
       );
     }
     if ((0, import_math18.bn)(tx.outputs.length).gt(maxOutputs)) {
       throw new import_errors17.FuelError(
         import_errors17.ErrorCode.MAX_OUTPUTS_EXCEEDED,
-        "The transaction exceeds the maximum allowed number of outputs."
+        `The transaction exceeds the maximum allowed number of outputs. Tx outputs: ${tx.outputs.length}, max outputs: ${maxOutputs}`
       );
     }
   }
@@ -4968,8 +4997,7 @@ Supported fuel-core version: ${supportedVersion}.`
     if (estimateTxDependencies) {
       await this.estimateTxDependencies(transactionRequest);
     }
-    const { consensusParameters } = this.getChain();
-    this.validateTransaction(transactionRequest, consensusParameters);
+    this.validateTransaction(transactionRequest);
     const encodedTransaction = (0, import_utils28.hexlify)(transactionRequest.toTransactionBytes());
     let abis;
     if (isTransactionTypeScript(transactionRequest)) {
@@ -5057,6 +5085,7 @@ Supported fuel-core version: ${supportedVersion}.`
     const missingContractIds = [];
     let outputVariables = 0;
     let dryRunStatus;
+    this.validateTransaction(transactionRequest);
     for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
       const {
         dryRun: [{ receipts: rawReceipts, status }]
@@ -5179,6 +5208,27 @@ Supported fuel-core version: ${supportedVersion}.`
     });
     return results;
   }
+  async autoRefetchConfigs() {
+    const now = Date.now();
+    const diff = now - (this.consensusParametersTimestamp ?? 0);
+    if (diff < 6e4) {
+      return;
+    }
+    const chainInfo = this.getChain();
+    const {
+      consensusParameters: { version: previous }
+    } = chainInfo;
+    const {
+      chain: {
+        latestBlock: {
+          header: { consensusParametersVersion: current }
+        }
+      }
+    } = await this.operations.getConsensusParametersVersion();
+    if (previous !== current) {
+      await this.fetchChainAndNodeInfo(true);
+    }
+  }
   /**
    * Estimates the transaction gas and fee based on the provided transaction request.
    * @param transactionRequest - The transaction request object.
@@ -5187,6 +5237,7 @@ Supported fuel-core version: ${supportedVersion}.`
   async estimateTxGasAndFee(params) {
     const { transactionRequest } = params;
     let { gasPrice } = params;
+    await this.autoRefetchConfigs();
     const chainInfo = this.getChain();
     const { gasPriceFactor, maxGasPerTx } = this.getGasConfig();
     const minGas = transactionRequest.calculateMinGas(chainInfo);
@@ -5300,7 +5351,9 @@ Supported fuel-core version: ${supportedVersion}.`
       if (dryRunStatus && "reason" in dryRunStatus) {
         throw this.extractDryRunError(txRequestClone, receipts, dryRunStatus);
       }
-      gasUsed = getGasUsedFromReceipts(receipts);
+      const { maxGasPerTx } = this.getGasConfig();
+      const pristineGasUsed = getGasUsedFromReceipts(receipts);
+      gasUsed = (0, import_math18.bn)(pristineGasUsed.muln(GAS_USED_MODIFIER)).max(maxGasPerTx.sub(minGas));
       txRequestClone.gasLimit = gasUsed;
       ({ maxFee, maxGas, minFee, minGas, gasPrice } = await this.estimateTxGasAndFee({
         transactionRequest: txRequestClone,
@@ -7024,6 +7077,7 @@ var Account = class extends import_interfaces.AbstractAccount {
         `The account ${this.address} does not have enough base asset funds to cover the transaction execution.`
       );
     }
+    this.provider.validateTransaction(request);
     request.updatePredicateGasUsed(estimatedPredicates);
     const requestToReestimate = (0, import_ramda9.clone)(request);
     if (addedSignatures) {
@@ -11435,8 +11489,9 @@ var _Fuel = class extends FuelConnector {
   }
   async initialize() {
     try {
-      await this.setDefaultConnector();
+      const connectResponse = this.setDefaultConnector();
       this._targetUnsubscribe = this.setupConnectorListener();
+      await connectResponse;
     } catch (error) {
       throw new import_errors31.FuelError(import_errors31.ErrorCode.INVALID_PROVIDER, "Error initializing Fuel Connector");
     }
@@ -11774,6 +11829,7 @@ __publicField(Fuel, "defaultConfig", {});
   FuelConnectorEventType,
   FuelConnectorEventTypes,
   FuelConnectorMethods,
+  GAS_USED_MODIFIER,
   HDWallet,
   Language,
   LocalStorage,