@fuel-ts/account 0.0.0-pr-1699-20240214105147 → 0.0.0-pr-1699-20240214162234

package/dist/test-utils.js

@@ -3643,23 +3643,6 @@ var _Provider = class {
     if (estimateTxDependencies) {
       await this.estimateTxDependencies(transactionRequest);
     }
-    const { gasUsed, minGasPrice } = await this.getTransactionCost(transactionRequest, [], {
-      estimateTxDependencies: false,
-      estimatePredicates: false
-    });
-    if ((0, import_math14.bn)(minGasPrice).gt((0, import_math14.bn)(transactionRequest.gasPrice))) {
-      throw new import_errors13.FuelError(
-        import_errors13.ErrorCode.GAS_PRICE_TOO_LOW,
-        `Gas price '${transactionRequest.gasPrice}' is lower than the required: '${minGasPrice}'.`
-      );
-    }
-    const isScriptTransaction = transactionRequest.type === import_transactions17.TransactionType.Script;
-    if (isScriptTransaction && (0, import_math14.bn)(gasUsed).gt((0, import_math14.bn)(transactionRequest.gasLimit))) {
-      throw new import_errors13.FuelError(
-        import_errors13.ErrorCode.GAS_LIMIT_TOO_LOW,
-        `Gas limit '${transactionRequest.gasLimit}' is lower than the required: '${gasUsed}'.`
-      );
-    }
     const encodedTransaction = (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes());
     if (awaitExecution) {
       const subscription = this.operations.submitAndAwait({ encodedTransaction });
@@ -4529,10 +4512,14 @@ var Account = class extends import_interfaces.AbstractAccount {
     const request = new ScriptTransactionRequest(params);
     request.addCoinOutput(import_address4.Address.fromAddressOrString(destination), amount, assetId);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(request);
-    const gasPriceToUse = (0, import_math17.bn)(txParams.gasPrice ?? minGasPrice);
-    const gasLimitToUse = (0, import_math17.bn)(txParams.gasLimit ?? gasUsed);
-    request.gasPrice = gasPriceToUse;
-    request.gasLimit = gasLimitToUse;
+    request.gasPrice = (0, import_math17.bn)(txParams.gasPrice ?? minGasPrice);
+    request.gasLimit = (0, import_math17.bn)(txParams.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return request;
   }
@@ -4577,7 +4564,13 @@ var Account = class extends import_interfaces.AbstractAccount {
       request,
       [{ amount: (0, import_math17.bn)(amount), assetId: String(assetId) }]
     );
-    request.gasLimit = (0, import_math17.bn)(params.gasLimit || gasUsed);
+    request.gasLimit = (0, import_math17.bn)(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4590,6 +4583,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @returns A promise that resolves to the transaction response.
    */
   async withdrawToBaseLayer(recipient, amount, txParams = {}) {
+    const { minGasPrice } = this.provider.getGasConfig();
     const recipientAddress = import_address4.Address.fromAddressOrString(recipient);
     const recipientDataArray = (0, import_ethers21.getBytesCopy)(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -4602,14 +4596,20 @@ var Account = class extends import_interfaces.AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = { script, ...txParams };
+    const params = { script, gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
     const forwardingQuantities = [{ amount: (0, import_math17.bn)(amount), assetId: import_configs10.BaseAssetId }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
     );
-    request.gasLimit = params.gasLimit ? (0, import_math17.bn)(params.gasLimit) : gasUsed;
+    request.gasLimit = (0, import_math17.bn)(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4638,6 +4638,25 @@ var Account = class extends import_interfaces.AbstractAccount {
     await this.provider.estimateTxDependencies(transactionRequest);
     return this.provider.simulate(transactionRequest, { estimateTxDependencies: false });
   }
+  validateGas({
+    gasUsed,
+    gasPrice,
+    gasLimit,
+    minGasPrice
+  }) {
+    if (minGasPrice.gt(gasPrice)) {
+      throw new import_errors15.FuelError(
+        import_errors15.ErrorCode.GAS_PRICE_TOO_LOW,
+        `Gas price '${gasPrice}' is lower than the required: '${minGasPrice}'.`
+      );
+    }
+    if (gasUsed.gt(gasLimit)) {
+      throw new import_errors15.FuelError(
+        import_errors15.ErrorCode.GAS_LIMIT_TOO_LOW,
+        `Gas limit '${gasLimit}' is lower than the required: '${gasUsed}'.`
+      );
+    }
+  }
 };
 
 // src/signer/signer.ts