Merge pull request #1977 from carver/berlin-core-tests

carver · web-flow · commit 8556d4a7c053 · 2021-02-25T09:37:19.000-08:00
Enable more generic tests against Berlin
diff --git a/eth/chains/mainnet/__init__.py b/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))
diff --git a/eth/chains/mainnet/constants.py b/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)
diff --git a/eth/tools/builder/chain/__init__.py b/eth/tools/builder/chain/__init__.py
@@ -26,6 +26,7 @@
     petersburg_at,
     istanbul_at,
     muir_glacier_at,
+    berlin_at,
     latest_mainnet_at,
 )
 
diff --git a/eth/tools/builder/chain/builders.py b/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
 
diff --git a/newsfragments/1977.internal.rst b/newsfragments/1977.internal.rst
@@ -0,0 +1 @@
+Make sure Berlin is tested across all core tests. (also patched in some missing Muir Glacier ones)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -31,6 +31,8 @@
     ConstantinopleVM,
     PetersburgVM,
     IstanbulVM,
+    MuirGlacierVM,
+    BerlinVM,
 )
 
 #
@@ -89,6 +91,8 @@ def _file_logging(request):
                 ConstantinopleVM,
                 PetersburgVM,
                 IstanbulVM,
+                MuirGlacierVM,
+                BerlinVM,
                 ])
 def VM(request):
     return request.param
diff --git a/tests/core/builder-tools/test_chain_construction.py b/tests/core/builder-tools/test_chain_construction.py
@@ -5,6 +5,7 @@
 from eth.chains.base import MiningChain
 from eth.consensus.pow import check_pow
 from eth.tools.builder.chain import (
+    berlin_at,
     build,
     byzantium_at,
     chain_id,
@@ -33,6 +34,7 @@
     PetersburgVM,
     IstanbulVM,
     MuirGlacierVM,
+    BerlinVM,
 )
 
 
@@ -85,6 +87,7 @@ def test_chain_builder_construct_chain_vm_configuration_multiple_forks():
         (petersburg_at, PetersburgVM),
         (istanbul_at, IstanbulVM),
         (muir_glacier_at, MuirGlacierVM),
+        (berlin_at, BerlinVM),
         (latest_mainnet_at, MuirGlacierVM),  # this will change whenever the next upgrade is locked
     )
 )
diff --git a/tests/core/chain-object/test_contract_call.py b/tests/core/chain-object/test_contract_call.py
@@ -27,6 +27,8 @@
     ConstantinopleVM,
     PetersburgVM,
     IstanbulVM,
+    MuirGlacierVM,
+    BerlinVM,
 )
 
 
@@ -223,6 +225,26 @@ def test_get_transaction_result(
             'useLotsOfGas()',
             OutOfGas,
         ),
+        (
+            MuirGlacierVM,
+            'doRevert()',
+            Revert,
+        ),
+        (
+            MuirGlacierVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
+        (
+            BerlinVM,
+            'doRevert()',
+            Revert,
+        ),
+        (
+            BerlinVM,
+            'useLotsOfGas()',
+            OutOfGas,
+        ),
     ),
 )
 def test_get_transaction_result_revert(
diff --git a/tests/core/chain-object/test_gas_estimation.py b/tests/core/chain-object/test_gas_estimation.py
@@ -13,6 +13,8 @@
     ConstantinopleVM,
     PetersburgVM,
     IstanbulVM,
+    MuirGlacierVM,
+    BerlinVM,
 )
 from eth._utils.address import force_bytes_to_address
 
@@ -608,6 +610,150 @@
             22272,
             id='sha3 precompile 32 bytes 1000_tolerance binary pending for IstanbulVM',
         ),
