Add goerli and ropsten Berlin block numbers

Author: carver

eth/chains/goerli/__init__.py

@@ -1,6 +1,7 @@
 from eth_utils import decode_hex
 
 from .constants import (
+    BERLIN_GOERLI_BLOCK,
     ISTANBUL_GOERLI_BLOCK,
     PETERSBURG_GOERLI_BLOCK,
 )
@@ -9,13 +10,15 @@
 
 from eth.rlp.headers import BlockHeader
 from eth.vm.forks import (
+    BerlinVM,
     IstanbulVM,
     PetersburgVM,
 )
 
 GOERLI_VM_CONFIGURATION = (
     (PETERSBURG_GOERLI_BLOCK, PetersburgVM),
     (ISTANBUL_GOERLI_BLOCK, IstanbulVM),
+    (BERLIN_GOERLI_BLOCK, BerlinVM),
 )
 
 

eth/chains/goerli/constants.py

@@ -14,3 +14,5 @@
 # Istanbul
 #
 ISTANBUL_GOERLI_BLOCK = BlockNumber(1561651)
+
+BERLIN_GOERLI_BLOCK = BlockNumber(4460644)

eth/chains/ropsten/__init__.py

@@ -3,6 +3,7 @@
 from eth_utils import decode_hex
 
 from .constants import (
+    BERLIN_ROPSTEN_BLOCK,
     BYZANTIUM_ROPSTEN_BLOCK,
     CONSTANTINOPLE_ROPSTEN_BLOCK,
     ISTANBUL_ROPSTEN_BLOCK,
@@ -18,6 +19,7 @@
 from eth.chains.base import Chain
 from eth.rlp.headers import BlockHeader
 from eth.vm.forks import (
+    BerlinVM,
     ByzantiumVM,
     ConstantinopleVM,
     IstanbulVM,
@@ -36,7 +38,8 @@
     (CONSTANTINOPLE_ROPSTEN_BLOCK, ConstantinopleVM),
     (PETERSBURG_ROPSTEN_BLOCK, PetersburgVM),
     (ISTANBUL_ROPSTEN_BLOCK, IstanbulVM),
-    (MUIR_GLACIER_ROPSTEN_BLOCK, MuirGlacierVM)
+    (MUIR_GLACIER_ROPSTEN_BLOCK, MuirGlacierVM),
+    (BERLIN_ROPSTEN_BLOCK, BerlinVM),
 )
 
 

eth/chains/ropsten/constants.py

@@ -57,3 +57,4 @@
 # Muir Glacier Block
 #
 MUIR_GLACIER_ROPSTEN_BLOCK = BlockNumber(7117117)
+BERLIN_ROPSTEN_BLOCK = BlockNumber(9812189)