Forkid timestamp

besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java

@@ -498,7 +498,8 @@ public Runner build() {
                 .storageProvider(storageProvider)
                 .p2pTLSConfiguration(p2pTLSConfiguration)
                 .blockchain(context.getBlockchain())
-                .forks(besuController.getGenesisConfigOptions().getForks())
+                .blockNumberForks(besuController.getGenesisConfigOptions().getForkBlockNumbers())
+                .timestampForks(besuController.getGenesisConfigOptions().getForkTimestamps())
                 .build();
 
     final NetworkRunner networkRunner =

besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java

@@ -609,7 +609,8 @@ protected EthProtocolManager createEthProtocolManager(
         mergePeerFilter,
         synchronizerConfiguration,
         scheduler,
-        genesisConfig.getForks());
+        genesisConfig.getForkBlockNumbers(),
+        genesisConfig.getForkTimestamps());
   }
 
   protected ProtocolContext createProtocolContext(

besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java

@@ -43,6 +43,7 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.TimestampSchedule;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
@@ -233,4 +234,9 @@ protected List<PeerValidator> createPeerValidators(final ProtocolSchedule protoc
     }
     return retval;
   }
+
+  public TimestampSchedule createTimestampProtocolSchedule() {
+    return MergeProtocolSchedule.createTimestamp(
+        configOptionsSupplier.get(), privacyParameters, isRevertReasonEnabled);
+  }
 }

besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java

