added London blocknumbers for testnets (#2426)

Signed-off-by: Justin Florentine <justin.florentine@consensys.net>

CHANGELOG.md

@@ -12,6 +12,10 @@
 - Updated `eth_sendRawTransaction` to return an error when maxPriorityFeePerGas exceeds maxFeePerGas [\#2424](https://github.com/hyperledger/besu/pull/2424)
 
 ### Early Access Features
+This release contains the activation blocks for London across all supported testnets. They are: 
+  * Ropsten 10_499_401 (24 Jun 2021)
+  * Goerli 5_062_605 (30 Jun 2021)
+  * Rinkeby 8_897_988 (7 Jul 2021)
 
 ## 21.1.7
 

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

@@ -65,8 +65,9 @@ public class ForkIdsTest {
               new ForkId(Bytes.ofUnsignedInt(0xd6e2149bL), 6485846L),
               new ForkId(Bytes.ofUnsignedInt(0x4bc66396L), 7117117L),
               new ForkId(Bytes.ofUnsignedInt(0x6727ef90L), 9812189L),
-              new ForkId(Bytes.ofUnsignedInt(0xa157d377L), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0xa157d377L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0xa157d377L), 10499401L),
+              new ForkId(Bytes.ofUnsignedInt(0x7119b6b3L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x7119b6b3L), 0L))
         },
         new Object[] {
           NetworkName.RINKEBY,
@@ -79,16 +80,18 @@ public class ForkIdsTest {
               new ForkId(Bytes.ofUnsignedInt(0xe49cab14L), 4321234L),
               new ForkId(Bytes.ofUnsignedInt(0xafec6b27L), 5435345L),
               new ForkId(Bytes.ofUnsignedInt(0xcbdb8838L), 8290928L),
-              new ForkId(Bytes.ofUnsignedInt(0x6910c8bdL), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0x6910c8bdL), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x6910c8bdL), 8897988L),
+              new ForkId(Bytes.ofUnsignedInt(0x8e29f2f3L), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0x8e29f2f3L), 0L))
         },
         new Object[] {
           NetworkName.GOERLI,
           List.of(
               new ForkId(Bytes.ofUnsignedInt(0xa3f5ab08L), 1561651L),
               new ForkId(Bytes.ofUnsignedInt(0xc25efa5cL), 4460644L),
-              new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 5062605L),
+              new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 0L),
+              new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 0L))
         },
         new Object[] {
           NetworkName.MAINNET,

config/src/main/resources/goerli.json

@@ -4,6 +4,7 @@
     "petersburgBlock":0,
     "istanbulBlock":1561651,
     "berlinBlock":4460644,
+    "londonBlock":5062605,
     "clique":{
       "blockperiodseconds":15,
       "epochlength":30000

config/src/main/resources/rinkeby.json

@@ -9,6 +9,7 @@
     "petersburgBlock": 4321234,
     "istanbulBlock":  5435345,
     "berlinBlock": 8290928,
+    "londonBlock": 8897988,
     "clique": {
       "blockperiodseconds": 15,
       "epochlength": 30000

config/src/main/resources/ropsten.json

@@ -9,6 +9,7 @@
     "istanbulBlock": 6485846,
     "muirGlacierBlock": 7117117,
     "berlinBlock": 9812189,
+    "londonBlock": 10499401,
     "ethash": {
     }
   },

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java

@@ -104,7 +104,8 @@ public class MainnetProtocolScheduleTest {
     Assertions.assertThat(sched.getByBlockNumber(6_485_846L).getName()).isEqualTo("Istanbul");
     Assertions.assertThat(sched.getByBlockNumber(7_117_117L).getName()).isEqualTo("MuirGlacier");
     Assertions.assertThat(sched.getByBlockNumber(9_812_189L).getName()).isEqualTo("Berlin");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Berlin");
+    Assertions.assertThat(sched.getByBlockNumber(10_499_401L).getName()).isEqualTo("London");
+    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("London");
   }
 
   @Test
@@ -118,7 +119,8 @@ public class MainnetProtocolScheduleTest {
     Assertions.assertThat(sched.getByBlockNumber(0L).getName()).isEqualTo("Petersburg");
     Assertions.assertThat(sched.getByBlockNumber(1_561_651L).getName()).isEqualTo("Istanbul");
     Assertions.assertThat(sched.getByBlockNumber(4_460_644L).getName()).isEqualTo("Berlin");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Berlin");
+    Assertions.assertThat(sched.getByBlockNumber(5_062_605L).getName()).isEqualTo("London");
+    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("London");
   }
 
   @Test
@@ -138,6 +140,7 @@ public class MainnetProtocolScheduleTest {
     Assertions.assertThat(sched.getByBlockNumber(4_321_234L).getName()).isEqualTo("Petersburg");
     Assertions.assertThat(sched.getByBlockNumber(5_435_345L).getName()).isEqualTo("Istanbul");
     Assertions.assertThat(sched.getByBlockNumber(8_290_928L).getName()).isEqualTo("Berlin");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Berlin");
+    Assertions.assertThat(sched.getByBlockNumber(8_897_988L).getName()).isEqualTo("London");
+    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("London");
   }
 }