Fix: rpc gas cap option should not inconditionally override smaller t…

…x gas limit Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
hyperledger · Sep 30, 2024 · 513ce1f · 513ce1f
1 parent c3aa3f4
commit 513ce1f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/...um/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java b/...um/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
@@ -230,16 +230,23 @@ public Optional<TransactionSimulatorResult> processWithWorldUpdater(
     final Account sender = updater.get(senderAddress);
     final long nonce = sender != null ? sender.getNonce() : 0L;
 
-    long gasLimit =
+    final long txGasLimit =
         callParams.getGasLimit() >= 0
             ? callParams.getGasLimit()
             : blockHeaderToProcess.getGasLimit();
+
+    final long simulationGasLimit;
     if (rpcGasCap > 0) {
-      gasLimit = rpcGasCap;
+      simulationGasLimit = Math.min(txGasLimit, rpcGasCap);
       LOG.trace(
-          "Gas limit capped at {} for transaction simulation due to provided RPC gas cap.",
+          "Gas limit capped at {} for transaction simulation, tx gas limit is {} and provided RPC gas cap is {}",
+          simulationGasLimit,
+          txGasLimit,
           rpcGasCap);
+    } else {
+      simulationGasLimit = txGasLimit;
     }
+
     final Wei value = callParams.getValue() != null ? callParams.getValue() : Wei.ZERO;
     final Bytes payload = callParams.getPayload() != null ? callParams.getPayload() : Bytes.EMPTY;
 
@@ -265,7 +272,7 @@ public Optional<TransactionSimulatorResult> processWithWorldUpdater(
             header,
             senderAddress,
             nonce,
-            gasLimit,
+            simulationGasLimit,
             value,
             payload,
             blobGasPrice);

diff --git a/...ore/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java b/...ore/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
@@ -79,7 +79,7 @@ public class TransactionSimulatorTest {
 
   private static final Address DEFAULT_FROM =
       Address.fromHexString("0x0000000000000000000000000000000000000000");
-  private static final long GASCAP = 500L;
+  private static final long GAS_CAP = 50000L;
   private TransactionSimulator transactionSimulator;
   private TransactionSimulator cappedTransactionSimulator;
 
@@ -96,7 +96,7 @@ public void setUp() {
     this.transactionSimulator =
         new TransactionSimulator(blockchain, worldStateArchive, protocolSchedule, 0);
     this.cappedTransactionSimulator =
-        new TransactionSimulator(blockchain, worldStateArchive, protocolSchedule, GASCAP);
+        new TransactionSimulator(blockchain, worldStateArchive, protocolSchedule, GAS_CAP);
   }
 
   @Test
@@ -530,7 +530,7 @@ public void shouldReturnSuccessfulResultWhenEip1559TransactionProcessingIsSucces
   @Test
   public void shouldCapGasLimitWhenOriginalTransactionExceedsGasCap() {
     final CallParameter callParameter =
-        eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GASCAP + 1);
+        eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GAS_CAP + 1);
 
     final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE);
 
@@ -542,7 +542,7 @@ public void shouldCapGasLimitWhenOriginalTransactionExceedsGasCap() {
             .type(TransactionType.EIP1559)
             .chainId(BigInteger.ONE)
             .nonce(1L)
-            .gasLimit(GASCAP)
+            .gasLimit(GAS_CAP)
             .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow())
             .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow())
             .to(callParameter.getTo())
@@ -566,11 +566,11 @@ public void shouldCapGasLimitWhenOriginalTransactionExceedsGasCap() {
   }
 
   @Test
-  public void shouldUseRpcGasCapWhenCapIsHigherThanGasLimit() {
+  public void rpcGasCapShouldNotOverrideExplicitTxGasLimit() {
     // generate a transaction with a gas limit that is lower than the gas cap,
-    // expect the gas cap to override parameter gas limit
+    // expect the gas cap to not override tx gas limit
     final CallParameter callParameter =
-        eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GASCAP - 1);
+        eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GAS_CAP - 1);
 
     final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE);
 
@@ -591,7 +591,7 @@ public void shouldUseRpcGasCapWhenCapIsHigherThanGasLimit() {
             .value(callParameter.getValue())
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
-            .gasLimit(GASCAP)
+            .gasLimit(GAS_CAP - 1)
             .build();
 
     // call process with original transaction