Restore previous behaviour for preMergeBesuControllerBuilder (#7431)

pull/7438/head
Lucas Saldanha 4 months ago committed by GitHub
parent a92fdbb44c
commit 745d353027
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 9
      besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java

@ -18,6 +18,7 @@
### Bug fixes
- Correct entrypoint in Docker evmtool [#7430](https://github.com/hyperledger/besu/pull/7430)
- Fix behaviour when starting in a pre-merge network [#7431](https://github.com/hyperledger/besu/pull/7431)
## 24.7.1

@ -30,6 +30,7 @@ import org.hyperledger.besu.ethereum.ProtocolContext;
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.eth.EthProtocolConfiguration;
@ -129,7 +130,13 @@ public class TransitionBesuControllerBuilder extends BesuControllerBuilder {
transitionProtocolSchedule.getPreMergeSchedule(),
protocolContext,
transactionPool,
MiningParameters.MINING_DISABLED,
ImmutableMiningParameters.builder()
.from(miningParameters)
.mutableInitValues(
ImmutableMiningParameters.MutableInitValues.builder()
.isMiningEnabled(false)
.build())
.build(),
syncState,
ethProtocolManager),
mergeBesuControllerBuilder.createTransitionMiningCoordinator(

Loading…
Cancel
Save