For TimestampSchedule (Shanghai) remove evmBuilder override but leave…

… other mods in Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
hyperledger · Dec 29, 2022 · d152fbf · d152fbf
1 parent e97c134
commit d152fbf
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/...ensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java b/...ensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
@@ -69,16 +69,26 @@ 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(),
             EvmConfiguration.DEFAULT)
         .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<BigInteger> chainId) {