WIP

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>

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

@@ -108,8 +108,7 @@ public void startNode(final BesuNode node) {
       params.add(node.getMiningParameters().getStratumNetworkInterface());
       params.add("--min-gas-price");
       params.add(
-          Integer.toString(
-              node.getMiningParameters().getDynamic().getMinTransactionGasPrice().intValue()));
+          Integer.toString(node.getMiningParameters().getMinTransactionGasPrice().intValue()));
       params.add("--Xminer-remote-sealers-limit");
       params.add(
           Integer.toString(node.getMiningParameters().getUnstable().getRemoteSealersLimit()));

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

@@ -22,7 +22,6 @@
 
 import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.crypto.KeyPair;
-import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
@@ -57,13 +56,7 @@ public class BesuNodeConfigurationBuilder {
   private String name;
   private Optional<Path> dataPath = Optional.empty();
   private MiningParameters miningParameters =
-      ImmutableMiningParameters.builder()
-          .isMiningEnabled(false)
-          .coinbase(AddressHelpers.ofValue(1))
-          .build()
-          .getDynamic()
-          .setMinTransactionGasPrice(Wei.of(1000))
-          .toParameters();
+      ImmutableMiningParameters.builder().coinbase(AddressHelpers.ofValue(1)).build();
 
   private JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
   private JsonRpcConfiguration engineRpcConfiguration = JsonRpcConfiguration.createEngineDefault();
@@ -117,14 +110,7 @@ public BesuNodeConfigurationBuilder miningEnabled() {
   }
 
   public BesuNodeConfigurationBuilder miningEnabled(final boolean enabled) {
-    this.miningParameters =
-        ImmutableMiningParameters.builder()
-            .isMiningEnabled(enabled)
-            .coinbase(AddressHelpers.ofValue(1))
-            .build()
-            .getDynamic()
-            .setMinTransactionGasPrice(Wei.of(1000))
-            .toParameters();
+    this.miningParameters = miningParameters.setMiningEnabled(enabled);
     this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER.name());
     return this;
   }

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

@@ -27,6 +27,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
+import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.UpdatableInitValues;
 import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
