Merge branch 'main' into zkbesu

# Conflicts: # .github/pull_request_template.md # .github/workflows/acceptance-tests.yml # .github/workflows/artifacts.yml # .github/workflows/integration-tests.yml # .github/workflows/pre-review.yml # .github/workflows/reference-tests.yml # .github/workflows/sonarcloud.yml # build.gradle # ethereum/evmtool/build.gradle # gradle.properties
Consensys · Mar 21, 2024 · b48324b · b48324b
2 parents acfe742 + c564fcd
commit b48324b
Show file tree

Hide file tree

Showing 123 changed files with 1,419 additions and 321 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,16 +11,19 @@
 ### Deprecations
 
 ### Additions and Improvements
+- `txpool_besuPendingTransactions`change parameter `numResults` to optional parameter [#6708](https://github.com/hyperledger/besu/pull/6708)
 - Extend `Blockchain` service [#6592](https://github.com/hyperledger/besu/pull/6592)
-- Add bft-style blockperiodseconds transitions to Clique [#6596](https://github.com/hyperledger/besu/pull/6596)
-- Add createemptyblocks transitions to Clique [#6608](https://github.com/hyperledger/besu/pull/6608)
+- Add bft-style `blockperiodseconds` transitions to Clique [#6596](https://github.com/hyperledger/besu/pull/6596)
+- Add `createemptyblocks` transitions to Clique [#6608](https://github.com/hyperledger/besu/pull/6608)
 - RocksDB database metadata refactoring [#6555](https://github.com/hyperledger/besu/pull/6555)
-- Make layered txpool aware of minGasPrice and minPriorityFeePerGas dynamic options [#6611](https://github.com/hyperledger/besu/pull/6611)
+- Make layered txpool aware of `minGasPrice` and `minPriorityFeePerGas` dynamic options [#6611](https://github.com/hyperledger/besu/pull/6611)
 - Update commons-compress to 1.26.0 [#6648](https://github.com/hyperledger/besu/pull/6648)
 - Update Vert.x to 4.5.4 [#6666](https://github.com/hyperledger/besu/pull/6666)
 - Refactor and extend `TransactionPoolValidatorService` [#6636](https://github.com/hyperledger/besu/pull/6636)
-- Transaction call object to accept both `input` and `data` field simultaneously if they are set to equal values [#6702](https://github.com/hyperledger/besu/pull/6702)
 - Introduce `TransactionSimulationService` [#6686](https://github.com/hyperledger/besu/pull/6686)
+- Transaction call object to accept both `input` and `data` field simultaneously if they are set to equal values [#6702](https://github.com/hyperledger/besu/pull/6702)
+- `eth_call` for blob tx allows for empty `maxFeePerBlobGas` [#6731](https://github.com/hyperledger/besu/pull/6731)
+- Extend error handling of plugin RPC methods [#6759](https://github.com/hyperledger/besu/pull/6759)
 
 ### Bug fixes
 - Fix txpool dump/restore race condition [#6665](https://github.com/hyperledger/besu/pull/6665)
@@ -2325,7 +2328,7 @@ Workaround - Limit the number of blocks queried by each `eth_getLogs` call.
 - Implemented private contract log filters including JSON-RPC methods to interact with private filters. [\#735](https://github.com/hyperledger/besu/pull/735)
 - Implemented EIP-2315: Simple Subroutines for the EVM [\#717](https://github.com/hyperledger/besu/pull/717)
 - Implemented Splunk logging. [\#725](https://github.com/hyperledger/besu/pull/725)
-- Implemented optional native library encryption. [\#675](https://github.com/hyperledger/besu/pull/675).  To enable add `--Xsecp256k1-native-enabled` (for transaciton signatures) and/or `--Xaltbn128-native-enabled` (for altbn128 precomiled contracts) as command line options.
+- Implemented optional native library encryption. [\#675](https://github.com/hyperledger/besu/pull/675).  To enable add `--Xsecp256k1-native-enabled` (for transaction signatures) and/or `--Xaltbn128-native-enabled` (for altbn128 precomiled contracts) as command line options.
 
 ### Bug Fixes
 
@@ -2507,7 +2510,7 @@ Early access features are available features that are not recommended for produc
 have unstable interfaces.
 
 * [Onchain privacy groups](https://besu.hyperledger.org/en/latest/Concepts/Privacy/Onchain-PrivacyGroups/) with add and remove members.
-  Not being able to to re-add a member to an onchain privacy group is a [known issue](https://github.com/hyperledger/besu/issues/455)
+  Not being able to re-add a member to an onchain privacy group is a [known issue](https://github.com/hyperledger/besu/issues/455)
   with the add and remove functionality.
 
 ### Known Issues

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
@@ -106,7 +106,8 @@ private BesuPluginContextImpl buildPluginContext(
       final TransactionPoolValidatorServiceImpl transactionPoolValidatorServiceImpl,
       final BlockchainServiceImpl blockchainServiceImpl,
       final RpcEndpointServiceImpl rpcEndpointServiceImpl,
-      final BesuConfiguration commonPluginConfiguration) {
+      final BesuConfiguration commonPluginConfiguration,
+      final PermissioningServiceImpl permissioningService) {
     final CommandLine commandLine = new CommandLine(CommandSpec.create());
     final BesuPluginContextImpl besuPluginContext = new BesuPluginContextImpl();
     besuPluginContext.addService(StorageService.class, storageService);
@@ -137,7 +138,7 @@ private BesuPluginContextImpl buildPluginContext(
     }
 
     besuPluginContext.addService(BesuConfiguration.class, commonPluginConfiguration);
-    besuPluginContext.addService(PermissioningService.class, new PermissioningServiceImpl());
+    besuPluginContext.addService(PermissioningService.class, permissioningService);
     besuPluginContext.addService(PrivacyPluginService.class, new PrivacyPluginServiceImpl());
 
     besuPluginContext.registerPlugins(pluginsPath);
@@ -172,6 +173,8 @@ public void startNode(final BesuNode node) {
     final RpcEndpointServiceImpl rpcEndpointServiceImpl = new RpcEndpointServiceImpl();
     final Path dataDir = node.homeDirectory();
     final BesuConfigurationImpl commonPluginConfiguration = new BesuConfigurationImpl();
+    final PermissioningServiceImpl permissioningService = new PermissioningServiceImpl();
+
     final var miningParameters =
         ImmutableMiningParameters.builder()
             .from(node.getMiningParameters())
@@ -195,7 +198,8 @@ public void startNode(final BesuNode node) {
                     transactionPoolValidatorServiceImpl,
                     blockchainServiceImpl,
                     rpcEndpointServiceImpl,
-                    commonPluginConfiguration));
+                    commonPluginConfiguration,
+                    permissioningService));
 
     GlobalOpenTelemetry.resetForTest();
     final ObservableMetricsSystem metricsSystem =
@@ -283,7 +287,7 @@ public void startNode(final BesuNode node) {
         .jsonRpcIpcConfiguration(node.jsonRpcIpcConfiguration())
         .dataDir(node.homeDirectory())
         .metricsSystem(metricsSystem)
-        .permissioningService(new PermissioningServiceImpl())
+        .permissioningService(permissioningService)
         .metricsConfiguration(node.getMetricsConfiguration())
         .p2pEnabled(node.isP2pEnabled())
         .p2pTLSConfiguration(node.getTLSConfiguration())
@@ -292,15 +296,14 @@ public void startNode(final BesuNode node) {
             node.getStaticNodes().stream()
                 .map(EnodeURLImpl::fromString)
                 .collect(Collectors.toList()))
-        .besuPluginContext(new BesuPluginContextImpl())
+        .besuPluginContext(besuPluginContext)
         .autoLogBloomCaching(false)
         .storageProvider(storageProvider)
         .rpcEndpointService(rpcEndpointServiceImpl);
     node.engineRpcConfiguration().ifPresent(runnerBuilder::engineJsonRpcConfiguration);
 
-    final Runner runner = runnerBuilder.build();
-
     besuPluginContext.beforeExternalServices();
+    final Runner runner = runnerBuilder.build();
 
     runner.startExternalServices();
 

diff --git a/...va/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java b/...va/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java
@@ -25,6 +25,7 @@
 import java.util.function.UnaryOperator;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class EthSendRawTransactionAcceptanceTest extends AcceptanceTestBase {
@@ -51,12 +52,15 @@ public void setUp() throws Exception {
   }
 
   @Test
+  @Disabled("flaky with timeout")
   public void shouldSendSuccessfullyToLenientNodeWithoutChainId() {
     final TransferTransaction tx = createTransactionWithoutChainId();
     final String rawTx = tx.signedTransactionData();
     final String txHash = tx.transactionHash();
 
     lenientNode.verify(eth.expectSuccessfulEthRawTransaction(rawTx));
+
+    // this line is where the test is flaky
     // Tx should be included on-chain
     miningNode.verify(eth.expectSuccessfulTransactionReceipt(txHash));
   }

diff --git a/.../src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PermissioningPluginTest.java b/.../src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PermissioningPluginTest.java
@@ -37,22 +37,13 @@ public class PermissioningPluginTest extends AcceptanceTestBaseJunit5 {
 
   @BeforeEach
   public void setUp() throws Exception {
-    final BesuNodeConfigurationBuilder builder =
-        new BesuNodeConfigurationBuilder()
-            .miningEnabled(false)
-            .plugins(List.of("testPlugins"))
-            .extraCLIOptions(List.of("--plugin-permissioning-test-enabled=true"))
-            .jsonRpcEnabled()
-            .jsonRpcTxPool()
-            .jsonRpcAdmin();
+    minerNode = besu.create(createNodeBuilder().name("miner").build());
 
-    minerNode = besu.create(builder.name("miner").build());
+    aliceNode = besu.create(createNodeBuilder().name("alice").keyFilePath("key").build());
 
-    aliceNode = besu.create(builder.name("alice").keyFilePath("key").build());
+    bobNode = besu.create(createNodeBuilder().name("bob").keyFilePath("key1").build());
 
-    bobNode = besu.create(builder.name("bob").keyFilePath("key1").build());
-
-    charlieNode = besu.create(builder.name("charlie").keyFilePath("key2").build());
+    charlieNode = besu.create(createNodeBuilder().name("charlie").keyFilePath("key2").build());
 
     cluster.start(minerNode, charlieNode);
 
@@ -63,6 +54,16 @@ public void setUp() throws Exception {
     bobNode.awaitPeerDiscovery(net.awaitPeerCount(2));
   }
 
+  private BesuNodeConfigurationBuilder createNodeBuilder() {
+    return new BesuNodeConfigurationBuilder()
+        .miningEnabled(false)
+        .plugins(List.of("testPlugins"))
+        .extraCLIOptions(List.of("--plugin-permissioning-test-enabled=true"))
+        .jsonRpcEnabled()
+        .jsonRpcTxPool()
+        .jsonRpcAdmin();
+  }
+
   @Test
   public void blockedConnectionNodeCanOnlyConnectToTransactionNode() {
     minerNode.verify(admin.hasPeer(aliceNode));

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -2598,7 +2598,7 @@ String getLogLevel() {
   }
 
   /**
-   * Returns the flag indicating that version compatiblity checks will be made.
+   * Returns the flag indicating that version compatibility checks will be made.
    *
    * @return true if compatibility checks should be made, otherwise false
    */

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java
@@ -130,6 +130,7 @@ protected ProtocolSchedule createProtocolSchedule() {
         privacyParameters,
         isRevertReasonEnabled,
         evmConfiguration,
+        miningParameters,
         badBlockManager);
   }
 

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java
@@ -286,6 +286,7 @@ protected ProtocolSchedule createProtocolSchedule() {
         isRevertReasonEnabled,
         bftExtraDataCodec().get(),
         evmConfiguration,
+        miningParameters,
         badBlockManager);
   }
 

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java
@@ -95,6 +95,7 @@ protected ProtocolSchedule createProtocolSchedule() {
         privacyParameters,
         isRevertReasonEnabled,
         evmConfiguration,
+        miningParameters,
         badBlockManager);
   }
 

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
@@ -173,7 +173,11 @@ protected MiningCoordinator createTransitionMiningCoordinator(
   @Override
   protected ProtocolSchedule createProtocolSchedule() {
     return MergeProtocolSchedule.create(
-        configOptionsSupplier.get(), privacyParameters, isRevertReasonEnabled, badBlockManager);
+        configOptionsSupplier.get(),
+        privacyParameters,
+        isRevertReasonEnabled,
+        miningParameters,
+        badBlockManager);
   }
 
   @Override

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
@@ -326,6 +326,7 @@ protected ProtocolSchedule createProtocolSchedule() {
         isRevertReasonEnabled,
         bftExtraDataCodec().get(),
         evmConfiguration,
+        miningParameters,
         badBlockManager);
   }
 

diff --git a/besu/src/main/java/org/hyperledger/besu/services/TransactionSimulationServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TransactionSimulationServiceImpl.java
@@ -19,7 +19,10 @@
 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;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
 import org.hyperledger.besu.plugin.Unstable;
@@ -62,14 +65,16 @@ public Optional<TransactionSimulationResult> simulate(
 
     final CallParameter callParameter = CallParameter.fromTransaction(transaction);
 
-    final var blockHeader =
-        blockchain
-            .getBlockHeader(blockHash)
-            .or(() -> blockchain.getBlockHeaderSafe(blockHash))
-            .orElseThrow(
-                () ->
-                    new IllegalStateException(
-                        "Block header not yet present for chain head hash: " + blockHash));
+    final var maybeBlockHeader =
+        blockchain.getBlockHeader(blockHash).or(() -> blockchain.getBlockHeaderSafe(blockHash));
+
+    if (maybeBlockHeader.isEmpty()) {
+      return Optional.of(
+          new TransactionSimulationResult(
+              transaction,
+              TransactionProcessingResult.invalid(
+                  ValidationResult.invalid(TransactionInvalidReason.BLOCK_NOT_FOUND))));
+    }
 
     return transactionSimulator
         .process(
@@ -78,7 +83,7 @@ public Optional<TransactionSimulationResult> simulate(
                 ? SIMULATOR_ALLOWING_EXCEEDING_BALANCE
                 : TransactionValidationParams.transactionSimulator(),
             operationTracer,
-            blockHeader)
+            maybeBlockHeader.get())
         .map(res -> new TransactionSimulationResult(transaction, res.result()));
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
@@ -188,11 +189,13 @@ private static MilestoneStreamingTransitionProtocolSchedule createSchedule(
     MilestoneStreamingProtocolSchedule preMergeProtocolSchedule =
         new MilestoneStreamingProtocolSchedule(
             (DefaultProtocolSchedule)
-                MainnetProtocolSchedule.fromConfig(configOptions, new BadBlockManager()));
+                MainnetProtocolSchedule.fromConfig(
+                    configOptions, MiningParameters.MINING_DISABLED, new BadBlockManager()));
     MilestoneStreamingProtocolSchedule postMergeProtocolSchedule =
         new MilestoneStreamingProtocolSchedule(
             (DefaultProtocolSchedule)
-                MergeProtocolSchedule.create(configOptions, false, new BadBlockManager()));
+                MergeProtocolSchedule.create(
+                    configOptions, false, MiningParameters.MINING_DISABLED, new BadBlockManager()));
     final MilestoneStreamingTransitionProtocolSchedule schedule =
         new MilestoneStreamingTransitionProtocolSchedule(
             preMergeProtocolSchedule, postMergeProtocolSchedule);