Skip to content

Commit

Permalink
Removed the commented code
Browse files Browse the repository at this point in the history 
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
  • Loading branch information
@fab-10
fab-10 committed Oct 12, 2023
1 parent 18bcce3 commit c511638
Show file tree
Hide file tree
Showing 48 changed files with 147 additions and 1,007 deletions.
6 changes: 4 additions & 2 deletions ...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,11 @@ public void startNode(final BesuNode node) {
Integer.toString(
node.getMiningParameters().getDynamic().getMinTransactionGasPrice().intValue()));
params.add("--Xminer-remote-sealers-limit");
params.add(Integer.toString(node.getMiningParameters().getRemoteSealersLimit()));
params.add(
Integer.toString(node.getMiningParameters().getUnstable().getRemoteSealersLimit()));
params.add("--Xminer-remote-sealers-hashrate-ttl");
params.add(Long.toString(node.getMiningParameters().getRemoteSealersTimeToLive()));
params.add(
Long.toString(node.getMiningParameters().getUnstable().getRemoteSealersTimeToLive()));
}
if (node.getMiningParameters().isStratumMiningEnabled()) {
params.add("--miner-stratum-enabled");
Expand Down
10 changes: 0 additions & 10 deletions ...yperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@ public class BesuNodeConfigurationBuilder {
.setMinTransactionGasPrice(Wei.of(1000))
.toParameters();

// new MiningParameters.Builder()
// .miningEnabled(false)
// .coinbase(AddressHelpers.ofValue(1))
// .minTransactionGasPrice(Wei.of(1000))
// .build();
private JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
private JsonRpcConfiguration engineRpcConfiguration = JsonRpcConfiguration.createEngineDefault();
private WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
Expand Down Expand Up @@ -130,11 +125,6 @@ public BesuNodeConfigurationBuilder miningEnabled(final boolean enabled) {
.getDynamic()
.setMinTransactionGasPrice(Wei.of(1000))
.toParameters();
// new MiningParameters.Builder()
// .miningEnabled(enabled)
// .minTransactionGasPrice(Wei.of(1000))
// .coinbase(AddressHelpers.ofValue(1))
// .build();
this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER.name());
return this;
}
Expand Down
5 changes: 0 additions & 5 deletions ...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,11 +311,6 @@ public BesuNode createNodeWithMultiTenantedPrivacy(
.getDynamic()
.setMinTransactionGasPrice(Wei.ZERO)
.toParameters();
// new MiningParameters.Builder()
// .minTransactionGasPrice(Wei.ZERO)
// .coinbase(AddressHelpers.ofValue(1))
// .miningEnabled(true)
// .build();

return create(
new BesuNodeConfigurationBuilder()
Expand Down
5 changes: 0 additions & 5 deletions ...ests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ public void shouldMineOnSingleNodeWithFreeGas_Berlin() throws Exception {
.getDynamic()
.setMinTransactionGasPrice(Wei.ZERO)
.toParameters();
// new MiningParameters.Builder()
// .miningEnabled(true)
// .minTransactionGasPrice(Wei.ZERO)
// .coinbase(AddressHelpers.ofValue(1))
// .build();
minerNode.setMiningParameters(zeroGasMiningParams);

cluster.start(minerNode);
Expand Down
2 changes: 1 addition & 1 deletion besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ public Runner build() {
powMiningCoordinator,
miningParameters.getStratumPort(),
miningParameters.getStratumNetworkInterface(),
miningParameters.getStratumExtranonce(),
miningParameters.getUnstable().getStratumExtranonce(),
metricsSystem));
miningCoordinator.addEthHashObserver(stratumServer.get());
LOG.debug("added ethash observer: {}", stratumServer.get());
Expand Down
142 changes: 0 additions & 142 deletions besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
unstableTransactionPoolOptions =
org.hyperledger.besu.cli.options.unstable.TransactionPoolOptions.create();
private final DnsOptions unstableDnsOptions = DnsOptions.create();
// private final MiningOptions unstableMiningOptions = MiningOptions.create();
private final NatOptions unstableNatOptions = NatOptions.create();
private final NativeLibraryOptions unstableNativeLibraryOptions = NativeLibraryOptions.create();
private final RPCOptions unstableRPCOptions = RPCOptions.create();
Expand Down Expand Up @@ -1071,62 +1070,6 @@ static class MetricsOptionGroup {
"How deep a chain reorganization must be in order for it to be logged (default: ${DEFAULT-VALUE})")
private final Long reorgLoggingThreshold = 6L;

// Miner options group

// static class MinerOptionGroup {
// @Option(
// names = {"--miner-enabled"},
// description = "Set if node will perform mining (default: ${DEFAULT-VALUE})")
// private final Boolean isMiningEnabled = false;
//
// @Option(
// names = {"--miner-stratum-enabled"},
// description = "Set if node will perform Stratum mining (default: ${DEFAULT-VALUE})")
// private final Boolean iStratumMiningEnabled = false;
//
// @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final
// Strings.
// @Option(
// names = {"--miner-stratum-host"},
// description = "Host for Stratum network mining service (default: ${DEFAULT-VALUE})")
// private String stratumNetworkInterface = "0.0.0.0";
//
// @Option(
// names = {"--miner-stratum-port"},
// description = "Stratum port binding (default: ${DEFAULT-VALUE})")
// private final Integer stratumPort = 8008;
//
// @Option(
// names = {"--miner-coinbase"},
// description =
// "Account to which mining rewards are paid. You must specify a valid coinbase if "
// + "mining is enabled using --miner-enabled option",
// arity = "1")
// private final Address coinbase = null;
//
// @Option(
// names = {"--miner-extra-data"},
// description =
// "A hex string representing the (32) bytes to be included in the extra data "
// + "field of a mined block (default: ${DEFAULT-VALUE})",
// arity = "1")
// private final Bytes extraData = DEFAULT_EXTRA_DATA;
// }

// @Option(
// names = {"--min-gas-price"},
// description =
// "Minimum price (in Wei) offered by a transaction for it to be included in a mined "
// + "block (default: ${DEFAULT-VALUE})",
// arity = "1")
// private final Wei minTransactionGasPrice = DEFAULT_MIN_TRANSACTION_GAS_PRICE;

// @Option(
// names = {"--min-block-occupancy-ratio"},
// description = "Minimum occupancy ratio for a mined block (default: ${DEFAULT-VALUE})",
// arity = "1")
// private final Double minBlockOccupancyRatio = DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;

@Option(
names = {"--pruning-enabled"},
description =
Expand Down Expand Up @@ -1205,13 +1148,6 @@ static class PermissionsOptionGroup {
arity = "*",
split = ",")
private final Map<Long, Hash> requiredBlocks = new HashMap<>();
//
// @Option(
// names = {"--target-gas-limit"},
// description =
// "Sets target gas limit per block. If set, each block's gas limit will approach this
// setting over time if the current gas limit is different.")
// private final Long targetGasLimit = null;

@SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
@Option(
Expand Down Expand Up @@ -1586,7 +1522,6 @@ private void handleUnstableOptions() {
.put("Privacy Plugin Configuration", unstablePrivacyPluginOptions)
.put("Synchronizer", unstableSynchronizerOptions)
.put("TransactionPool", unstableTransactionPoolOptions)
// .put("Mining", unstableMiningOptions)
.put("Native Library", unstableNativeLibraryOptions)
.put("EVM Options", unstableEvmOptions)
.put("IPC Options", unstableIpcOptions)
Expand Down Expand Up @@ -1871,39 +1806,9 @@ private void validateRequiredOptions() {
});
}

// @SuppressWarnings("ConstantConditions")
private void validateMiningParams() {
miningOptions.validate(
commandLine, logger, isMergeEnabled(), getActualGenesisConfigOptions().isEthHash());
// if (Boolean.TRUE.equals(minerOptionGroup.isMiningEnabled)
// && minerOptionGroup.coinbase == null) {
// throw new ParameterException(
// this.commandLine,
// "Unable to mine without a valid coinbase. Either disable mining (remove
// --miner-enabled) "
// + "or specify the beneficiary of mining (via --miner-coinbase <Address>)");
// }
// if (Boolean.FALSE.equals(minerOptionGroup.isMiningEnabled)
// && Boolean.TRUE.equals(minerOptionGroup.iStratumMiningEnabled)) {
// throw new ParameterException(
// this.commandLine,
// "Unable to mine with Stratum if mining is disabled. Either disable Stratum mining
// (remove --miner-stratum-enabled) "
// + "or specify mining is enabled (--miner-enabled)");
// }
// if (unstableMiningOptions.getPosBlockCreationMaxTime() <= 0
// || unstableMiningOptions.getPosBlockCreationMaxTime()
// > MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME) {
// throw new ParameterException(
// this.commandLine, "--Xpos-block-creation-max-time must be positive and ≤ 12000");
// }
//
// if (unstableMiningOptions.getPosBlockCreationRepetitionMinDuration() <= 0
// || unstableMiningOptions.getPosBlockCreationRepetitionMinDuration() > 2000) {
// throw new ParameterException(
// this.commandLine,
// "--Xpos-block-creation-repetition-min-duration must be positive and ≤ 2000");
// }
}

/**
Expand Down Expand Up @@ -2076,31 +1981,6 @@ private void issueOptionWarnings() {
"--p2p-port",
"--remote-connections-max-percentage"));

// // Check that block producer options work
// if (!isMergeEnabled() && getActualGenesisConfigOptions().isEthHash()) {
// CommandLineUtils.checkOptionDependencies(
// logger,
// commandLine,
// "--miner-enabled",
// !miningParameters.isMiningEnabled(),
// asList(
// "--miner-coinbase",
// "--min-gas-price",
// "--min-block-occupancy-ratio",
// "--miner-extra-data"));
//
// // Check that mining options are able to work
// CommandLineUtils.checkOptionDependencies(
// logger,
// commandLine,
// "--miner-enabled",
// !miningParameters.isMiningEnabled(),
// asList(
// "--miner-stratum-enabled",
// "--Xminer-remote-sealers-limit",
// "--Xminer-remote-sealers-hashrate-ttl"));
// }

CommandLineUtils.failIfOptionDoesntMeetRequirement(
commandLine,
"--fast-sync-min-peers can't be used with FULL sync-mode",
Expand Down Expand Up @@ -2254,28 +2134,6 @@ public BesuControllerBuilder getControllerBuilder() {
.transactionSelectorFactory(getTransactionSelectorFactory())
.pluginTransactionValidatorFactory(getPluginTransactionValidatorFactory())
.dataDirectory(dataDir())
// .miningParameters(
// new MiningParameters.Builder()
// .coinbase(minerOptionGroup.coinbase)
// .targetGasLimit(targetGasLimit)
// .minTransactionGasPrice(minTransactionGasPrice)
// .extraData(minerOptionGroup.extraData)
// .miningEnabled(minerOptionGroup.isMiningEnabled)
// .stratumMiningEnabled(minerOptionGroup.iStratumMiningEnabled)
// .stratumNetworkInterface(minerOptionGroup.stratumNetworkInterface)
// .stratumPort(minerOptionGroup.stratumPort)
// .stratumExtranonce(unstableMiningOptions.getStratumExtranonce())
// .minBlockOccupancyRatio(minBlockOccupancyRatio)
// .remoteSealersLimit(unstableMiningOptions.getRemoteSealersLimit())
//
// .remoteSealersTimeToLive(unstableMiningOptions.getRemoteSealersTimeToLive())
// .powJobTimeToLive(unstableMiningOptions.getPowJobTimeToLive())
// .maxOmmerDepth(unstableMiningOptions.getMaxOmmersDepth())
//
// .posBlockCreationMaxTime(unstableMiningOptions.getPosBlockCreationMaxTime())
// .posBlockCreationRepetitionMinDuration(
// unstableMiningOptions.getPosBlockCreationRepetitionMinDuration())
// .build())
.miningParameters(miningParameters)
.transactionPoolConfiguration(buildTransactionPoolConfiguration())
.nodeKey(new NodeKey(securityModule()))
Expand Down
7 changes: 0 additions & 7 deletions besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.nio.file.Paths;
import java.util.List;

import org.apache.tuweni.bytes.Bytes;
import picocli.CommandLine;

/** The interface Default command values. */
Expand Down Expand Up @@ -57,12 +56,6 @@ public interface DefaultCommandValues {
String MANDATORY_NETWORK_FORMAT_HELP = "<NETWORK>";
/** The constant MANDATORY_NODE_ID_FORMAT_HELP. */
String MANDATORY_NODE_ID_FORMAT_HELP = "<NODEID>";
/** The constant DEFAULT_MIN_TRANSACTION_GAS_PRICE. */
// Wei DEFAULT_MIN_TRANSACTION_GAS_PRICE = Wei.of(1000);
/** The constant DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO. */
// Double DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO = 0.8;
/** The constant DEFAULT_EXTRA_DATA. */
Bytes DEFAULT_EXTRA_DATA = Bytes.EMPTY;
/** The constant PERMISSIONING_CONFIG_LOCATION. */
String PERMISSIONING_CONFIG_LOCATION = "permissions_config.toml";
/** The constant MANDATORY_HOST_FORMAT_HELP. */
Expand Down
52 changes: 29 additions & 23 deletions besu/src/main/java/org/hyperledger/besu/cli/options/stable/MiningOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.DEFAULT_MAX_OMMERS_DEPTH;
import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POW_JOB_TTL;
import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_LIMIT;
import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_TTL;
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 org.hyperledger.besu.cli.options.CLIOptions;
import org.hyperledger.besu.cli.util.CommandLineUtils;
Expand Down Expand Up @@ -218,8 +218,7 @@ public void validate(
}

if (unstableOptions.posBlockCreationMaxTime <= 0
|| unstableOptions.posBlockCreationMaxTime
> MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME) {
|| unstableOptions.posBlockCreationMaxTime > DEFAULT_POS_BLOCK_CREATION_MAX_TIME) {
throw new ParameterException(
commandLine, "--Xpos-block-creation-max-time must be positive and ≤ 12000");
}
Expand All @@ -242,16 +241,20 @@ static MiningOptions fromConfig(final MiningParameters miningParameters) {
miningParameters.getDynamic().getMinTransactionGasPrice();
miningOptions.minBlockOccupancyRatio =
miningParameters.getDynamic().getMinBlockOccupancyRatio();
miningOptions.unstableOptions.remoteSealersLimit = miningParameters.getRemoteSealersLimit();
miningOptions.unstableOptions.remoteSealersLimit =
miningParameters.getUnstable().getRemoteSealersLimit();
miningOptions.unstableOptions.remoteSealersTimeToLive =
miningParameters.getRemoteSealersTimeToLive();
miningOptions.unstableOptions.powJobTimeToLive = miningParameters.getPowJobTimeToLive();
miningOptions.unstableOptions.maxOmmersDepth = miningParameters.getMaxOmmerDepth();
miningOptions.unstableOptions.stratumExtranonce = miningParameters.getStratumExtranonce();
miningParameters.getUnstable().getRemoteSealersTimeToLive();
miningOptions.unstableOptions.powJobTimeToLive =
miningParameters.getUnstable().getPowJobTimeToLive();
miningOptions.unstableOptions.maxOmmersDepth =
miningParameters.getUnstable().getMaxOmmerDepth();
miningOptions.unstableOptions.stratumExtranonce =
miningParameters.getUnstable().getStratumExtranonce();
miningOptions.unstableOptions.posBlockCreationMaxTime =
miningParameters.getPosBlockCreationMaxTime();
miningParameters.getUnstable().getPosBlockCreationMaxTime();
miningOptions.unstableOptions.posBlockCreationRepetitionMinDuration =
miningParameters.getPosBlockCreationRepetitionMinDuration();
miningParameters.getUnstable().getPosBlockCreationRepetitionMinDuration();

miningParameters.getCoinbase().ifPresent(coinbase -> miningOptions.coinbase = coinbase);
miningParameters
Expand All @@ -269,14 +272,17 @@ public MiningParameters toDomainObject() {
.isStratumMiningEnabled(iStratumMiningEnabled)
.stratumNetworkInterface(stratumNetworkInterface)
.stratumPort(stratumPort)
.remoteSealersLimit(unstableOptions.remoteSealersLimit)
.remoteSealersTimeToLive(unstableOptions.remoteSealersTimeToLive)
.powJobTimeToLive(unstableOptions.powJobTimeToLive)
.maxOmmerDepth(unstableOptions.maxOmmersDepth)
.stratumExtranonce(unstableOptions.stratumExtranonce)
.posBlockCreationMaxTime(unstableOptions.posBlockCreationMaxTime)
.posBlockCreationRepetitionMinDuration(
unstableOptions.posBlockCreationRepetitionMinDuration);
.unstable(
ImmutableMiningParameters.Unstable.builder()
.remoteSealersLimit(unstableOptions.remoteSealersLimit)
.remoteSealersTimeToLive(unstableOptions.remoteSealersTimeToLive)
.powJobTimeToLive(unstableOptions.powJobTimeToLive)
.maxOmmerDepth(unstableOptions.maxOmmersDepth)
.stratumExtranonce(unstableOptions.stratumExtranonce)
.posBlockCreationMaxTime(unstableOptions.posBlockCreationMaxTime)
.posBlockCreationRepetitionMinDuration(
unstableOptions.posBlockCreationRepetitionMinDuration)
.build());

if (coinbase != null) {
miningParametersBuilder.coinbase(coinbase);
Expand Down
Loading

0 comments on commit c511638

Please sign in to comment.