Add chain and VM builder methods for Berlin

Passes all the new Berlin tests

Author: carver

eth/chains/mainnet/__init__.py

@@ -12,6 +12,7 @@
 
 from .constants import (
     MAINNET_CHAIN_ID,
+    BERLIN_MAINNET_BLOCK,
     BYZANTIUM_MAINNET_BLOCK,
     PETERSBURG_MAINNET_BLOCK,
     ISTANBUL_MAINNET_BLOCK,
@@ -33,6 +34,7 @@
 )
 from eth.rlp.headers import BlockHeader
 from eth.vm.forks import (
+    BerlinVM,
     ByzantiumVM,
     FrontierVM,
     HomesteadVM,
@@ -94,6 +96,7 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
     PETERSBURG_MAINNET_BLOCK,
     ISTANBUL_MAINNET_BLOCK,
     MUIR_GLACIER_MAINNET_BLOCK,
+    BERLIN_MAINNET_BLOCK,
 )
 MAINNET_VMS = (
     FrontierVM,
@@ -104,6 +107,7 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
     PetersburgVM,
     IstanbulVM,
     MuirGlacierVM,
+    BerlinVM,
 )
 
 MAINNET_VM_CONFIGURATION = tuple(zip(MAINNET_FORK_BLOCKS, MAINNET_VMS))

eth/chains/mainnet/constants.py

@@ -52,3 +52,8 @@
 # Muir Glacier Block
 #
 MUIR_GLACIER_MAINNET_BLOCK = BlockNumber(9200000)
+
+#
+# Berlin Block
+#
+BERLIN_MAINNET_BLOCK = BlockNumber(12244000)

eth/tools/builder/chain/__init__.py

@@ -26,6 +26,7 @@
     petersburg_at,
     istanbul_at,
     muir_glacier_at,
+    berlin_at,
     latest_mainnet_at,
 )
 

eth/tools/builder/chain/builders.py

@@ -72,6 +72,7 @@
     PetersburgVM,
     IstanbulVM,
     MuirGlacierVM,
+    BerlinVM,
 )
 
 
@@ -235,6 +236,7 @@ def dao_fork_at(dao_fork_block_number: BlockNumber,
 petersburg_at = fork_at(PetersburgVM)
 istanbul_at = fork_at(IstanbulVM)
 muir_glacier_at = fork_at(MuirGlacierVM)
+berlin_at = fork_at(BerlinVM)
 
 latest_mainnet_at = muir_glacier_at
 

newsfragments/1977.internal.rst

@@ -0,0 +1 @@
+Make sure Berlin is tested across all core tests. (also patched in some missing Muir Glacier ones)

tests/core/tester/test_generate_vm_configuration.py

@@ -32,7 +32,7 @@ class CustomFrontierVM(FrontierVM):
         (
             tuple(),
             {},
-            ((0, Forks.MuirGlacier),),
+            ((0, Forks.Berlin),),
         ),
         (
             ((0, 'tangerine-whistle'), (1, 'spurious-dragon')),
@@ -132,7 +132,8 @@ class CustomFrontierVM(FrontierVM):
                 (3, Forks.Byzantium),
                 (5, Forks.Petersburg),
                 (6, Forks.Istanbul),
-                (7, Forks.Berlin),
+                (7, Forks.MuirGlacier),
+                (8, Forks.Berlin),
             ),
         ),
     ),