Use different transaction simulators for different behavior of rpc ga…

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

Hide file tree

Showing 14 changed files with 196 additions and 81 deletions.
diff --git a/...sl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/...sl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.tests.acceptance.dsl.node;
 
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
 
 import org.hyperledger.besu.Runner;
 import org.hyperledger.besu.RunnerBuilder;
@@ -377,8 +378,9 @@ TransactionSimulator provideTransactionSimulator(
         final WorldStateArchive worldStateArchive,
         final ProtocolSchedule protocolSchedule,
         final ApiConfiguration apiConfiguration) {
-      return new TransactionSimulator(
-          blockchain, worldStateArchive, protocolSchedule, apiConfiguration.getGasCap());
+      return new TransactionSimulator.Builder(blockchain, worldStateArchive, protocolSchedule)
+          .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+          .build();
     }
 
     @Provides

diff --git a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
@@ -20,6 +20,7 @@
 import static java.util.function.Predicate.not;
 import static org.hyperledger.besu.controller.BesuController.CACHE_PATH;
 import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
@@ -699,11 +700,10 @@ public Runner build() {
     final Synchronizer synchronizer = besuController.getSynchronizer();
 
     final TransactionSimulator transactionSimulator =
-        new TransactionSimulator(
-            context.getBlockchain(),
-            context.getWorldStateArchive(),
-            protocolSchedule,
-            apiConfiguration.getGasCap());
+        new TransactionSimulator.Builder(
+                context.getBlockchain(), context.getWorldStateArchive(), protocolSchedule)
+            .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+            .build();
 
     final Bytes localNodeId = nodeKey.getPublicKey().getEncodedBytes();
     final Optional<NodePermissioningController> nodePermissioningController =

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -26,6 +26,7 @@
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_ENGINE_JSON_RPC_PORT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService.EPHEMERAL_JWT_FILE;
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
 import static org.hyperledger.besu.nat.kubernetes.KubernetesNatManager.DEFAULT_BESU_SERVICE_NAME_FILTER;
 
 import org.hyperledger.besu.BesuInfo;
@@ -1434,11 +1435,12 @@ private void startPlugins(final Runner runner) {
         besuController.getProtocolContext(), besuController.getProtocolSchedule());
     transactionSimulationServiceImpl.init(
         besuController.getProtocolContext().getBlockchain(),
-        new TransactionSimulator(
-            besuController.getProtocolContext().getBlockchain(),
-            besuController.getProtocolContext().getWorldStateArchive(),
-            besuController.getProtocolSchedule(),
-            apiConfiguration.getGasCap()));
+        new TransactionSimulator.Builder(
+                besuController.getProtocolContext().getBlockchain(),
+                besuController.getProtocolContext().getWorldStateArchive(),
+                besuController.getProtocolSchedule())
+            .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+            .build());
     rpcEndpointServiceImpl.init(runner.getInProcessRpcMethods());
 
     besuPluginContext.addService(

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
@@ -394,7 +394,7 @@ protected BftContext createConsensusContext(
             blockchain, epochManager, bftBlockInterface().get(), validatorOverrides);
 
     final TransactionSimulator transactionSimulator =
-        new TransactionSimulator(blockchain, worldStateArchive, protocolSchedule, 0L);
+        new TransactionSimulator.Builder(blockchain, worldStateArchive, protocolSchedule).build();
     transactionValidatorProvider =
         new TransactionValidatorProvider(
             blockchain, new ValidatorContractController(transactionSimulator), qbftForksSchedule);

diff --git a/...integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java b/...integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java
@@ -445,7 +445,7 @@ private static ControllerAndState createControllerAndFinalState(
 
     final BftValidatorOverrides validatorOverrides = convertBftForks(qbftForks);
     final TransactionSimulator transactionSimulator =
-        new TransactionSimulator(blockChain, worldStateArchive, protocolSchedule, 0L);
+        new TransactionSimulator.Builder(blockChain, worldStateArchive, protocolSchedule).build();
 
     final BlockValidatorProvider blockValidatorProvider =
         BlockValidatorProvider.forkingValidatorProvider(

diff --git a/...java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java b/...java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
+
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Hash;
@@ -334,8 +336,10 @@ private Optional<CallResult> executeCall(final DataFetchingEnvironment environme
     final long bn = header.getNumber();
     final long gasCap = environment.getGraphQlContext().get(GraphQLContextType.GAS_CAP);
     final TransactionSimulator transactionSimulator =
-        new TransactionSimulator(
-            query.getBlockchain(), query.getWorldStateArchive(), protocolSchedule, gasCap);
+        new TransactionSimulator.Builder(
+                query.getBlockchain(), query.getWorldStateArchive(), protocolSchedule)
+            .rpcGasCap(gasCap, BOUNDED)
+            .build();
 
     long gasParam = -1;
     Wei gasPriceParam = null;

diff --git a/...a/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java b/...a/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
+
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType;
@@ -147,9 +149,10 @@ public Optional<CallResult> getCall(final DataFetchingEnvironment environment) {
         environment.getGraphQlContext().get(GraphQLContextType.PROTOCOL_SCHEDULE);
     final long gasCap = environment.getGraphQlContext().get(GraphQLContextType.GAS_CAP);
     final TransactionSimulator transactionSimulator =
-        new TransactionSimulator(
-            query.getBlockchain(), query.getWorldStateArchive(), protocolSchedule, gasCap);
-
+        new TransactionSimulator.Builder(
+                query.getBlockchain(), query.getWorldStateArchive(), protocolSchedule)
+            .rpcGasCap(gasCap, BOUNDED)
+            .build();
     long gasParam = -1;
     Wei gasPriceParam = null;
     Wei valueParam = null;

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java b/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
+
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
@@ -123,10 +125,11 @@ protected Map<String, JsonRpcMethod> create() {
         new DebugTraceCall(
             blockchainQueries,
             protocolSchedule,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())));
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()));
   }
 }
