Skip to content

Commit

Permalink
changes MergeCoordinator fields to protected to allow extension; (hyp…
Browse files Browse the repository at this point in the history
…erledger#4287)

Signed-off-by: Pedro Novais <jpvnovais@gmail.com>

Co-authored-by: Antony Denyer <git@antonydenyer.co.uk>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
  • Loading branch information
3 people authored and eum602 committed Nov 3, 2023
1 parent e87fa2c commit 7a0a64e
Showing 1 changed file with 11 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,16 @@
public class MergeCoordinator implements MergeMiningCoordinator, BadChainListener {
private static final Logger LOG = LoggerFactory.getLogger(MergeCoordinator.class);

final AtomicLong targetGasLimit;
final MiningParameters miningParameters;
final MergeBlockCreatorFactory mergeBlockCreator;
final AtomicReference<Bytes> extraData = new AtomicReference<>(Bytes.fromHexString("0x"));
final AtomicReference<BlockHeader> latestDescendsFromTerminal = new AtomicReference<>();
private final MergeContext mergeContext;
private final ProtocolContext protocolContext;
private final BackwardSyncContext backwardSyncContext;
private final ProtocolSchedule protocolSchedule;
protected final AtomicLong targetGasLimit;
protected final MiningParameters miningParameters;
protected final MergeBlockCreatorFactory mergeBlockCreator;
protected final AtomicReference<Bytes> extraData =
new AtomicReference<>(Bytes.fromHexString("0x"));
protected final AtomicReference<BlockHeader> latestDescendsFromTerminal = new AtomicReference<>();
protected final MergeContext mergeContext;
protected final ProtocolContext protocolContext;
protected final BackwardSyncContext backwardSyncContext;
protected final ProtocolSchedule protocolSchedule;

public MergeCoordinator(
final ProtocolContext protocolContext,
Expand Down Expand Up @@ -594,7 +595,7 @@ public void onBadChain(
}

@FunctionalInterface
interface MergeBlockCreatorFactory {
protected interface MergeBlockCreatorFactory {
MergeBlockCreator forParams(BlockHeader header, Optional<Address> feeRecipient);
}

Expand Down

0 comments on commit 7a0a64e

Please sign in to comment.