@@ -305,12 +306,13 @@ public BesuNode createNodeWithMultiTenantedPrivacy(
 
     final MiningParameters miningParameters =
         ImmutableMiningParameters.builder()
-            .isMiningEnabled(true)
+            .updatableInitValues(
+                UpdatableInitValues.builder()
+                    .isMiningEnabled(true)
+                    .minTransactionGasPrice(Wei.ZERO)
+                    .build())
             .coinbase(AddressHelpers.ofValue(1))
-            .build()
-            .getDynamic()
-            .setMinTransactionGasPrice(Wei.ZERO)
-            .toParameters();
+            .build();
 
     return create(
         new BesuNodeConfigurationBuilder()

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java

@@ -18,6 +18,7 @@
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
+import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.UpdatableInitValues;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
@@ -61,12 +62,13 @@ public void shouldMineOnSingleNodeWithFreeGas_Berlin() throws Exception {
     final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
     final MiningParameters zeroGasMiningParams =
         ImmutableMiningParameters.builder()
-            .isMiningEnabled(true)
+            .updatableInitValues(
+                UpdatableInitValues.builder()
+                    .isMiningEnabled(true)
+                    .minTransactionGasPrice(Wei.ZERO)
+                    .build())
             .coinbase(AddressHelpers.ofValue(1))
-            .build()
-            .getDynamic()
-            .setMinTransactionGasPrice(Wei.ZERO)
-            .toParameters();
+            .build();
     minerNode.setMiningParameters(zeroGasMiningParams);
 
     cluster.start(minerNode);

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -1424,7 +1424,7 @@ public void run() {
 
       // Need to create vertx after cmdline has been parsed, such that metricsSystem is configurable
       vertx = createVertx(createVertxOptions(metricsSystem.get()));
-      miningParameters = buildMiningParameters();
+      miningParameters = getMiningParameters();
 
       validateOptions();
       configure();
@@ -1663,7 +1663,7 @@ private void validatePluginOptions() {
             "--privacy-marker-transaction-signing-key-file can not be used in conjunction with a plugin that specifies a PrivateMarkerTransactionFactory");
       }
 
-      if (Wei.ZERO.compareTo(miningParameters.getDynamic().getMinTransactionGasPrice()) < 0
+      if (Wei.ZERO.compareTo(getMiningParameters().getMinTransactionGasPrice()) < 0
           && (privacyOptionGroup.privateMarkerTransactionSigningKeyPath == null
               && (privacyPluginService == null
                   || privacyPluginService.getPrivateMarkerTransactionFactory() == null))) {
@@ -2134,7 +2134,7 @@ public BesuControllerBuilder getControllerBuilder() {
         .transactionSelectorFactory(getTransactionSelectorFactory())
         .pluginTransactionValidatorFactory(getPluginTransactionValidatorFactory())
         .dataDirectory(dataDir())
-        .miningParameters(miningParameters)
+        .miningParameters(getMiningParameters())
         .transactionPoolConfiguration(buildTransactionPoolConfiguration())
         .nodeKey(new NodeKey(securityModule()))
         .metricsSystem(metricsSystem.get())
@@ -2149,8 +2149,7 @@ public BesuControllerBuilder getControllerBuilder() {
             new PrunerConfiguration(pruningBlockConfirmations, pruningBlocksRetained))
         .genesisConfigOverrides(genesisConfigOverrides)
         .gasLimitCalculator(
-            miningParameters != null
-                    && miningParameters.getDynamic().getTargetGasLimit().isPresent()
+            getMiningParameters().getTargetGasLimit().isPresent()
                 ? new FrontierTargetingGasLimitCalculator()
                 : GasLimitCalculator.constant())
         .requiredBlocks(requiredBlocks)
@@ -2479,8 +2478,7 @@ private ApiConfiguration apiConfiguration() {
         .gasPriceBlocks(apiGasPriceBlocks)
         .gasPricePercentile(apiGasPricePercentile)
         .gasPriceMinSupplier(
-            miningParameters.getDynamic().getMinTransactionGasPrice().getAsBigInteger()
-                ::longValueExact)
+            getMiningParameters().getMinTransactionGasPrice().getAsBigInteger()::longValueExact)
         .gasPriceMax(apiGasPriceMax)
         .build();
   }
@@ -2816,8 +2814,11 @@ private TransactionPoolConfiguration buildTransactionPoolConfiguration() {
         .build();
   }
 
-  private MiningParameters buildMiningParameters() {
-    return miningOptions.toDomainObject();
+  private MiningParameters getMiningParameters() {
+    if (miningParameters == null) {
+      miningParameters = miningOptions.toDomainObject();
+    }
+    return miningParameters;
   }
 
   private boolean isPruningEnabled() {
@@ -3216,8 +3217,8 @@ private List<Integer> getEffectivePorts() {
         effectivePorts, metricsOptionGroup.metricsPort, metricsOptionGroup.isMetricsEnabled);
     addPortIfEnabled(
         effectivePorts,
-        miningParameters.getStratumPort(),
-        miningParameters.isStratumMiningEnabled());
+        getMiningParameters().getStratumPort(),
+        getMiningParameters().isStratumMiningEnabled());
     return effectivePorts;
   }
 

besu/src/main/java/org/hyperledger/besu/cli/options/stable/MiningOptions.java

@@ -15,15 +15,15 @@
 package org.hyperledger.besu.cli.options.stable;
 
 import static java.util.Arrays.asList;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Dynamic.DEFAULT_EXTRA_DATA;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Dynamic.DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.Dynamic.DEFAULT_MIN_TRANSACTION_GAS_PRICE;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_MAX_OMMERS_DEPTH;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_POW_JOB_TTL;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_REMOTE_SEALERS_LIMIT;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.Unstable.DEFAULT_REMOTE_SEALERS_TTL;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.UpdatableInitValues.DEFAULT_EXTRA_DATA;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.UpdatableInitValues.DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.UpdatableInitValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE;
 
 import org.hyperledger.besu.cli.options.CLIOptions;
 import org.hyperledger.besu.cli.util.CommandLineUtils;
@@ -236,11 +236,9 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
     miningOptions.iStratumMiningEnabled = miningParameters.isStratumMiningEnabled();
     miningOptions.stratumNetworkInterface = miningParameters.getStratumNetworkInterface();
     miningOptions.stratumPort = miningParameters.getStratumPort();
-    miningOptions.extraData = miningParameters.getDynamic().getExtraData();
-    miningOptions.minTransactionGasPrice =
-        miningParameters.getDynamic().getMinTransactionGasPrice();
-    miningOptions.minBlockOccupancyRatio =
-        miningParameters.getDynamic().getMinBlockOccupancyRatio();
+    miningOptions.extraData = miningParameters.getExtraData();
+    miningOptions.minTransactionGasPrice = miningParameters.getMinTransactionGasPrice();
+    miningOptions.minBlockOccupancyRatio = miningParameters.getMinBlockOccupancyRatio();
     miningOptions.unstableOptions.remoteSealersLimit =
         miningParameters.getUnstable().getRemoteSealersLimit();
     miningOptions.unstableOptions.remoteSealersTimeToLive =
@@ -257,18 +255,26 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
         miningParameters.getUnstable().getPosBlockCreationRepetitionMinDuration();
 
     miningParameters.getCoinbase().ifPresent(coinbase -> miningOptions.coinbase = coinbase);
-    miningParameters
-        .getDynamic()
-        .getTargetGasLimit()
-        .ifPresent(tgl -> miningOptions.targetGasLimit = tgl);
+    miningParameters.getTargetGasLimit().ifPresent(tgl -> miningOptions.targetGasLimit = tgl);
     return miningOptions;
   }
 
   @Override
   public MiningParameters toDomainObject() {
+    final var updatableInitValuesBuilder =
+        ImmutableMiningParameters.UpdatableInitValues.builder()
+            .isMiningEnabled(isMiningEnabled)
+            .extraData(extraData)
+            .minTransactionGasPrice(minTransactionGasPrice)
+            .minBlockOccupancyRatio(minBlockOccupancyRatio);
+
+    if (targetGasLimit != null) {
+      updatableInitValuesBuilder.targetGasLimit(targetGasLimit);
+    }
+
     final var miningParametersBuilder =
         ImmutableMiningParameters.builder()
-            .isMiningEnabled(isMiningEnabled)
+            .updatableInitValues(updatableInitValuesBuilder.build())
             .isStratumMiningEnabled(iStratumMiningEnabled)
             .stratumNetworkInterface(stratumNetworkInterface)
             .stratumPort(stratumPort)
@@ -288,18 +294,7 @@ public MiningParameters toDomainObject() {
       miningParametersBuilder.coinbase(coinbase);
     }
 
-    final var dynamicParameters =
-        miningParametersBuilder
-            .build()
-            .getDynamic()
-            .setExtraData(extraData)
-            .setMinBlockOccupancyRatio(minBlockOccupancyRatio)
-            .setMinTransactionGasPrice(minTransactionGasPrice);
-
-    if (targetGasLimit != null) {
-      dynamicParameters.setTargetGasLimit(targetGasLimit);
-    }
-    return dynamicParameters.toParameters();
+    return miningParametersBuilder.build();
   }
 
   @Override

besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java

@@ -32,6 +32,7 @@
 import org.hyperledger.besu.ethereum.blockcreation.IncrementingNonceGenerator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
+import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters.UpdatableInitValues;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.metrics.MetricsService;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
@@ -269,13 +270,14 @@ private MiningParameters getMiningParameters() {
       final Address coinbase = Address.ZERO;
       final Bytes extraData = Bytes.EMPTY;
       return ImmutableMiningParameters.builder()
+          .updatableInitValues(
+              UpdatableInitValues.builder()
+                  .nonceGenerator(new IncrementingNonceGenerator(0))
+                  .extraData(extraData)
+                  .minTransactionGasPrice(minTransactionGasPrice)
+                  .build())
           .coinbase(coinbase)
-          .nonceGenerator(new IncrementingNonceGenerator(0))
-          .build()
-          .getDynamic()
-          .setExtraData(extraData)
-          .setMinTransactionGasPrice(minTransactionGasPrice)
-          .toParameters();
+          .build();
     }
 
     private void importJsonBlocks(final BesuController controller, final Path path)
@@ -370,7 +372,11 @@ public void run() {
     }
 
     private BesuController createBesuController() {
-      return parentCommand.parentCommand.buildController();
+      return parentCommand
+          .parentCommand
+          .getControllerBuilder()
+          .miningParameters(MiningParameters.newDefault())
+          .build();
     }
 
     private void exportRlpFormat(final BesuController controller) throws IOException {

besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java

@@ -34,7 +34,6 @@
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
@@ -149,6 +148,6 @@ protected CliqueContext createConsensusContext(
   @Override
   public MiningParameters getMiningParameterOverrides(final MiningParameters fromCli) {
     // Clique mines by default, reflect that with in the mining parameters:
-    return ImmutableMiningParameters.builder().from(fromCli).isMiningEnabled(true).build();
+    return fromCli.setMiningEnabled(true);
   }
 }

besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java

@@ -55,9 +55,7 @@ protected MiningCoordinator createMiningCoordinator(
                 MainnetBlockHeaderValidator.MINIMUM_SECONDS_SINCE_PARENT,
                 MainnetBlockHeaderValidator.TIMESTAMP_TOLERANCE_S,
                 clock),
-            epochCalculator,
-            miningParameters.getUnstable().getPowJobTimeToLive(),
-            miningParameters.getUnstable().getMaxOmmerDepth());
+            epochCalculator);
 
     final PoWMiningCoordinator miningCoordinator =
         new PoWMiningCoordinator(

besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java

@@ -32,7 +32,6 @@
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -135,10 +134,7 @@ protected MiningCoordinator createMiningCoordinator(
                 transitionProtocolSchedule.getPreMergeSchedule(),
                 protocolContext,
                 transactionPool,
-                ImmutableMiningParameters.builder()
-                    .from(miningParameters)
-                    .isMiningEnabled(false)
-                    .build(),
+                MiningParameters.MINING_DISABLED,
                 syncState,
                 ethProtocolManager),
             mergeBesuControllerBuilder.createTransitionMiningCoordinator(
@@ -281,7 +277,7 @@ private void initTransitionWatcher(
           }
         });
 
-    // initialize our merge miningParameters merge status before we would start either
+    // initialize our merge context merge status before we would start either
     Blockchain blockchain = protocolContext.getBlockchain();
     blockchain
         .getTotalDifficultyByHash(blockchain.getChainHeadHash())

besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java

@@ -39,9 +39,9 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
@@ -187,7 +187,7 @@ public void setUp() throws IOException {
             .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
             .storageProvider(new InMemoryKeyValueStorageProvider())
             .networkId(BigInteger.ONE)
-            .miningParameters(ImmutableMiningParameters.builder().isMiningEnabled(false).build())
+            .miningParameters(MiningParameters.newDefault())
             .nodeKey(NodeKeyUtils.generate())
             .metricsSystem(new NoOpMetricsSystem())
             .dataDirectory(folder)

besu/src/test/java/org/hyperledger/besu/PrivacyTest.java

@@ -30,8 +30,8 @@
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters;
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
@@ -111,7 +111,7 @@ private BesuController setUpControllerWithPrivacyEnabled(final boolean flexibleE
         .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
         .storageProvider(new InMemoryKeyValueStorageProvider())
         .networkId(BigInteger.ONE)
-        .miningParameters(ImmutableMiningParameters.builder().isMiningEnabled(false).build())
+        .miningParameters(MiningParameters.newDefault())
         .nodeKey(NodeKeyUtils.generate())
         .metricsSystem(new NoOpMetricsSystem())
         .dataDirectory(dataDir)