From cab9c7e5b6029609725c9f5f052a697815ddf598 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 14:33:43 +1000 Subject: [PATCH 1/6] Remove PostMergeContext singleton Signed-off-by: Jason Frame --- .../MergeBesuControllerBuilder.java | 7 +++- .../TransitionBesuControllerBuilder.java | 5 ++- .../besu/ForkIdsNetworkConfigTest.java | 5 ++- .../consensus/merge/PostMergeContext.java | 2 +- .../merge/TransitionProtocolSchedule.java | 40 ------------------- .../blockcreation/TransitionCoordinator.java | 7 +++- .../merge/blockcreation/MergeReorgTest.java | 2 +- 7 files changed, 19 insertions(+), 49 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java index 2352f9d3965..352708f02fb 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java @@ -198,7 +198,7 @@ protected MergeContext createConsensusContext( && blockchain.getGenesisBlockHeader().getDifficulty().isZero(); final MergeContext mergeContext = - PostMergeContext.get() + new PostMergeContext() .setSyncState(syncState.get()) .setTerminalTotalDifficulty( genesisConfigOptions @@ -261,7 +261,10 @@ protected List createPeerValidators( @Override public BesuController build() { final BesuController controller = super.build(); - PostMergeContext.get().setSyncState(controller.getSyncState()); + controller + .getProtocolContext() + .getConsensusContext(MergeContext.class) + .setSyncState(syncState.get()); return controller; } } diff --git a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java index 9d37f594e8a..f1e12c3def9 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java @@ -125,6 +125,8 @@ protected MiningCoordinator createMiningCoordinator( syncState, storageProvider); + final PostMergeContext postMergeContext = + protocolContext.getConsensusContext(PostMergeContext.class); final TransitionCoordinator composedCoordinator = new TransitionCoordinator( preMergeBesuControllerBuilder.createMiningCoordinator( @@ -147,7 +149,8 @@ protected MiningCoordinator createMiningCoordinator( transitionMiningConfiguration, syncState, transitionBackwardsSyncContext, - ethProtocolManager.ethContext().getScheduler())); + ethProtocolManager.ethContext().getScheduler()), + postMergeContext); initTransitionWatcher(protocolContext, composedCoordinator); return composedCoordinator; } diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 86ba6881220..13c7395ab45 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -54,6 +54,7 @@ @ExtendWith(MockitoExtension.class) public class ForkIdsNetworkConfigTest { + private static final PostMergeContext postMergeContext = new PostMergeContext(); public static Collection parameters() { return List.of( @@ -203,10 +204,10 @@ public static class MilestoneStreamingTransitionProtocolSchedule public MilestoneStreamingTransitionProtocolSchedule( final MilestoneStreamingProtocolSchedule preMergeProtocolSchedule, final MilestoneStreamingProtocolSchedule postMergeProtocolSchedule) { - super(preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get()); + super(preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); transitionUtils = new TransitionUtils<>( - preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get()); + preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); } public Stream streamMilestoneBlocks() { diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java index 1d7e4b76c62..838893b19be 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java @@ -63,7 +63,7 @@ public class PostMergeContext implements MergeContext { /** Instantiates a new Post merge context. */ @VisibleForTesting - PostMergeContext() { + public PostMergeContext() { this(Difficulty.ZERO); } diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java index 44fd5f8edfc..78b3e5f353d 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java @@ -14,21 +14,16 @@ */ package org.hyperledger.besu.consensus.merge; -import org.hyperledger.besu.config.GenesisConfigOptions; import org.hyperledger.besu.datatypes.HardforkId; import org.hyperledger.besu.ethereum.ProtocolContext; -import org.hyperledger.besu.ethereum.chain.BadBlockManager; import org.hyperledger.besu.ethereum.core.BlockHeader; import org.hyperledger.besu.ethereum.core.Difficulty; -import org.hyperledger.besu.ethereum.core.MiningConfiguration; import org.hyperledger.besu.ethereum.core.PermissionTransactionFilter; import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader; -import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec; import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec; import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive; -import org.hyperledger.besu.plugin.services.MetricsSystem; import java.math.BigInteger; import java.util.Optional; @@ -60,41 +55,6 @@ public TransitionProtocolSchedule( new TransitionUtils<>(preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext); } - /** - * Create a Proof-of-Stake protocol schedule from a config object - * - * @param genesisConfigOptions {@link GenesisConfigOptions} containing the config options for the - * milestone starting points - * @param miningConfiguration the mining parameters - * @param badBlockManager the cache to use to keep invalid blocks - * @param isParallelTxProcessingEnabled indicates whether parallel transaction is enabled. - * @return an initialised TransitionProtocolSchedule using post-merge defaults - */ - public static TransitionProtocolSchedule fromConfig( - final GenesisConfigOptions genesisConfigOptions, - final MiningConfiguration miningConfiguration, - final BadBlockManager badBlockManager, - final boolean isParallelTxProcessingEnabled, - final MetricsSystem metricsSystem) { - ProtocolSchedule preMergeProtocolSchedule = - MainnetProtocolSchedule.fromConfig( - genesisConfigOptions, - miningConfiguration, - badBlockManager, - isParallelTxProcessingEnabled, - metricsSystem); - ProtocolSchedule postMergeProtocolSchedule = - MergeProtocolSchedule.create( - genesisConfigOptions, - false, - miningConfiguration, - badBlockManager, - isParallelTxProcessingEnabled, - metricsSystem); - return new TransitionProtocolSchedule( - preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get()); - } - /** * Gets pre merge schedule. * diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java index 681c6f334bc..a7d42643513 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java @@ -47,10 +47,13 @@ public class TransitionCoordinator extends TransitionUtils * * @param miningCoordinator the mining coordinator * @param mergeCoordinator the merge coordinator + * @param postMergeContext the post merge context */ public TransitionCoordinator( - final MiningCoordinator miningCoordinator, final MiningCoordinator mergeCoordinator) { - super(miningCoordinator, mergeCoordinator, PostMergeContext.get()); + final MiningCoordinator miningCoordinator, + final MiningCoordinator mergeCoordinator, + final PostMergeContext postMergeContext) { + super(miningCoordinator, mergeCoordinator, postMergeContext); this.miningCoordinator = miningCoordinator; this.mergeCoordinator = (MergeMiningCoordinator) mergeCoordinator; } diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java index 250ba94348c..0feb2077e6c 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java @@ -67,7 +67,7 @@ public class MergeReorgTest implements MergeGenesisConfigHelper { private MergeCoordinator coordinator; - private final MergeContext mergeContext = PostMergeContext.get(); + private final MergeContext mergeContext = new PostMergeContext(); private final ProtocolSchedule mockProtocolSchedule = getMergeProtocolSchedule(); private final GenesisState genesisState = GenesisState.fromConfig(getPowGenesisConfig(), mockProtocolSchedule); From 7b66f21461f4fd565964873420a91a3c2aa0259f Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 15:14:38 +1000 Subject: [PATCH 2/6] Remove PostMergeContext singleton from TransitionBesuControllerBuilder Signed-off-by: Jason Frame --- .../TransitionBesuControllerBuilder.java | 11 ++++++++--- .../hyperledger/besu/ForkIdsNetworkConfigTest.java | 4 ++-- .../besu/consensus/merge/PostMergeContext.java | 14 -------------- .../merge/TransitionProtocolSchedule.java | 13 +++++++------ .../besu/consensus/merge/TransitionUtils.java | 9 +++++---- .../merge/blockcreation/TransitionCoordinator.java | 5 +++-- .../merge/TransitionProtocolScheduleTest.java | 2 +- 7 files changed, 26 insertions(+), 32 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java index f1e12c3def9..2e1f3599cdf 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java @@ -76,6 +76,7 @@ public class TransitionBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LoggerFactory.getLogger(TransitionBesuControllerBuilder.class); private TransitionProtocolSchedule transitionProtocolSchedule; + private ProtocolContext protocolContext; /** * Instantiates a new Transition besu controller builder. @@ -150,7 +151,7 @@ protected MiningCoordinator createMiningCoordinator( syncState, transitionBackwardsSyncContext, ethProtocolManager.ethContext().getScheduler()), - postMergeContext); + () -> postMergeContext); initTransitionWatcher(protocolContext, composedCoordinator); return composedCoordinator; } @@ -188,7 +189,7 @@ protected ProtocolSchedule createProtocolSchedule() { new TransitionProtocolSchedule( preMergeBesuControllerBuilder.createProtocolSchedule(), mergeBesuControllerBuilder.createProtocolSchedule(), - PostMergeContext.get()); + () -> protocolContext.getConsensusContext(MergeContext.class)); return transitionProtocolSchedule; } @@ -200,6 +201,7 @@ protected ProtocolContext createProtocolContext( final ProtocolContext protocolContext = super.createProtocolContext(blockchain, worldStateArchive, consensusContext); transitionProtocolSchedule.setProtocolContext(protocolContext); + this.protocolContext = protocolContext; return protocolContext; } @@ -293,7 +295,10 @@ public BesuControllerBuilder storageProvider(final StorageProvider storageProvid @Override public BesuController build() { final BesuController controller = super.build(); - PostMergeContext.get().setSyncState(controller.getSyncState()); + controller + .getProtocolContext() + .getConsensusContext(PostMergeContext.class) + .setSyncState(controller.getSyncState()); return controller; } diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index 13c7395ab45..ea382d1771c 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -204,10 +204,10 @@ public static class MilestoneStreamingTransitionProtocolSchedule public MilestoneStreamingTransitionProtocolSchedule( final MilestoneStreamingProtocolSchedule preMergeProtocolSchedule, final MilestoneStreamingProtocolSchedule postMergeProtocolSchedule) { - super(preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); + super(preMergeProtocolSchedule, postMergeProtocolSchedule, () -> postMergeContext); transitionUtils = new TransitionUtils<>( - preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); + preMergeProtocolSchedule, postMergeProtocolSchedule, () -> postMergeContext); } public Stream streamMilestoneBlocks() { diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java index 838893b19be..f3cb14f2ce7 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java @@ -40,7 +40,6 @@ public class PostMergeContext implements MergeContext { /** The Max blocks in progress. */ static final int MAX_BLOCKS_IN_PROGRESS = 12; - private static final AtomicReference singleton = new AtomicReference<>(); private final AtomicReference syncState; private final AtomicReference terminalTotalDifficulty; // initial postMerge state is indeterminate until it is set: @@ -72,24 +71,11 @@ public PostMergeContext() { * * @param difficulty the difficulty */ - @VisibleForTesting PostMergeContext(final Difficulty difficulty) { this.terminalTotalDifficulty = new AtomicReference<>(difficulty); this.syncState = new AtomicReference<>(); } - /** - * Get post merge context. - * - * @return the post merge context - */ - public static PostMergeContext get() { - if (singleton.get() == null) { - singleton.compareAndSet(null, new PostMergeContext()); - } - return singleton.get(); - } - @Override public C as(final Class klass) { return klass.cast(this); diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java index 78b3e5f353d..549b1be3762 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java @@ -28,6 +28,7 @@ import java.math.BigInteger; import java.util.Optional; import java.util.function.Predicate; +import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,7 @@ public class TransitionProtocolSchedule implements ProtocolSchedule { private final TransitionUtils transitionUtils; private static final Logger LOG = LoggerFactory.getLogger(TransitionProtocolSchedule.class); - private final MergeContext mergeContext; + private final Supplier mergeContext; private ProtocolContext protocolContext; /** @@ -49,7 +50,7 @@ public class TransitionProtocolSchedule implements ProtocolSchedule { public TransitionProtocolSchedule( final ProtocolSchedule preMergeProtocolSchedule, final ProtocolSchedule postMergeProtocolSchedule, - final MergeContext mergeContext) { + final Supplier mergeContext) { this.mergeContext = mergeContext; transitionUtils = new TransitionUtils<>(preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext); @@ -94,10 +95,10 @@ public ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader) { public ProtocolSpec getByBlockHeaderWithTransitionReorgHandling( final ProcessableBlockHeader blockHeader) { // if we do not have a finalized block we might return pre or post merge protocol schedule: - if (mergeContext.getFinalized().isEmpty()) { + if (mergeContext.get().getFinalized().isEmpty()) { // if head is not post-merge, return pre-merge schedule: - if (!mergeContext.isPostMerge()) { + if (!mergeContext.get().isPostMerge()) { LOG.atDebug() .setMessage("for {} returning a pre-merge schedule because we are not post-merge") .addArgument(blockHeader::toLogString) @@ -112,7 +113,7 @@ public ProtocolSpec getByBlockHeaderWithTransitionReorgHandling( .getTotalDifficultyByHash(blockHeader.getParentHash()) .orElse(Difficulty.ZERO); Difficulty thisDifficulty = parentDifficulty.add(blockHeader.getDifficulty()); - Difficulty terminalDifficulty = mergeContext.getTerminalTotalDifficulty(); + Difficulty terminalDifficulty = mergeContext.get().getTerminalTotalDifficulty(); LOG.atDebug() .setMessage(" block {} ttd is: {}, parent total diff is: {}, this total diff is: {}") .addArgument(blockHeader::toLogString) @@ -204,7 +205,7 @@ public String listMilestones() { @Override public Optional milestoneFor(final HardforkId hardforkId) { - return mergeContext.isPostMerge() + return mergeContext.get().isPostMerge() ? transitionUtils.getPostMergeObject().milestoneFor(hardforkId) : transitionUtils.getPreMergeObject().milestoneFor(hardforkId); } diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java index 6c8e3613b03..ad0dd962de8 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java @@ -21,6 +21,7 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; +import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,7 @@ public class TransitionUtils { private static final Logger LOG = LoggerFactory.getLogger(TransitionUtils.class); /** The Merge context. */ - protected final MergeContext mergeContext; + protected final Supplier mergeContext; private final SwitchingObject preMergeObject; private final SwitchingObject postMergeObject; @@ -49,7 +50,7 @@ public class TransitionUtils { public TransitionUtils( final SwitchingObject preMergeObject, final SwitchingObject postMergeObject, - final MergeContext mergeContext) { + final Supplier mergeContext) { this.preMergeObject = preMergeObject; this.postMergeObject = postMergeObject; this.mergeContext = mergeContext; @@ -61,7 +62,7 @@ public TransitionUtils( * @param consumer the consumer */ void dispatchConsumerAccordingToMergeState(final Consumer consumer) { - consumer.accept(mergeContext.isPostMerge() ? postMergeObject : preMergeObject); + consumer.accept(mergeContext.get().isPostMerge() ? postMergeObject : preMergeObject); } /** @@ -72,7 +73,7 @@ void dispatchConsumerAccordingToMergeState(final Consumer consu * @return the t */ public T dispatchFunctionAccordingToMergeState(final Function function) { - return function.apply(mergeContext.isPostMerge() ? postMergeObject : preMergeObject); + return function.apply(mergeContext.get().isPostMerge() ? postMergeObject : preMergeObject); } /** diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java index a7d42643513..19960d78c27 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java @@ -14,7 +14,7 @@ */ package org.hyperledger.besu.consensus.merge.blockcreation; -import org.hyperledger.besu.consensus.merge.PostMergeContext; +import org.hyperledger.besu.consensus.merge.MergeContext; import org.hyperledger.besu.consensus.merge.TransitionUtils; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; @@ -32,6 +32,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; import org.apache.tuweni.bytes.Bytes32; @@ -52,7 +53,7 @@ public class TransitionCoordinator extends TransitionUtils public TransitionCoordinator( final MiningCoordinator miningCoordinator, final MiningCoordinator mergeCoordinator, - final PostMergeContext postMergeContext) { + final Supplier postMergeContext) { super(miningCoordinator, mergeCoordinator, postMergeContext); this.miningCoordinator = miningCoordinator; this.mergeCoordinator = (MergeMiningCoordinator) mergeCoordinator; diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java index 52a183e9f6a..b4217772617 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java @@ -54,7 +54,7 @@ public void setUp() { transitionProtocolSchedule = new TransitionProtocolSchedule( - preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext); + preMergeProtocolSchedule, postMergeProtocolSchedule, () -> mergeContext); transitionProtocolSchedule.setProtocolContext(protocolContext); } From 70c3e64fe655b3be38530cadb563656297ea46b2 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 15:51:48 +1000 Subject: [PATCH 3/6] create PostMergeContext early in field of MergeBesuControllerBuilder and expose method to access the PostMergeContext Signed-off-by: Jason Frame --- .../controller/MergeBesuControllerBuilder.java | 7 ++++++- .../TransitionBesuControllerBuilder.java | 15 ++++----------- .../besu/ForkIdsNetworkConfigTest.java | 4 ++-- .../TransitionControllerBuilderTest.java | 2 -- .../merge/TransitionProtocolSchedule.java | 13 ++++++------- .../besu/consensus/merge/TransitionUtils.java | 9 ++++----- .../blockcreation/TransitionCoordinator.java | 5 ++--- .../merge/TransitionProtocolScheduleTest.java | 2 +- 8 files changed, 25 insertions(+), 32 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java index 352708f02fb..61a125ce01e 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java @@ -59,6 +59,7 @@ public class MergeBesuControllerBuilder extends BesuControllerBuilder { private final AtomicReference syncState = new AtomicReference<>(); private static final Logger LOG = LoggerFactory.getLogger(MergeBesuControllerBuilder.class); + private final PostMergeContext postMergeContext = new PostMergeContext(); /** Default constructor. */ public MergeBesuControllerBuilder() {} @@ -198,7 +199,7 @@ protected MergeContext createConsensusContext( && blockchain.getGenesisBlockHeader().getDifficulty().isZero(); final MergeContext mergeContext = - new PostMergeContext() + postMergeContext .setSyncState(syncState.get()) .setTerminalTotalDifficulty( genesisConfigOptions @@ -267,4 +268,8 @@ public BesuController build() { .setSyncState(syncState.get()); return controller; } + + public PostMergeContext getPostMergeContext() { + return postMergeContext; + } } diff --git a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java index 2e1f3599cdf..de5eb638e37 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java @@ -76,7 +76,6 @@ public class TransitionBesuControllerBuilder extends BesuControllerBuilder { private static final Logger LOG = LoggerFactory.getLogger(TransitionBesuControllerBuilder.class); private TransitionProtocolSchedule transitionProtocolSchedule; - private ProtocolContext protocolContext; /** * Instantiates a new Transition besu controller builder. @@ -126,8 +125,6 @@ protected MiningCoordinator createMiningCoordinator( syncState, storageProvider); - final PostMergeContext postMergeContext = - protocolContext.getConsensusContext(PostMergeContext.class); final TransitionCoordinator composedCoordinator = new TransitionCoordinator( preMergeBesuControllerBuilder.createMiningCoordinator( @@ -151,7 +148,7 @@ protected MiningCoordinator createMiningCoordinator( syncState, transitionBackwardsSyncContext, ethProtocolManager.ethContext().getScheduler()), - () -> postMergeContext); + mergeBesuControllerBuilder.getPostMergeContext()); initTransitionWatcher(protocolContext, composedCoordinator); return composedCoordinator; } @@ -189,7 +186,7 @@ protected ProtocolSchedule createProtocolSchedule() { new TransitionProtocolSchedule( preMergeBesuControllerBuilder.createProtocolSchedule(), mergeBesuControllerBuilder.createProtocolSchedule(), - () -> protocolContext.getConsensusContext(MergeContext.class)); + mergeBesuControllerBuilder.getPostMergeContext()); return transitionProtocolSchedule; } @@ -201,7 +198,6 @@ protected ProtocolContext createProtocolContext( final ProtocolContext protocolContext = super.createProtocolContext(blockchain, worldStateArchive, consensusContext); transitionProtocolSchedule.setProtocolContext(protocolContext); - this.protocolContext = protocolContext; return protocolContext; } @@ -260,7 +256,7 @@ protected DefaultSynchronizer createSynchronizer( private void initTransitionWatcher( final ProtocolContext protocolContext, final TransitionCoordinator composedCoordinator) { - PostMergeContext postMergeContext = protocolContext.getConsensusContext(PostMergeContext.class); + PostMergeContext postMergeContext = mergeBesuControllerBuilder.getPostMergeContext(); postMergeContext.observeNewIsPostMergeState( (isPoS, priorState, difficultyStoppedAt) -> { if (isPoS) { @@ -295,10 +291,7 @@ public BesuControllerBuilder storageProvider(final StorageProvider storageProvid @Override public BesuController build() { final BesuController controller = super.build(); - controller - .getProtocolContext() - .getConsensusContext(PostMergeContext.class) - .setSyncState(controller.getSyncState()); + mergeBesuControllerBuilder.getPostMergeContext().setSyncState(controller.getSyncState()); return controller; } diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java index ea382d1771c..13c7395ab45 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java @@ -204,10 +204,10 @@ public static class MilestoneStreamingTransitionProtocolSchedule public MilestoneStreamingTransitionProtocolSchedule( final MilestoneStreamingProtocolSchedule preMergeProtocolSchedule, final MilestoneStreamingProtocolSchedule postMergeProtocolSchedule) { - super(preMergeProtocolSchedule, postMergeProtocolSchedule, () -> postMergeContext); + super(preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); transitionUtils = new TransitionUtils<>( - preMergeProtocolSchedule, postMergeProtocolSchedule, () -> postMergeContext); + preMergeProtocolSchedule, postMergeProtocolSchedule, postMergeContext); } public Stream streamMilestoneBlocks() { diff --git a/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java index dc8eee16eb5..ecd8d17dbcc 100644 --- a/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java +++ b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java @@ -40,7 +40,6 @@ import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider; import org.hyperledger.besu.ethereum.core.MiningConfiguration; import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; -import org.hyperledger.besu.ethereum.eth.manager.peertask.PeerTaskExecutor; import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; @@ -74,7 +73,6 @@ public class TransitionControllerBuilderTest { @Mock ProtocolContext protocolContext; @Mock MutableBlockchain mockBlockchain; @Mock TransactionPool transactionPool; - @Mock PeerTaskExecutor peerTaskExecutor; @Mock SyncState syncState; @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java index 549b1be3762..78b3e5f353d 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java @@ -28,7 +28,6 @@ import java.math.BigInteger; import java.util.Optional; import java.util.function.Predicate; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +36,7 @@ public class TransitionProtocolSchedule implements ProtocolSchedule { private final TransitionUtils transitionUtils; private static final Logger LOG = LoggerFactory.getLogger(TransitionProtocolSchedule.class); - private final Supplier mergeContext; + private final MergeContext mergeContext; private ProtocolContext protocolContext; /** @@ -50,7 +49,7 @@ public class TransitionProtocolSchedule implements ProtocolSchedule { public TransitionProtocolSchedule( final ProtocolSchedule preMergeProtocolSchedule, final ProtocolSchedule postMergeProtocolSchedule, - final Supplier mergeContext) { + final MergeContext mergeContext) { this.mergeContext = mergeContext; transitionUtils = new TransitionUtils<>(preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext); @@ -95,10 +94,10 @@ public ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader) { public ProtocolSpec getByBlockHeaderWithTransitionReorgHandling( final ProcessableBlockHeader blockHeader) { // if we do not have a finalized block we might return pre or post merge protocol schedule: - if (mergeContext.get().getFinalized().isEmpty()) { + if (mergeContext.getFinalized().isEmpty()) { // if head is not post-merge, return pre-merge schedule: - if (!mergeContext.get().isPostMerge()) { + if (!mergeContext.isPostMerge()) { LOG.atDebug() .setMessage("for {} returning a pre-merge schedule because we are not post-merge") .addArgument(blockHeader::toLogString) @@ -113,7 +112,7 @@ public ProtocolSpec getByBlockHeaderWithTransitionReorgHandling( .getTotalDifficultyByHash(blockHeader.getParentHash()) .orElse(Difficulty.ZERO); Difficulty thisDifficulty = parentDifficulty.add(blockHeader.getDifficulty()); - Difficulty terminalDifficulty = mergeContext.get().getTerminalTotalDifficulty(); + Difficulty terminalDifficulty = mergeContext.getTerminalTotalDifficulty(); LOG.atDebug() .setMessage(" block {} ttd is: {}, parent total diff is: {}, this total diff is: {}") .addArgument(blockHeader::toLogString) @@ -205,7 +204,7 @@ public String listMilestones() { @Override public Optional milestoneFor(final HardforkId hardforkId) { - return mergeContext.get().isPostMerge() + return mergeContext.isPostMerge() ? transitionUtils.getPostMergeObject().milestoneFor(hardforkId) : transitionUtils.getPreMergeObject().milestoneFor(hardforkId); } diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java index ad0dd962de8..6c8e3613b03 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java @@ -21,7 +21,6 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +34,7 @@ public class TransitionUtils { private static final Logger LOG = LoggerFactory.getLogger(TransitionUtils.class); /** The Merge context. */ - protected final Supplier mergeContext; + protected final MergeContext mergeContext; private final SwitchingObject preMergeObject; private final SwitchingObject postMergeObject; @@ -50,7 +49,7 @@ public class TransitionUtils { public TransitionUtils( final SwitchingObject preMergeObject, final SwitchingObject postMergeObject, - final Supplier mergeContext) { + final MergeContext mergeContext) { this.preMergeObject = preMergeObject; this.postMergeObject = postMergeObject; this.mergeContext = mergeContext; @@ -62,7 +61,7 @@ public TransitionUtils( * @param consumer the consumer */ void dispatchConsumerAccordingToMergeState(final Consumer consumer) { - consumer.accept(mergeContext.get().isPostMerge() ? postMergeObject : preMergeObject); + consumer.accept(mergeContext.isPostMerge() ? postMergeObject : preMergeObject); } /** @@ -73,7 +72,7 @@ void dispatchConsumerAccordingToMergeState(final Consumer consu * @return the t */ public T dispatchFunctionAccordingToMergeState(final Function function) { - return function.apply(mergeContext.get().isPostMerge() ? postMergeObject : preMergeObject); + return function.apply(mergeContext.isPostMerge() ? postMergeObject : preMergeObject); } /** diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java index 19960d78c27..a7d42643513 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java @@ -14,7 +14,7 @@ */ package org.hyperledger.besu.consensus.merge.blockcreation; -import org.hyperledger.besu.consensus.merge.MergeContext; +import org.hyperledger.besu.consensus.merge.PostMergeContext; import org.hyperledger.besu.consensus.merge.TransitionUtils; import org.hyperledger.besu.datatypes.Address; import org.hyperledger.besu.datatypes.Hash; @@ -32,7 +32,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; import org.apache.tuweni.bytes.Bytes32; @@ -53,7 +52,7 @@ public class TransitionCoordinator extends TransitionUtils public TransitionCoordinator( final MiningCoordinator miningCoordinator, final MiningCoordinator mergeCoordinator, - final Supplier postMergeContext) { + final PostMergeContext postMergeContext) { super(miningCoordinator, mergeCoordinator, postMergeContext); this.miningCoordinator = miningCoordinator; this.mergeCoordinator = (MergeMiningCoordinator) mergeCoordinator; diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java index b4217772617..52a183e9f6a 100644 --- a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java +++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java @@ -54,7 +54,7 @@ public void setUp() { transitionProtocolSchedule = new TransitionProtocolSchedule( - preMergeProtocolSchedule, postMergeProtocolSchedule, () -> mergeContext); + preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext); transitionProtocolSchedule.setProtocolContext(protocolContext); } From b8fec68c093f2e1ce786b81580087ba9bb16375f Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 16:14:28 +1000 Subject: [PATCH 4/6] minor changes to PostMergeContext Signed-off-by: Jason Frame --- .../hyperledger/besu/consensus/merge/PostMergeContext.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java index f3cb14f2ce7..b080cb64a58 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java @@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.EvictingQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,7 +60,6 @@ public class PostMergeContext implements MergeContext { private boolean isPostMergeAtGenesis; /** Instantiates a new Post merge context. */ - @VisibleForTesting public PostMergeContext() { this(Difficulty.ZERO); } @@ -71,7 +69,7 @@ public PostMergeContext() { * * @param difficulty the difficulty */ - PostMergeContext(final Difficulty difficulty) { + private PostMergeContext(final Difficulty difficulty) { this.terminalTotalDifficulty = new AtomicReference<>(difficulty); this.syncState = new AtomicReference<>(); } From ff0e327c725cdc6441f47c3e62d5fdbdc724ed5b Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 16:31:28 +1000 Subject: [PATCH 5/6] javadoc Signed-off-by: Jason Frame --- .../besu/controller/MergeBesuControllerBuilder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java index 61a125ce01e..d38bdca64e2 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java @@ -269,6 +269,11 @@ public BesuController build() { return controller; } + /** + * Gets post merge context. + * + * @return the post merge context + */ public PostMergeContext getPostMergeContext() { return postMergeContext; } From 59a2c7af00e4ef45c225d0546630cdb5cbfbf2a4 Mon Sep 17 00:00:00 2001 From: Jason Frame Date: Wed, 5 Feb 2025 16:58:06 +1000 Subject: [PATCH 6/6] minor cleanup Signed-off-by: Jason Frame --- .../besu/controller/MergeBesuControllerBuilder.java | 5 +---- .../besu/controller/TransitionControllerBuilderTest.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java index d38bdca64e2..cf99308f3ae 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java @@ -262,10 +262,7 @@ protected List createPeerValidators( @Override public BesuController build() { final BesuController controller = super.build(); - controller - .getProtocolContext() - .getConsensusContext(MergeContext.class) - .setSyncState(syncState.get()); + postMergeContext.setSyncState(syncState.get()); return controller; } diff --git a/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java index ecd8d17dbcc..dc8eee16eb5 100644 --- a/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java +++ b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java @@ -40,6 +40,7 @@ import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider; import org.hyperledger.besu.ethereum.core.MiningConfiguration; import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; +import org.hyperledger.besu.ethereum.eth.manager.peertask.PeerTaskExecutor; import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator; @@ -73,6 +74,7 @@ public class TransitionControllerBuilderTest { @Mock ProtocolContext protocolContext; @Mock MutableBlockchain mockBlockchain; @Mock TransactionPool transactionPool; + @Mock PeerTaskExecutor peerTaskExecutor; @Mock SyncState syncState; @Mock(answer = Answers.RETURNS_DEEP_STUBS)