diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java index 78d681de72e..ec2ee95f4df 100644 --- a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java +++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java @@ -69,9 +69,7 @@ public static TimestampSchedule createTimestamp( DEFAULT_CHAIN_ID, ProtocolSpecAdapters.create( config.getShanghaiTime().orElse(0), - (specBuilder) -> - MergeProtocolSchedule.applyMergeSpecificModifications( - specBuilder, config.getChainId())), + MergeProtocolSchedule::applyMergeSpecificModificationsForShanghai), privacyParameters, isRevertReasonEnabled, config.isQuorum(), @@ -79,6 +77,18 @@ public static TimestampSchedule createTimestamp( .createTimestampSchedule(); } + // TODO Withdrawals remove this as part of https://github.com/hyperledger/besu/issues/4788 + private static ProtocolSpecBuilder applyMergeSpecificModificationsForShanghai( + final ProtocolSpecBuilder specBuilder) { + + return specBuilder + .blockProcessorBuilder(MergeBlockProcessor::new) + .blockHeaderValidatorBuilder(MergeProtocolSchedule::getBlockHeaderValidator) + .blockReward(Wei.ZERO) + .difficultyCalculator((a, b, c) -> BigInteger.ZERO) + .skipZeroBlockRewards(true); + } + private static ProtocolSpecBuilder applyMergeSpecificModifications( final ProtocolSpecBuilder specBuilder, final Optional chainId) {