add london block for mainnet (hyperledger#2504)

Signed-off-by: Justin Florentine <[email protected]>
RatanRSur · Jul 8, 2021 · 88ea474 · 88ea474
1 parent b735981
commit 88ea474
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ This release contains the activation blocks for London across all supported test
   * Ropsten 10_499_401 (24 Jun 2021)
   * Goerli 5_062_605 (30 Jun 2021)
   * Rinkeby 8_897_988 (7 Jul 2021)
+  * Mainnet 12_965_000 (4 Aug 2021)
 - QBFT is a Byzantine Fault Tolerant consensus algorithm, building on the capabilities of IBFT and IBFT 2.0. It aims to provide performance improvements in cases of excess round change, and provides interoperability with other EEA compliant clients, such as GoQuorum.
   - Note: QBFT currently only supports new networks. Existing networks using IBFT2.0 cannot migrate to QBFT. This will become available in a future release.
   - Note: QBFT is an early access feature pending community feedback. Please make use of QBFT in new development networks and reach out in case of issues or concerns

diff --git 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<Object[]> 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
@@ -10,6 +10,7 @@
     "istanbulBlock": 9069000,
     "muirGlacierBlock": 9200000,
     "berlinBlock": 12244000,
+    "londonBlock": 12965000,
     "ethash": {
     }
   },

diff --git a/...core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java b/...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