Tests and optimizations

Signed-off-by: Fabio Di Fabio <[email protected]>

besu/src/main/java/org/hyperledger/besu/services/TransactionSimulationServiceImpl.java

@@ -18,7 +18,6 @@
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
@@ -35,11 +34,6 @@
 /** TransactionSimulationServiceImpl */
 @Unstable
 public class TransactionSimulationServiceImpl implements TransactionSimulationService {
-  private static final TransactionValidationParams SIMULATOR_ALLOWING_EXCEEDING_BALANCE =
-      ImmutableTransactionValidationParams.builder()
-          .from(TransactionValidationParams.transactionSimulator())
-          .isAllowExceedingBalance(true)
-          .build();
   private Blockchain blockchain;
   private TransactionSimulator transactionSimulator;
 
@@ -85,7 +79,7 @@ public Optional<TransactionSimulationResult> simulate(
           .process(
               callParameter,
               isAllowExceedingBalance
-                  ? SIMULATOR_ALLOWING_EXCEEDING_BALANCE
+                  ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
                   : TransactionValidationParams.transactionSimulator(),
               operationTracer,
               maybeBlockHeader.get())
@@ -97,7 +91,7 @@ public Optional<TransactionSimulationResult> simulate(
             callParameter,
             maybeAccountOverrides,
             isAllowExceedingBalance
-                ? SIMULATOR_ALLOWING_EXCEEDING_BALANCE
+                ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
                 : TransactionValidationParams.transactionSimulator(),
             operationTracer,
             transactionSimulator.simulatePendingBlockHeader())

consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractController.java

@@ -15,7 +15,6 @@
 package org.hyperledger.besu.consensus.qbft.validator;
 
 import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
@@ -94,10 +93,7 @@ private Optional<TransactionSimulatorResult> callFunction(
     final CallParameter callParams =
         new CallParameter(null, contractAddress, -1, null, null, payload);
     final TransactionValidationParams transactionValidationParams =
-        ImmutableTransactionValidationParams.builder()
-            .from(TransactionValidationParams.transactionSimulator())
-            .isAllowExceedingBalance(true)
-            .build();
+        TransactionValidationParams.transactionSimulatorAllowExceedingBalance();
     return transactionSimulator.process(
         callParams, transactionValidationParams, OperationTracer.NO_TRACING, blockNumber);
   }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java

@@ -26,7 +26,6 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
@@ -359,14 +358,9 @@ private Optional<CallResult> executeCall(final DataFetchingEnvironment environme
             data,
             Optional.empty());
 
-    ImmutableTransactionValidationParams.Builder transactionValidationParams =
-        ImmutableTransactionValidationParams.builder()
-            .from(TransactionValidationParams.transactionSimulator());
-    transactionValidationParams.isAllowExceedingBalance(true);
-
     return transactionSimulator.process(
         param,
-        transactionValidationParams.build(),
+        TransactionValidationParams.transactionSimulatorAllowExceedingBalance(),
         OperationTracer.NO_TRACING,
         (mutableWorldState, transactionSimulatorResult) ->
             transactionSimulatorResult.map(

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java

@@ -30,7 +30,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
@@ -46,11 +45,6 @@
 import com.google.common.annotations.VisibleForTesting;
 
 public abstract class AbstractEstimateGas extends AbstractBlockParameterMethod {
-  protected static final TransactionValidationParams ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMETERS =
-      ImmutableTransactionValidationParams.builder()
-          .from(TransactionValidationParams.transactionSimulator())
-          .isAllowExceedingBalance(true)
-          .build();
 
   private static final double SUB_CALL_REMAINING_GAS_RATIO = 65D / 64D;
 
@@ -214,10 +208,9 @@ protected static TransactionValidationParams getTransactionValidationParams(
       final JsonCallParameter callParams) {
     final boolean isAllowExceedingBalance = !callParams.isMaybeStrict().orElse(Boolean.FALSE);
 
-    if (isAllowExceedingBalance) {
-      return ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMETERS;
-    }
-    return TransactionValidationParams.transactionSimulator();
+    return isAllowExceedingBalance
+        ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
+        : TransactionValidationParams.transactionSimulator();
   }
 
   @VisibleForTesting

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByBlock.java

@@ -33,7 +33,6 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
@@ -117,9 +116,7 @@ protocolSchedule, transactionTrace, block, new AtomicInteger(), false)
   }
 
   protected TransactionValidationParams buildTransactionValidationParams() {
-    return ImmutableTransactionValidationParams.builder()
-        .from(TransactionValidationParams.transactionSimulator())
-        .build();
+    return TransactionValidationParams.transactionSimulator();
   }
 
   protected TraceOptions buildTraceOptions(final Set<TraceTypeParameter.TraceType> traceTypes) {

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java

@@ -35,7 +35,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
@@ -169,20 +168,18 @@ private JsonRpcErrorResponse errorResponse(
   private TransactionValidationParams buildTransactionValidationParams(
       final BlockHeader header, final JsonCallParameter callParams) {
 
-    ImmutableTransactionValidationParams.Builder transactionValidationParams =
-        ImmutableTransactionValidationParams.builder()
-            .from(TransactionValidationParams.transactionSimulator());
-
+    final boolean isAllowExceedingBalance;
     // if it is not set explicitly whether we want a strict check of the balance or not. this will
     // be decided according to the provided parameters
     if (callParams.isMaybeStrict().isEmpty()) {
-      transactionValidationParams.isAllowExceedingBalance(
-          isAllowExceedingBalanceAutoSelection(header, callParams));
+      isAllowExceedingBalance = isAllowExceedingBalanceAutoSelection(header, callParams);
+
     } else {
-      transactionValidationParams.isAllowExceedingBalance(
-          !callParams.isMaybeStrict().orElse(Boolean.FALSE));
+      isAllowExceedingBalance = !callParams.isMaybeStrict().orElse(Boolean.FALSE);
     }
-    return transactionValidationParams.build();
+    return isAllowExceedingBalance
+        ? TransactionValidationParams.transactionSimulatorAllowExceedingBalance()
+        : TransactionValidationParams.transactionSimulator();
   }
 
   private boolean isAllowExceedingBalanceAutoSelection(

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java

@@ -38,7 +38,6 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
@@ -376,11 +375,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabled() {
         .process(
             eq(modifiedLegacyTransactionCallParameter(Wei.ZERO)),
             eq(Optional.empty()), // no account overrides
-            eq(
-                ImmutableTransactionValidationParams.builder()
-                    .from(TransactionValidationParams.transactionSimulator())
-                    .isAllowExceedingBalance(true)
-                    .build()),
+            eq(TransactionValidationParams.transactionSimulatorAllowExceedingBalance()),
             any(OperationTracer.class),
             eq(latestBlockHeader));
   }
@@ -397,11 +392,7 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeEnabled() {
         .process(
             eq(modifiedLegacyTransactionCallParameter(Wei.ZERO)),
             eq(Optional.empty()), // no account overrides
-            eq(
-                ImmutableTransactionValidationParams.builder()
-                    .from(TransactionValidationParams.transactionSimulator())
-                    .isAllowExceedingBalance(false)
-                    .build()),
+            eq(TransactionValidationParams.transactionSimulator()),
             any(OperationTracer.class),
             eq(latestBlockHeader));
   }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java

@@ -35,6 +35,9 @@ public interface TransactionValidationParams {
   TransactionValidationParams transactionSimulatorParams =
       ImmutableTransactionValidationParams.of(false, false, false, false, false, true);
 
+  TransactionValidationParams transactionSimulatorAllowExceedingBalanceParams =
+      ImmutableTransactionValidationParams.of(false, true, false, false, false, true);
+
   @Value.Default
   default boolean isAllowFutureNonce() {
     return false;
@@ -69,6 +72,10 @@ static TransactionValidationParams transactionSimulator() {
     return transactionSimulatorParams;
   }
 
+  static TransactionValidationParams transactionSimulatorAllowExceedingBalance() {
+    return transactionSimulatorAllowExceedingBalanceParams;
+  }
+
   static TransactionValidationParams processingBlock() {
     return processingBlockParams;
   }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java

@@ -32,7 +32,6 @@
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -216,10 +215,7 @@ public Optional<TransactionSimulatorResult> processAtHead(final CallParameter ca
     final var chainHeadHash = blockchain.getChainHeadHash();
     return process(
         callParams,
-        ImmutableTransactionValidationParams.builder()
-            .from(TransactionValidationParams.transactionSimulator())
-            .isAllowExceedingBalance(true)
-            .build(),
+        TransactionValidationParams.transactionSimulatorAllowExceedingBalance(),
         OperationTracer.NO_TRACING,
         (mutableWorldState, transactionSimulatorResult) -> transactionSimulatorResult,
         blockchain