+        pytest.param(
+            b'',
+            None,
+            ADDR_1010,
+            True,
+            MuirGlacierVM,
+            21000,
+            id='simple default pending for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'',
+            None,
+            ADDR_1010,
+            False,
+            MuirGlacierVM,
+            21000,
+            id='simple default for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 10,
+            None,
+            ADDR_1010,
+            True,
+            MuirGlacierVM,
+            21160,
+            id='10 bytes default pending for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 10,
+            None,
+            ADDR_1010,
+            False,
+            MuirGlacierVM,
+            21160,
+            id='10 bytes default for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            None,
+            ADDRESS_2,
+            True,
+            MuirGlacierVM,
+            33675,
+            id='sha3 precompile 32 bytes default pending for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            None,
+            ADDRESS_2,
+            False,
+            MuirGlacierVM,
+            33687,
+            id='sha3 precompile 32 bytes default for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 320,
+            None,
+            ADDRESS_2,
+            True,
+            MuirGlacierVM,
+            38265,
+            id='sha3 precompile 320 bytes default pending for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            binary_gas_search_1000_tolerance,
+            ADDRESS_2,
+            True,
+            MuirGlacierVM,
+            22272,
+            id='sha3 precompile 32 bytes 1000_tolerance binary pending for MuirGlacierVM',
+        ),
+        pytest.param(
+            b'',
+            None,
+            ADDR_1010,
+            True,
+            BerlinVM,
+            21000,
+            id='simple default pending for BerlinVM',
+        ),
+        pytest.param(
+            b'',
+            None,
+            ADDR_1010,
+            False,
+            BerlinVM,
+            21000,
+            id='simple default for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 10,
+            None,
+            ADDR_1010,
+            True,
+            BerlinVM,
+            21160,
+            id='10 bytes default pending for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 10,
+            None,
+            ADDR_1010,
+            False,
+            BerlinVM,
+            21160,
+            id='10 bytes default for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            None,
+            ADDRESS_2,
+            True,
+            BerlinVM,
+            33675,
+            id='sha3 precompile 32 bytes default pending for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            None,
+            ADDRESS_2,
+            False,
+            BerlinVM,
+            33687,
+            id='sha3 precompile 32 bytes default for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 320,
+            None,
+            ADDRESS_2,
+            True,
+            BerlinVM,
+            38265,
+            id='sha3 precompile 320 bytes default pending for BerlinVM',
+        ),
+        pytest.param(
+            b'\xff' * 32,
+            binary_gas_search_1000_tolerance,
+            ADDRESS_2,
+            True,
+            BerlinVM,
+            22272,
+            id='sha3 precompile 32 bytes 1000_tolerance binary pending for BerlinVM',
+        ),
     ),
 )
 def test_estimate_gas(
@@ -667,7 +813,8 @@ def test_estimate_gas(
         (ConstantinopleVM, 722760),
         (PetersburgVM, 722760),
         (IstanbulVM, 186120),
-
+        (MuirGlacierVM, 186120),
+        (BerlinVM, 186120),
     )
 )
 def test_estimate_gas_on_full_block(
diff --git a/tests/core/opcodes/test_opcodes.py b/tests/core/opcodes/test_opcodes.py
diff --git a/tests/core/tester/test_generate_vm_configuration.py b/tests/core/tester/test_generate_vm_configuration.py
diff --git a/tests/json-fixtures/test_transactions.py b/tests/json-fixtures/test_transactions.py

Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,8 @@`
`52`	`52`	`# Muir Glacier Block`
`53`	`53`	`#`
`54`	`54`	`MUIR_GLACIER_MAINNET_BLOCK = BlockNumber(9200000)`
	`55`	`+`
	`56`	`+#`
	`57`	`+# Berlin Block`
	`58`	`+#`
	`59`	`+BERLIN_MAINNET_BLOCK = BlockNumber(12244000)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`petersburg_at,`
`27`	`27`	`istanbul_at,`
`28`	`28`	`muir_glacier_at,`
	`29`	`+ berlin_at,`
`29`	`30`	`latest_mainnet_at,`
`30`	`31`	`)`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Make sure Berlin is tested across all core tests. (also patched in some missing Muir Glacier ones)`