Remove merge block processor as block rewards are already disabled fo…

…r Paris and above in the protocol schedule (hyperledger#5357) Signed-off-by: Jason Frame <jason.frame@consensys.net>
lacchain · Apr 21, 2023 · b137432 · b137432
1 parent 0311016
commit b137432
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 85 deletions.
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeBlockProcessor.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeBlockProcessor.java
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
@@ -70,9 +70,8 @@ public static ProtocolSchedule create(
             MergeProtocolSchedule.applyMergeSpecificModifications(
                 specBuilder, config.getChainId()));
     if (config.getShanghaiTime().isPresent()) {
-      postMergeModifications.put(
-          config.getShanghaiTime().getAsLong(),
-          MergeProtocolSchedule::unapplyMergeModificationsFromShanghaiOnwards);
+      // unapply merge modifications from Shanghai onwards
+      postMergeModifications.put(config.getShanghaiTime().getAsLong(), Function.identity());
     }
 
     return new ProtocolScheduleBuilder(
@@ -93,7 +92,6 @@ private static ProtocolSpecBuilder applyMergeSpecificModifications(
             (gasCalculator, jdCacheConfig) ->
                 MainnetEVMs.paris(
                     gasCalculator, chainId.orElse(BigInteger.ZERO), EvmConfiguration.DEFAULT))
-        .blockProcessorBuilder(MergeBlockProcessor::new)
         .blockHeaderValidatorBuilder(MergeProtocolSchedule::getBlockHeaderValidator)
         .blockReward(Wei.ZERO)
         .difficultyCalculator((a, b, c) -> BigInteger.ZERO)
@@ -102,15 +100,6 @@ private static ProtocolSpecBuilder applyMergeSpecificModifications(
         .name("Paris");
   }
 
-  private static ProtocolSpecBuilder unapplyMergeModificationsFromShanghaiOnwards(
-      final ProtocolSpecBuilder specBuilder) {
-    // TODO Withdrawals Get rid of MergeBlockProcessor
-    // inherits merge config from MainnetProtocolSpecs.parisDefinition
-    // This would be Function.identify() but MergeBlockProcessor can't be used in
-    // MainnetProtocolSpecs due to circular dependency
-    return specBuilder.blockProcessorBuilder(MergeBlockProcessor::new);
-  }
-
   private static BlockHeaderValidator.Builder getBlockHeaderValidator(final FeeMarket feeMarket) {
     return MergeValidationRulesetFactory.mergeBlockHeaderValidator(feeMarket);
   }

diff --git a/...s/merge/src/test/java/org/hyperledger/besu/consensus/merge/MergeProtocolScheduleTest.java b/...s/merge/src/test/java/org/hyperledger/besu/consensus/merge/MergeProtocolScheduleTest.java
@@ -21,6 +21,7 @@
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.evm.operation.InvalidOperation;
@@ -97,7 +98,7 @@ private static void assertProofOfStakeConfigIsEnabled(final ProtocolSpec spec) {
         .isEqualTo(BigInteger.ZERO);
     assertThat(spec.getBlockReward()).isEqualTo(Wei.ZERO);
     assertThat(spec.isSkipZeroBlockRewards()).isTrue();
-    assertThat(spec.getBlockProcessor()).isInstanceOf(MergeBlockProcessor.class);
+    assertThat(spec.getBlockProcessor()).isInstanceOf(MainnetBlockProcessor.class);
   }
 
   private BlockHeader blockHeader(final long number) {