Run Shanghai through core tests

ethereum · Feb 28, 2023 · 6279e21 · 6279e21
1 parent f6f23b6
commit 6279e21
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/eth/chains/mainnet/__init__.py b/eth/chains/mainnet/__init__.py
@@ -49,6 +49,7 @@
     MuirGlacierVM,
     ParisVM,
     PetersburgVM,
+    ShanghaiVM,
     SpuriousDragonVM,
     TangerineWhistleVM,
 )
@@ -126,6 +127,7 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
 )
 POS_MAINNET_VMS = (
     ParisVM,
+    ShanghaiVM,
 )
 
 MAINNET_VMS = MINING_MAINNET_VMS + POS_MAINNET_VMS

diff --git a/eth/tools/builder/chain/__init__.py b/eth/tools/builder/chain/__init__.py
@@ -31,6 +31,7 @@
     arrow_glacier_at,
     gray_glacier_at,
     paris_at,
+    shanghai_at,
     latest_mainnet_at,
 )
 
@@ -51,6 +52,7 @@
 )
 pos_mainnet_fork_at_fns = (
     paris_at,
+    shanghai_at,
 )
 mainnet_fork_at_fns = mining_mainnet_fork_at_fns + pos_mainnet_fork_at_fns
 
@@ -86,6 +88,7 @@ class API:
     arrow_glacier_at = staticmethod(arrow_glacier_at)
     gray_glacier_at = staticmethod(gray_glacier_at)
     paris_at = staticmethod(paris_at)
+    shanghai_at = staticmethod(shanghai_at)
 
     # iterable of the fork specific functions
     mainnet_fork_at_fns = mainnet_fork_at_fns

diff --git a/eth/tools/builder/chain/builders.py b/eth/tools/builder/chain/builders.py
@@ -77,6 +77,7 @@
     ArrowGlacierVM,
     GrayGlacierVM,
     ParisVM,
+    ShanghaiVM,
 )
 
 
@@ -250,8 +251,9 @@ def dao_fork_at(dao_fork_block_number: BlockNumber,
 arrow_glacier_at = fork_at(ArrowGlacierVM)
 gray_glacier_at = fork_at(GrayGlacierVM)
 paris_at = fork_at(ParisVM)
+shanghai_at = fork_at(ShanghaiVM)
 
-latest_mainnet_at = paris_at
+latest_mainnet_at = shanghai_at
 
 GENESIS_DEFAULTS = cast(
     Tuple[Tuple[str, Union[BlockNumber, int, None, bytes, Address, Hash32]], ...],

diff --git a/eth/tools/fixtures/helpers.py b/eth/tools/fixtures/helpers.py
@@ -11,7 +11,6 @@
     Type,
 )
 
-from eth.vm.forks.shanghai import ShanghaiVM
 from eth_utils.toolz import (
     assoc,
     first,
@@ -55,6 +54,7 @@
     LondonVM,
     GrayGlacierVM,
     ParisVM,
+    ShanghaiVM,
 )
 
 

diff --git a/eth/vm/forks/__init__.py b/eth/vm/forks/__init__.py
@@ -40,3 +40,6 @@
 from .paris import (  # noqa: F401
     ParisVM,
 )
+from .shanghai import (  # noqa: F401
+    ShanghaiVM,
+)
diff --git a/tests/core/builder-tools/test_chain_construction.py b/tests/core/builder-tools/test_chain_construction.py
@@ -25,6 +25,7 @@
     name,
     paris_at,
     petersburg_at,
+    shanghai_at,
     spurious_dragon_at,
     tangerine_whistle_at,
 )
@@ -43,6 +44,7 @@
     ArrowGlacierVM,
     GrayGlacierVM,
     ParisVM,
+    ShanghaiVM,
 )
 
 
@@ -100,7 +102,8 @@ def test_chain_builder_construct_chain_vm_configuration_multiple_forks():
         (arrow_glacier_at, ArrowGlacierVM),
         (gray_glacier_at, GrayGlacierVM),
         (paris_at, ParisVM),
-        (latest_mainnet_at, ParisVM),  # this will change whenever the next upgrade is locked
+        (shanghai_at, ShanghaiVM),
+        (latest_mainnet_at, ShanghaiVM),  # this will change whenever the next upgrade is locked
     )
 )
 def test_chain_builder_construct_chain_fork_specific_helpers(fork_fn, vm_class):