Use BONSAI for the execution engine BesuNode in ATs

Affects tests extending AbstractJsonRpcTest
Signed-off-by: Simon Dudley <[email protected]>

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java

@@ -31,6 +31,7 @@
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
@@ -128,6 +129,7 @@ public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable
   private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
   private final boolean isStrictTxReplayProtectionEnabled;
   private final Map<String, String> environment;
+  private final DataStorageFormat dataStorageFormat;
 
   public BesuNode(
       final String name,
@@ -161,7 +163,8 @@ public BesuNode(
       final Optional<KeyPair> keyPair,
       final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
       final boolean isStrictTxReplayProtectionEnabled,
-      final Map<String, String> environment)
+      final Map<String, String> environment,
+      final DataStorageFormat dataStorageFormat)
       throws IOException {
     this.homeDirectory = dataPath.orElseGet(BesuNode::createTmpDataDirectory);
     this.isStrictTxReplayProtectionEnabled = isStrictTxReplayProtectionEnabled;
@@ -219,6 +222,7 @@ public BesuNode(
     privacyParameters.ifPresent(this::setPrivacyParameters);
     this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
     this.environment = environment;
+    this.dataStorageFormat = dataStorageFormat;
     LOG.info("Created BesuNode {}", this);
   }
 
@@ -751,6 +755,7 @@ public String toString() {
         .add("p2pEnabled", p2pEnabled)
         .add("discoveryEnabled", discoveryEnabled)
         .add("privacyEnabled", privacyParameters.isEnabled())
+        .add("dataStorageFormat", dataStorageFormat)
         .toString();
   }
 
@@ -806,4 +811,8 @@ public void setExitCode(final int exitValue) {
   public Map<String, String> getEnvironment() {
     return environment;
   }
+
+  public DataStorageFormat getDataStorageFormat() {
+    return dataStorageFormat;
+  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java

@@ -21,6 +21,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.tests.acceptance.dsl.StaticNodesUtils;
@@ -78,6 +79,11 @@ public void startNode(final BesuNode node) {
     params.add("--data-path");
     params.add(dataDir.toAbsolutePath().toString());
 
+    if (DataStorageFormat.BONSAI.equals(node.getDataStorageFormat())) {
+      params.add("--data-storage-format");
+      params.add("BONSAI");
+    }
+
     if (node.isDevMode()) {
       params.add("--network");
       params.add("DEV");

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

@@ -36,6 +36,9 @@
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.MetricsSystemFactory;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
@@ -143,7 +146,8 @@ public void startNode(final BesuNode node) {
     final SecurityModuleServiceImpl securityModuleService = new SecurityModuleServiceImpl();
     final Path dataDir = node.homeDirectory();
     final BesuConfiguration commonPluginConfiguration =
-        new BesuConfigurationImpl(dataDir, dataDir.resolve(DATABASE_PATH));
+        new BesuConfigurationImpl(
+            dataDir, dataDir.resolve(DATABASE_PATH), DataStorageFormat.BONSAI.getDatabaseVersion());
     final BesuPluginContextImpl besuPluginContext =
         besuPluginContextMap.computeIfAbsent(
             node,
@@ -190,6 +194,15 @@ public void startNode(final BesuNode node) {
 
     final PluginTransactionValidatorFactory pluginTransactionValidatorFactory =
         getPluginTransactionValidatorFactory(besuPluginContext);
+
+    final DataStorageConfiguration dataStorageConfiguration =
+        DataStorageFormat.BONSAI.equals(node.getDataStorageFormat())
+            ? ImmutableDataStorageConfiguration.builder()
+                .dataStorageFormat(DataStorageFormat.BONSAI)
+                .bonsaiMaxLayersToLoad(DataStorageConfiguration.DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD)
+                .build()
+            : DataStorageConfiguration.DEFAULT_CONFIG;
+
     builder
         .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
         .dataDirectory(node.homeDirectory())
@@ -207,6 +220,7 @@ public void startNode(final BesuNode node) {
             node.getPkiKeyStoreConfiguration()
                 .map(pkiConfig -> new PkiBlockCreationConfigurationProvider().load(pkiConfig)))
         .evmConfiguration(EvmConfiguration.DEFAULT)
+        .dataStorageConfiguration(dataStorageConfiguration)
         .maxPeers(maxPeers)
         .lowerBoundPeers(maxPeers)
         .maxRemotelyInitiatedPeers(15)

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java

@@ -24,6 +24,7 @@
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
@@ -67,6 +68,7 @@ public class BesuNodeConfiguration {
   private final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration;
   private final boolean strictTxReplayProtectionEnabled;
   private final Map<String, String> environment;
+  private final DataStorageFormat dataStorageFormat;
 
   BesuNodeConfiguration(
       final String name,
@@ -100,7 +102,8 @@ public class BesuNodeConfiguration {
       final Optional<KeyPair> keyPair,
       final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
       final boolean strictTxReplayProtectionEnabled,
-      final Map<String, String> environment) {
+      final Map<String, String> environment,
+      final DataStorageFormat dataStorageFormat) {
     this.name = name;
     this.miningParameters = miningParameters;
     this.jsonRpcConfiguration = jsonRpcConfiguration;
@@ -133,6 +136,7 @@ public class BesuNodeConfiguration {
     this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
     this.strictTxReplayProtectionEnabled = strictTxReplayProtectionEnabled;
     this.environment = environment;
+    this.dataStorageFormat = dataStorageFormat;
   }
 
   public String getName() {
@@ -262,4 +266,8 @@ public boolean isStrictTxReplayProtectionEnabled() {
   public Map<String, String> getEnvironment() {
     return environment;
   }
+
+  public DataStorageFormat getDataStorageFormat() {
+    return dataStorageFormat;
+  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java

@@ -35,6 +35,7 @@
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
@@ -90,6 +91,7 @@ public class BesuNodeConfigurationBuilder {
   private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
   private Boolean strictTxReplayProtectionEnabled = false;
   private Map<String, String> environment = new HashMap<>();
+  private DataStorageFormat dataStorageFormat = DataStorageFormat.FOREST;
 
   public BesuNodeConfigurationBuilder() {
     // Check connections more frequently during acceptance tests to cut down on
@@ -494,6 +496,11 @@ public BesuNodeConfigurationBuilder environment(final Map<String, String> enviro
     return this;
   }
 
+  public BesuNodeConfigurationBuilder dataStorageFormat(final DataStorageFormat dataStorageFormat) {
+    this.dataStorageFormat = dataStorageFormat;
+    return this;
+  }
+
   public BesuNodeConfiguration build() {
     return new BesuNodeConfiguration(
         name,
@@ -527,6 +534,7 @@ public BesuNodeConfiguration build() {
         keyPair,
         pkiKeyStoreConfiguration,
         strictTxReplayProtectionEnabled,
-        environment);
+        environment,
+        dataStorageFormat);
   }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java

@@ -31,6 +31,7 @@
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
@@ -89,7 +90,8 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.getKeyPair(),
         config.getPkiKeyStoreConfiguration(),
         config.isStrictTxReplayProtectionEnabled(),
-        config.getEnvironment());
+        config.getEnvironment(),
+        config.getDataStorageFormat());
   }
 
   public BesuNode createMinerNode(
@@ -549,6 +551,7 @@ public BesuNode createExecutionEngineGenesisNode(final String name, final String
             .jsonRpcTxPool()
             .engineRpcEnabled(true)
             .jsonRpcDebug()
+            .dataStorageFormat(DataStorageFormat.BONSAI)
             .build());
   }
 

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java

@@ -128,7 +128,8 @@ public PrivacyNode(
             Optional.empty(),
             Optional.empty(),
             besuConfig.isStrictTxReplayProtectionEnabled(),
-            besuConfig.getEnvironment());
+            besuConfig.getEnvironment(),
+            besuConfig.getDataStorageFormat());
   }
 
   public void testEnclaveConnection(final List<PrivacyNode> otherNodes) {

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

@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.services;
 
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 
 import java.nio.file.Path;
@@ -23,6 +24,7 @@ public class BesuConfigurationImpl implements BesuConfiguration {
 
   private final Path storagePath;
   private final Path dataPath;
+  private final int databaseVersion;
 
   /**
    * BesuConfigurationImpl Constructor.
@@ -33,6 +35,14 @@ public class BesuConfigurationImpl implements BesuConfiguration {
   public BesuConfigurationImpl(final Path dataPath, final Path storagePath) {
     this.dataPath = dataPath;
     this.storagePath = storagePath;
+    this.databaseVersion = DataStorageFormat.FOREST.getDatabaseVersion();
+  }
+
+  public BesuConfigurationImpl(
+      final Path dataPath, final Path storagePath, final int databaseVersion) {
+    this.dataPath = dataPath;
+    this.storagePath = storagePath;
+    this.databaseVersion = databaseVersion;
   }
 
   @Override
@@ -44,4 +54,9 @@ public Path getStoragePath() {
   public Path getDataPath() {
     return dataPath;
   }
+
+  @Override
+  public int getDatabaseVersion() {
+    return databaseVersion;
+  }
 }

plugin-api/build.gradle

@@ -69,7 +69,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'j6NRklFHlG35Pq/t6t/oJBrT8DbYOyruGq3cJNh4ENw='
+  knownHash = '+qJXjI2n0ZVY1jwmQ7bY+7yfYJvzj59g0BCcV22DbSI='
 }
 check.dependsOn('checkAPIChanges')
 

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java

@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.plugin.services;
 
-import org.hyperledger.besu.plugin.Unstable;
-
 import java.nio.file.Path;
 
 /** Generally useful configuration provided by Besu. */
@@ -40,8 +38,5 @@ public interface BesuConfiguration extends BesuService {
    *
    * @return Database version.
    */
-  @Unstable
-  default int getDatabaseVersion() {
-    return 1;
-  }
+  int getDatabaseVersion();
 }