diff --git a/...pi/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java b/...pi/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java
@@ -14,6 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.UNBOUNDED;
+
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
@@ -127,11 +130,12 @@ protected Map<String, JsonRpcMethod> create() {
         new EthGetBlockTransactionCountByHash(blockchainQueries),
         new EthCall(
             blockchainQueries,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())),
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), UNBOUNDED)
+                .build()),
         new EthFeeHistory(
             protocolSchedule,
             blockchainQueries.getBlockchain(),
@@ -161,18 +165,20 @@ protected Map<String, JsonRpcMethod> create() {
         new EthSendTransaction(),
         new EthEstimateGas(
             blockchainQueries,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())),
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()),
         new EthCreateAccessList(
             blockchainQueries,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())),
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()),
         new EthMining(miningCoordinator),
         new EthCoinbase(miningCoordinator),
         new EthProtocolVersion(supportedCapabilities),

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java b/.../src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
+import static org.hyperledger.besu.ethereum.transaction.TransactionSimulator.RpcGasCapMode.BOUNDED;
+
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
@@ -76,26 +78,29 @@ protected Map<String, JsonRpcMethod> create() {
         new TraceCall(
             blockchainQueries,
             protocolSchedule,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())),
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()),
         new TraceCallMany(
             blockchainQueries,
             protocolSchedule,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())),
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()),
         new TraceRawTransaction(
             protocolSchedule,
             blockchainQueries,
-            new TransactionSimulator(
-                blockchainQueries.getBlockchain(),
-                blockchainQueries.getWorldStateArchive(),
-                protocolSchedule,
-                apiConfiguration.getGasCap())));
+            new TransactionSimulator.Builder(
+                    blockchainQueries.getBlockchain(),
+                    blockchainQueries.getWorldStateArchive(),
+                    protocolSchedule)
+                .rpcGasCap(apiConfiguration.getGasCap(), BOUNDED)
+                .build()));
   }
 }