@@ -26,10 +26,12 @@
 import org.hyperledger.besu.crypto.NodeKey;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ConsensusContextFactory;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -75,6 +77,7 @@ public class TransitionBesuControllerBuilder extends BesuControllerBuilder {
   private final MergeBesuControllerBuilder mergeBesuControllerBuilder;
 
   private static final Logger LOG = LoggerFactory.getLogger(TransitionBesuControllerBuilder.class);
+  private TransitionProtocolSchedule transitionProtocolSchedule;
 
   public TransitionBesuControllerBuilder(
       final BesuControllerBuilder preMergeBesuControllerBuilder,
@@ -165,9 +168,26 @@ protected EthProtocolManager createEthProtocolManager(
 
   @Override
   protected ProtocolSchedule createProtocolSchedule() {
-    return new TransitionProtocolSchedule(
-        preMergeBesuControllerBuilder.createProtocolSchedule(),
-        mergeBesuControllerBuilder.createProtocolSchedule());
+    transitionProtocolSchedule =
+        new TransitionProtocolSchedule(
+            preMergeBesuControllerBuilder.createProtocolSchedule(),
+            mergeBesuControllerBuilder.createProtocolSchedule(),
+            PostMergeContext.get(),
+            mergeBesuControllerBuilder.createTimestampProtocolSchedule());
+    return transitionProtocolSchedule;
+  }
+
+  @Override
+  protected ProtocolContext createProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule,
+      final ConsensusContextFactory consensusContextFactory) {
+    final ProtocolContext protocolContext =
+        super.createProtocolContext(
+            blockchain, worldStateArchive, protocolSchedule, consensusContextFactory);
+    transitionProtocolSchedule.setProtocolContext(protocolContext);
+    return protocolContext;
   }
 
   @Override

besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java → besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

@@ -26,10 +26,10 @@
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.MutableProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
@@ -47,7 +47,7 @@
 import org.junit.runners.Parameterized;
 
 @RunWith(Enclosed.class)
-public class ForkIdsTest {
+public class ForkIdsNetworkConfigTest {
 
   public static class NotParameterized {
     @Test
@@ -192,19 +192,23 @@ public void testForkId() {
           MainnetProtocolSchedule.fromConfig(configOptions, EvmConfiguration.DEFAULT);
       final GenesisState genesisState = GenesisState.fromConfig(genesisConfigFile, schedule);
       final Blockchain mockBlockchain = mock(Blockchain.class);
+      final BlockHeader mockBlockHeader = mock(BlockHeader.class);
 
       when(mockBlockchain.getGenesisBlock()).thenReturn(genesisState.getBlock());
 
       final AtomicLong blockNumber = new AtomicLong();
-      when(mockBlockchain.getChainHeadBlockNumber()).thenAnswer(o -> blockNumber.get());
+      when(mockBlockchain.getChainHeadHeader()).thenReturn(mockBlockHeader);
+      when(mockBlockHeader.getNumber()).thenAnswer(o -> blockNumber.get());
 
       final ForkIdManager forkIdManager =
-          new ForkIdManager(mockBlockchain, genesisConfigFile.getForks(), false);
+          new ForkIdManager(
+              mockBlockchain,
+              genesisConfigFile.getForkBlockNumbers(),
+              genesisConfigFile.getForkTimestamps(),
+              false);
 
       final var actualForkIds =
-          Streams.concat(
-                  ((MutableProtocolSchedule) schedule).streamMilestoneBlocks(),
-                  Stream.of(Long.MAX_VALUE))
+          Streams.concat(schedule.streamMilestoneBlocks(), Stream.of(Long.MAX_VALUE))
               .map(
                   block -> {
                     blockNumber.set(block);

besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java

@@ -136,7 +136,8 @@ public void setup() {
     when(besuController.getMiningCoordinator()).thenReturn(mock(MiningCoordinator.class));
     when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
     final GenesisConfigOptions genesisConfigOptions = mock(GenesisConfigOptions.class);
-    when(genesisConfigOptions.getForks()).thenReturn(Collections.emptyList());
+    when(genesisConfigOptions.getForkBlockNumbers()).thenReturn(Collections.emptyList());
+    when(genesisConfigOptions.getForkTimestamps()).thenReturn(Collections.emptyList());
     when(besuController.getGenesisConfigOptions()).thenReturn(genesisConfigOptions);
   }
 

besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java

@@ -44,6 +44,7 @@
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TimestampSchedule;
 import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
@@ -66,6 +67,7 @@ public class TransitionControllerBuilderTest {
 
   @Mock ProtocolSchedule preMergeProtocolSchedule;
   @Mock ProtocolSchedule postMergeProtocolSchedule;
+  @Mock TimestampSchedule timestampSchedule;
   @Mock ProtocolContext protocolContext;
   @Mock MutableBlockchain mockBlockchain;
   @Mock TransactionPool transactionPool;
@@ -86,7 +88,11 @@ public void setup() {
     transitionProtocolSchedule =
         spy(
             new TransitionProtocolSchedule(
-                preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext));
+                preMergeProtocolSchedule,
+                postMergeProtocolSchedule,
+                mergeContext,
+                timestampSchedule));
+    transitionProtocolSchedule.setProtocolContext(protocolContext);
     cliqueBuilder.nodeKey(NodeKeyUtils.generate());
     postMergeBuilder.storageProvider(storageProvider);
     when(protocolContext.getBlockchain()).thenReturn(mockBlockchain);
@@ -126,7 +132,7 @@ public void assertPreMergeScheduleForNotPostMerge() {
     when(mergeContext.isPostMerge()).thenReturn(Boolean.FALSE);
     when(mergeContext.getFinalized()).thenReturn(Optional.empty());
     when(preMergeProtocolSchedule.getByBlockNumber(anyLong())).thenReturn(preMergeProtocolSpec);
-    assertThat(transitionProtocolSchedule.getByBlockHeader(protocolContext, mockBlock))
+    assertThat(transitionProtocolSchedule.getByBlockHeader(mockBlock))
         .isEqualTo(preMergeProtocolSpec);
   }
 
@@ -136,7 +142,7 @@ public void assertPostMergeScheduleForAnyBlockWhenPostMergeAndFinalized() {
     var postMergeProtocolSpec = mock(ProtocolSpec.class);
     when(mergeContext.getFinalized()).thenReturn(Optional.of(mockBlock));
     when(postMergeProtocolSchedule.getByBlockNumber(anyLong())).thenReturn(postMergeProtocolSpec);
-    assertThat(transitionProtocolSchedule.getByBlockHeader(protocolContext, mockBlock))
+    assertThat(transitionProtocolSchedule.getByBlockHeader(mockBlock))
         .isEqualTo(postMergeProtocolSpec);
   }
 
@@ -159,7 +165,7 @@ public void assertPreMergeScheduleForBelowTerminalBlockWhenPostMergeIfNotFinaliz
         .thenReturn(Optional.of(Difficulty.of(1335L)));
 
     when(preMergeProtocolSchedule.getByBlockNumber(anyLong())).thenReturn(preMergeProtocolSpec);
-    assertThat(transitionProtocolSchedule.getByBlockHeader(protocolContext, mockBlock))
+    assertThat(transitionProtocolSchedule.getByBlockHeader(mockBlock))
         .isEqualTo(preMergeProtocolSpec);
   }
 
@@ -182,7 +188,7 @@ public void assertPostMergeScheduleForPostMergeExactlyAtTerminalDifficultyIfNotF
         .thenReturn(Optional.of(Difficulty.of(1337L)));
 
     when(postMergeProtocolSchedule.getByBlockNumber(anyLong())).thenReturn(postMergeProtocolSpec);
-    assertThat(transitionProtocolSchedule.getByBlockHeader(protocolContext, mockBlock))
+    assertThat(transitionProtocolSchedule.getByBlockHeader(mockBlock))
         .isEqualTo(postMergeProtocolSpec);
   }
 

config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java

@@ -199,7 +199,11 @@ private long parseLong(final String name, final String value) {
     }
   }
 
-  public List<Long> getForks() {
-    return getConfigOptions().getForks();
+  public List<Long> getForkBlockNumbers() {
+    return getConfigOptions().getForkBlockNumbers();
+  }
+
+  public List<Long> getForkTimestamps() {
+    return getConfigOptions().getForkTimestamps();
   }
 }

config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java

@@ -90,6 +90,10 @@ default boolean isConsensusMigration() {
 
   OptionalLong getMergeNetSplitBlockNumber();
 
+  OptionalLong getShanghaiTimestamp();
+
+  OptionalLong getCancunTimestamp();
+
   OptionalLong getShandongBlockNumber();
 
   Optional<Wei> getBaseFeePerGas();
@@ -100,7 +104,9 @@ default boolean isConsensusMigration() {
 
   Optional<Hash> getTerminalBlockHash();
 
-  List<Long> getForks();
+  List<Long> getForkBlockNumbers();
+
+  List<Long> getForkTimestamps();
 
   /**
    * Block number for the Dao Fork, this value is used to tell node to connect with peer that did

config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java

@@ -278,6 +278,16 @@ public OptionalLong getMergeNetSplitBlockNumber() {
     return getOptionalLong("mergenetsplitblock");
   }
 
+  @Override
+  public OptionalLong getShanghaiTimestamp() {
+    return getOptionalLong("shanghaitimestamp");
+  }
+
+  @Override
+  public OptionalLong getCancunTimestamp() {
+    return getOptionalLong("cancuntimestamp");
+  }
+
   @Override
   public OptionalLong getShandongBlockNumber() {
     return getOptionalLong("shandongblock");
@@ -433,6 +443,8 @@ public Map<String, Object> asMap() {
     getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
     getGrayGlacierBlockNumber().ifPresent(l -> builder.put("grayGlacierBlock", l));
     getMergeNetSplitBlockNumber().ifPresent(l -> builder.put("mergeNetSplitBlock", l));
+    getShanghaiTimestamp().ifPresent(l -> builder.put("shanghaiTimestamp", l));
+    getCancunTimestamp().ifPresent(l -> builder.put("cancunTimestamp", l));
     getShandongBlockNumber().ifPresent(l -> builder.put("shandongBlock", l));
     getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
     getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h.toHexString()));
@@ -540,7 +552,7 @@ private Optional<Hash> getOptionalHash(final String key) {
   }
 
   @Override
-  public List<Long> getForks() {
+  public List<Long> getForkBlockNumbers() {
     Stream<OptionalLong> forkBlockNumbers =
         Stream.of(
             getHomesteadBlockNumber(),
@@ -578,4 +590,18 @@ public List<Long> getForks() {
         .sorted()
         .collect(Collectors.toList());
   }
+
+  @Override
+  public List<Long> getForkTimestamps() {
+    Stream<OptionalLong> forkBlockTimestamps =
+        Stream.of(getShanghaiTimestamp(), getCancunTimestamp());
+    // when adding forks add an entry to ${REPO_ROOT}/config/src/test/resources/all_forks.json
+
+    return forkBlockTimestamps
+        .filter(OptionalLong::isPresent)
+        .map(OptionalLong::getAsLong)
+        .distinct()
+        .sorted()
+        .collect(Collectors.toList());
+  }
 }

config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java

@@ -44,6 +44,8 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions {
   private OptionalLong arrowGlacierBlockNumber = OptionalLong.empty();
   private OptionalLong grayGlacierBlockNumber = OptionalLong.empty();
   private OptionalLong mergeNetSplitBlockNumber = OptionalLong.empty();
+  private OptionalLong shanghaiTimestamp = OptionalLong.empty();
+  private OptionalLong cancunTimestamp = OptionalLong.empty();
   private OptionalLong shandongBlockNumber = OptionalLong.empty();
   private OptionalLong terminalBlockNumber = OptionalLong.empty();
   private Optional<Hash> terminalBlockHash = Optional.empty();
@@ -217,6 +219,16 @@ public OptionalLong getMergeNetSplitBlockNumber() {
     return mergeNetSplitBlockNumber;
   }
 
+  @Override
+  public OptionalLong getShanghaiTimestamp() {
+    return shanghaiTimestamp;
+  }
+
+  @Override
+  public OptionalLong getCancunTimestamp() {
+    return cancunTimestamp;
+  }
+
   @Override
   public OptionalLong getShandongBlockNumber() {
     return shandongBlockNumber;
@@ -342,6 +354,8 @@ public Map<String, Object> asMap() {
     getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
     getGrayGlacierBlockNumber().ifPresent(l -> builder.put("grayGlacierBlock", l));
     getMergeNetSplitBlockNumber().ifPresent(l -> builder.put("mergeNetSplitBlock", l));
+    getShanghaiTimestamp().ifPresent(l -> builder.put("shanghaiTimestamp", l));
+    getCancunTimestamp().ifPresent(l -> builder.put("cancunTimestamp", l));
     getShandongBlockNumber().ifPresent(l -> builder.put("shandongBlock", l));
     getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
     getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h));
@@ -412,7 +426,12 @@ public boolean isZeroBaseFee() {
   }
 
   @Override
-  public List<Long> getForks() {
+  public List<Long> getForkBlockNumbers() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<Long> getForkTimestamps() {
     return Collections.emptyList();
   }
 
@@ -486,6 +505,16 @@ public StubGenesisConfigOptions mergeNetSplitBlock(final long blockNumber) {
     return this;
   }
 
+  public StubGenesisConfigOptions shanghaiTimestamp(final long timestamp) {
+    shanghaiTimestamp = OptionalLong.of(timestamp);
+    return this;
+  }
+
+  public StubGenesisConfigOptions cancunTimestamp(final long timestamp) {
+    cancunTimestamp = OptionalLong.of(timestamp);
+    return this;
+  }
+
   public StubGenesisConfigOptions shandongBlock(final long blockNumber) {
     shandongBlockNumber = OptionalLong.of(blockNumber);
     return this;