Merge pull request #1559 from carver/add-constantinople-fork

Add Constantinople mainnet fork block number

Author: carver

eth/chains/mainnet/__init__.py

@@ -13,6 +13,7 @@
 from .constants import (
     MAINNET_CHAIN_ID,
     BYZANTIUM_MAINNET_BLOCK,
+    CONSTANTINOPLE_MAINNET_BLOCK,
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     HOMESTEAD_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
@@ -27,11 +28,12 @@
 from eth.rlp.headers import BlockHeader
 from eth.vm.base import BaseVM  # noqa: F401
 from eth.vm.forks import (
-    TangerineWhistleVM,
+    ByzantiumVM,
+    ConstantinopleVM,
     FrontierVM,
     HomesteadVM,
     SpuriousDragonVM,
-    ByzantiumVM,
+    TangerineWhistleVM,
 )
 
 
@@ -78,13 +80,15 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
     BYZANTIUM_MAINNET_BLOCK,
+    CONSTANTINOPLE_MAINNET_BLOCK,
 )
 MAINNET_VMS = (
     FrontierVM,
     MainnetHomesteadVM,
     TangerineWhistleVM,
     SpuriousDragonVM,
     ByzantiumVM,
+    ConstantinopleVM,
 )
 
 MAINNET_VM_CONFIGURATION = tuple(zip(MAINNET_FORK_BLOCKS, MAINNET_VMS))

eth/chains/mainnet/constants.py

@@ -37,3 +37,8 @@
 # Byzantium Block
 #
 BYZANTIUM_MAINNET_BLOCK = BlockNumber(4370000)
+
+#
+# Constantinople Block
+#
+CONSTANTINOPLE_MAINNET_BLOCK = BlockNumber(7080000)

tests/core/tester/test_generate_vm_configuration.py

@@ -9,12 +9,13 @@
 
 
 class Forks(enum.Enum):
+    Custom = -1
     Frontier = 0
     Homestead = 1
     TangerineWhistle = 2
     SpuriousDragon = 3
     Byzantium = 4
-    Custom = 5
+    Constantinople = 5
 
 
 class CustomFrontierVM(FrontierVM):
@@ -27,7 +28,7 @@ class CustomFrontierVM(FrontierVM):
         (
             tuple(),
             {},
-            ((0, Forks.Byzantium),),
+            ((0, Forks.Constantinople),),
         ),
         (
             ((0, 'tangerine-whistle'), (1, 'spurious-dragon')),
@@ -139,6 +140,8 @@ def test_generate_vm_configuration(args, kwargs, expected):
             assert 'SpuriousDragon' in left_vm.__name__
         elif right_vm == Forks.Byzantium:
             assert 'Byzantium' in left_vm.__name__
+        elif right_vm == Forks.Constantinople:
+            assert 'Constantinople' in left_vm.__name__
         elif right_vm == Forks.Custom:
             assert 'CustomFrontier' in left_vm.__name__
         else: