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

package/dist/test-utils.mjs

@@ -3621,23 +3621,6 @@ var _Provider = class {
     if (estimateTxDependencies) {
       await this.estimateTxDependencies(transactionRequest);
     }
-    const { gasUsed, minGasPrice } = await this.getTransactionCost(transactionRequest, [], {
-      estimateTxDependencies: false,
-      estimatePredicates: false
-    });
-    if (bn14(minGasPrice).gt(bn14(transactionRequest.gasPrice))) {
-      throw new FuelError12(
-        ErrorCode11.GAS_PRICE_TOO_LOW,
-        `Gas price '${transactionRequest.gasPrice}' is lower than the required: '${minGasPrice}'.`
-      );
-    }
-    const isScriptTransaction = transactionRequest.type === TransactionType8.Script;
-    if (isScriptTransaction && bn14(gasUsed).gt(bn14(transactionRequest.gasLimit))) {
-      throw new FuelError12(
-        ErrorCode11.GAS_LIMIT_TOO_LOW,
-        `Gas limit '${transactionRequest.gasLimit}' is lower than the required: '${gasUsed}'.`
-      );
-    }
     const encodedTransaction = hexlify12(transactionRequest.toTransactionBytes());
     if (awaitExecution) {
       const subscription = this.operations.submitAndAwait({ encodedTransaction });
@@ -4507,10 +4490,14 @@ var Account = class extends AbstractAccount {
     const request = new ScriptTransactionRequest(params);
     request.addCoinOutput(Address3.fromAddressOrString(destination), amount, assetId);
     const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(request);
-    const gasPriceToUse = bn16(txParams.gasPrice ?? minGasPrice);
-    const gasLimitToUse = bn16(txParams.gasLimit ?? gasUsed);
-    request.gasPrice = gasPriceToUse;
-    request.gasLimit = gasLimitToUse;
+    request.gasPrice = bn16(txParams.gasPrice ?? minGasPrice);
+    request.gasLimit = bn16(txParams.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return request;
   }
@@ -4555,7 +4542,13 @@ var Account = class extends AbstractAccount {
       request,
       [{ amount: bn16(amount), assetId: String(assetId) }]
     );
-    request.gasLimit = bn16(params.gasLimit || gasUsed);
+    request.gasLimit = bn16(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4568,6 +4561,7 @@ var Account = class extends AbstractAccount {
    * @returns A promise that resolves to the transaction response.
    */
   async withdrawToBaseLayer(recipient, amount, txParams = {}) {
+    const { minGasPrice } = this.provider.getGasConfig();
     const recipientAddress = Address3.fromAddressOrString(recipient);
     const recipientDataArray = getBytesCopy15(
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
@@ -4580,14 +4574,20 @@ var Account = class extends AbstractAccount {
       ...recipientDataArray,
       ...amountDataArray
     ]);
-    const params = { script, ...txParams };
+    const params = { script, gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
     const forwardingQuantities = [{ amount: bn16(amount), assetId: BaseAssetId3 }];
     const { requiredQuantities, maxFee, gasUsed } = await this.provider.getTransactionCost(
       request,
       forwardingQuantities
     );
-    request.gasLimit = params.gasLimit ? bn16(params.gasLimit) : gasUsed;
+    request.gasLimit = bn16(params.gasLimit ?? gasUsed);
+    this.validateGas({
+      gasUsed,
+      gasPrice: request.gasPrice,
+      gasLimit: request.gasLimit,
+      minGasPrice
+    });
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
@@ -4616,6 +4616,25 @@ var Account = class extends AbstractAccount {
     await this.provider.estimateTxDependencies(transactionRequest);
     return this.provider.simulate(transactionRequest, { estimateTxDependencies: false });
   }
+  validateGas({
+    gasUsed,
+    gasPrice,
+    gasLimit,
+    minGasPrice
+  }) {
+    if (minGasPrice.gt(gasPrice)) {
+      throw new FuelError14(
+        ErrorCode13.GAS_PRICE_TOO_LOW,
+        `Gas price '${gasPrice}' is lower than the required: '${minGasPrice}'.`
+      );
+    }
+    if (gasUsed.gt(gasLimit)) {
+      throw new FuelError14(
+        ErrorCode13.GAS_LIMIT_TOO_LOW,
+        `Gas limit '${gasLimit}' is lower than the required: '${gasUsed}'.`
+      );
+    }
+  }
 };
 
 // src/signer/signer.ts