Activate PetersburgVM for Mainnet and Ropsten

Author: cburgdorf

eth/chains/mainnet/__init__.py

@@ -13,7 +13,7 @@
 from .constants import (
     MAINNET_CHAIN_ID,
     BYZANTIUM_MAINNET_BLOCK,
-    CONSTANTINOPLE_MAINNET_BLOCK,
+    PETERSBURG_MAINNET_BLOCK,
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     HOMESTEAD_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
@@ -29,9 +29,9 @@
 from eth.vm.base import BaseVM  # noqa: F401
 from eth.vm.forks import (
     ByzantiumVM,
-    ConstantinopleVM,
     FrontierVM,
     HomesteadVM,
+    PetersburgVM,
     SpuriousDragonVM,
     TangerineWhistleVM,
 )
@@ -80,15 +80,15 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
     BYZANTIUM_MAINNET_BLOCK,
-    CONSTANTINOPLE_MAINNET_BLOCK,
+    PETERSBURG_MAINNET_BLOCK,
 )
 MAINNET_VMS = (
     FrontierVM,
     MainnetHomesteadVM,
     TangerineWhistleVM,
     SpuriousDragonVM,
     ByzantiumVM,
-    ConstantinopleVM,
+    PetersburgVM,
 )
 
 MAINNET_VM_CONFIGURATION = tuple(zip(MAINNET_FORK_BLOCKS, MAINNET_VMS))

eth/chains/mainnet/constants.py

@@ -39,6 +39,6 @@
 BYZANTIUM_MAINNET_BLOCK = BlockNumber(4370000)
 
 #
-# Constantinople Block
+# Petersburg Block
 #
-CONSTANTINOPLE_MAINNET_BLOCK = BlockNumber(9876543210)
+PETERSBURG_MAINNET_BLOCK = BlockNumber(7280000)

eth/chains/ropsten/__init__.py

@@ -4,6 +4,7 @@
 from .constants import (
     BYZANTIUM_ROPSTEN_BLOCK,
     CONSTANTINOPLE_ROPSTEN_BLOCK,
+    PETERSBURG_ROPSTEN_BLOCK,
     ROPSTEN_CHAIN_ID,
     SPURIOUS_DRAGON_ROPSTEN_BLOCK,
     TANGERINE_WHISTLE_ROPSTEN_BLOCK,
@@ -16,6 +17,7 @@
 from eth.vm.forks import (
     ByzantiumVM,
     ConstantinopleVM,
+    PetersburgVM,
     SpuriousDragonVM,
     TangerineWhistleVM,
 )
@@ -27,6 +29,7 @@
     (SPURIOUS_DRAGON_ROPSTEN_BLOCK, SpuriousDragonVM),
     (BYZANTIUM_ROPSTEN_BLOCK, ByzantiumVM),
     (CONSTANTINOPLE_ROPSTEN_BLOCK, ConstantinopleVM),
+    (PETERSBURG_ROPSTEN_BLOCK, PetersburgVM),
 )
 
 

eth/chains/ropsten/constants.py

@@ -40,3 +40,9 @@
 # Constantinople
 #
 CONSTANTINOPLE_ROPSTEN_BLOCK = BlockNumber(4230000)
+
+
+#
+# Petersburg
+#
+PETERSBURG_ROPSTEN_BLOCK = BlockNumber(9999999)

eth/vm/forks/__init__.py

@@ -16,3 +16,6 @@
 from .constantinople import (  # noqa: F401
     ConstantinopleVM,
 )
+from .petersburg import (  # noqa: F401
+    PetersburgVM,
+)