Adjust overriding the state

Signed-off-by: Fabio Di Fabio <[email protected]>
hyperledger · Nov 28, 2024 · 665f9b6 · 665f9b6
1 parent fad0f1b
commit 665f9b6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java b/.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
@@ -16,10 +16,12 @@
 
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonCallParameterUtil.validateAndGetCallParams;
 
+import org.hyperledger.besu.datatypes.AccountOverrideMap;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
@@ -41,6 +43,8 @@
 
 import java.util.Optional;
 
+import com.google.common.annotations.VisibleForTesting;
+
 public abstract class AbstractEstimateGas extends AbstractBlockParameterMethod {
   protected static final TransactionValidationParams ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMETERS =
       ImmutableTransactionValidationParams.builder()
@@ -78,11 +82,12 @@ protected abstract Object simulate(
   protected Object pendingResult(final JsonRpcRequestContext requestContext) {
     final JsonCallParameter jsonCallParameter = validateAndGetCallParams(requestContext);
     final var validationParams = getTransactionValidationParams(jsonCallParameter);
+    final var maybeStateOverrides = getAddressAccountOverrideMap(requestContext);
     final var pendingBlockHeader = transactionSimulator.simulatePendingBlockHeader();
     final TransactionSimulationFunction simulationFunction =
         (cp, op) ->
             transactionSimulator.processOnPending(
-                cp, Optional.empty(), validationParams, op, pendingBlockHeader);
+                cp, maybeStateOverrides, validationParams, op, pendingBlockHeader);
     return simulate(
         requestContext, jsonCallParameter, pendingBlockHeader.getGasLimit(), simulationFunction);
   }
@@ -104,10 +109,11 @@ private Object resultByBlockHeader(
       final JsonCallParameter jsonCallParameter,
       final BlockHeader blockHeader) {
     final var validationParams = getTransactionValidationParams(jsonCallParameter);
+    final var maybeStateOverrides = getAddressAccountOverrideMap(requestContext);
     final TransactionSimulationFunction simulationFunction =
         (cp, op) ->
-            transactionSimulator.processOnPending(
-                cp, Optional.empty(), validationParams, op, blockHeader);
+            transactionSimulator.process(
+                cp, maybeStateOverrides, validationParams, op, blockHeader);
     return simulate(
         requestContext, jsonCallParameter, blockHeader.getGasLimit(), simulationFunction);
   }
@@ -214,8 +220,19 @@ protected static TransactionValidationParams getTransactionValidationParams(
     return TransactionValidationParams.transactionSimulator();
   }
 
+  @VisibleForTesting
+  protected Optional<AccountOverrideMap> getAddressAccountOverrideMap(
+      final JsonRpcRequestContext request) {
+    try {
+      return request.getOptionalParameter(2, AccountOverrideMap.class);
+    } catch (JsonRpcParameter.JsonRpcParameterException e) {
+      throw new InvalidJsonRpcRequestException(
+          "Invalid account overrides parameter (index 2)", RpcErrorType.INVALID_CALL_PARAMS, e);
+    }
+  }
+
   protected interface TransactionSimulationFunction {
     Optional<TransactionSimulatorResult> simulate(
-        final CallParameter callParams, final OperationTracer operationTracer);
+        CallParameter callParams, OperationTracer operationTracer);
   }
 }
diff --git a/.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java b/.../java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java
@@ -52,7 +52,7 @@ protected Object simulate(
 
     final AccessListOperationTracer tracer = AccessListOperationTracer.create();
     final Optional<TransactionSimulatorResult> firstResult =
-        simulationFunction.simulate(callParams, tracer);
+        simulationFunction.simulate(overrideGasLimit(callParams, gasLimit), tracer);
 
     // if the call accessList is different from the simulation result, calculate gas and return
     if (shouldProcessWithAccessListOverride(callParams, tracer)) {

diff --git a/.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java b/.../main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
@@ -14,11 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import org.hyperledger.besu.datatypes.AccountOverrideMap;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
@@ -30,7 +27,6 @@
 
 import java.util.Optional;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -109,15 +105,4 @@ private Optional<JsonRpcErrorResponse> validateSimulationResult(
     }
     return Optional.empty();
   }
-
-  @VisibleForTesting
-  protected Optional<AccountOverrideMap> getAddressAccountOverrideMap(
-      final JsonRpcRequestContext request) {
-    try {
-      return request.getOptionalParameter(2, AccountOverrideMap.class);
-    } catch (JsonRpcParameter.JsonRpcParameterException e) {
-      throw new InvalidJsonRpcRequestException(
-          "Invalid account overrides parameter (index 2)", RpcErrorType.INVALID_CALL_PARAMS, e);
-    }
-  }
 }