diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java index 2729cf9703d..3cb6361f14b 100644 --- a/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java +++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsTest.java @@ -107,8 +107,9 @@ public static Collection parameters() { new ForkId(Bytes.ofUnsignedInt(0x668db0afL), 9069000L), new ForkId(Bytes.ofUnsignedInt(0x879d6e30L), 9200000L), new ForkId(Bytes.ofUnsignedInt(0xe029e991L), 12244000L), - new ForkId(Bytes.ofUnsignedInt(0xeb440f6L), 0L), - new ForkId(Bytes.ofUnsignedInt(0xeb440f6L), 0L)) + new ForkId(Bytes.ofUnsignedInt(0xeb440f6L), 12965000), + new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 0L), + new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 0L)) }, new Object[] { NetworkName.MORDOR, diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json index b5fdb922a7d..848cda74912 100644 --- a/config/src/main/resources/mainnet.json +++ b/config/src/main/resources/mainnet.json @@ -10,6 +10,7 @@ "istanbulBlock": 9069000, "muirGlacierBlock": 9200000, "berlinBlock": 12244000, + "londonBlock": 12965000, "ethash": { } }, diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java index 2076c826b27..e227b2bf69e 100644 --- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java +++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java @@ -45,7 +45,8 @@ public void shouldReturnDefaultProtocolSpecsWhenCustomNumbersAreNotUsed() { Assertions.assertThat(sched.getByBlockNumber(9_069_000L).getName()).isEqualTo("Istanbul"); Assertions.assertThat(sched.getByBlockNumber(9_200_000L).getName()).isEqualTo("MuirGlacier"); Assertions.assertThat(sched.getByBlockNumber(12_244_000L).getName()).isEqualTo("Berlin"); - Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Berlin"); + Assertions.assertThat(sched.getByBlockNumber(12_965_000L).getName()).isEqualTo("London"); + Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("London"); } @Test