Update ethereum/tests fixtures to v6.0.0-beta.2 + fix revealed consensus failures

.circleci/config.yml

@@ -108,6 +108,12 @@ jobs:
       - image: circleci/python:3.5
         environment:
           TOXENV: py35-native-blockchain-byzantium
+  py35-native-blockchain-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.5
+        environment:
+          TOXENV: py35-native-blockchain-constantinople
   py35-native-blockchain-frontier:
     <<: *common
     docker:
@@ -175,6 +181,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-native-blockchain-byzantium
+  py36-native-blockchain-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-native-blockchain-constantinople
   py36-native-blockchain-frontier:
     <<: *common
     docker:
@@ -211,6 +223,12 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV: py36-rpc-state-byzantium
+  py36-rpc-state-constantinople:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV: py36-rpc-state-constantinople
   py36-rpc-state-frontier:
     <<: *common
     docker:
@@ -340,12 +358,14 @@ workflows:
       - py37-beacon
 
       - py36-native-blockchain-byzantium
+      - py36-native-blockchain-constantinople
       - py36-native-blockchain-frontier
       - py36-native-blockchain-homestead
       - py36-native-blockchain-eip150
       - py36-native-blockchain-eip158
       - py36-native-blockchain-transition
       - py36-rpc-state-byzantium
+      - py36-rpc-state-constantinople
       - py36-rpc-state-frontier
       - py36-rpc-state-homestead
       - py36-rpc-state-eip150
@@ -364,6 +384,7 @@ workflows:
       - py36-beacon
 
       - py35-native-blockchain-byzantium
+      - py35-native-blockchain-constantinople
       - py35-native-blockchain-frontier
       - py35-native-blockchain-homestead
       - py35-native-blockchain-eip150

eth/__init__.py

@@ -21,7 +21,7 @@
 #
 #  Ensure we can reach 1024 frames of recursion
 #
-EVM_RECURSION_LIMIT = 1024 * 10
+EVM_RECURSION_LIMIT = 1024 * 12
 sys.setrecursionlimit(max(EVM_RECURSION_LIMIT, sys.getrecursionlimit()))
 
 

eth/tools/fixtures/helpers.py

@@ -40,6 +40,7 @@
     BaseVM,
 )
 from eth.vm.forks import (
+    ConstantinopleVM,
     ByzantiumVM,
     TangerineWhistleVM,
     FrontierVM,
@@ -123,6 +124,10 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
         return (
             (0, ByzantiumVM),
         )
+    elif network == 'Constantinople':
+        return (
+            (0, ConstantinopleVM),
+        )
     elif network == 'FrontierToHomesteadAt5':
         HomesteadVM = BaseHomesteadVM.configure(support_dao_fork=False)
         return (

eth/vm/forks/constantinople/opcodes.py

@@ -11,7 +11,8 @@
     opcode_values,
 )
 from eth.vm.forks.byzantium.opcodes import (
-    BYZANTIUM_OPCODES
+    BYZANTIUM_OPCODES,
+    ensure_no_static
 )
 from eth.vm.forks.constantinople.constants import (
     GAS_EXTCODEHASH_EIP1052
@@ -56,7 +57,7 @@
         gas_cost=constants.GAS_CREATE,
     )(),
     opcode_values.SSTORE: as_opcode(
-        logic_fn=sstore_eip1283,
+        logic_fn=ensure_no_static(sstore_eip1283),
         mnemonic=mnemonics.SSTORE,
         gas_cost=constants.GAS_NULL,
     ),

eth/vm/logic/system.py

@@ -20,12 +20,9 @@
     ceil32,
 )
 from eth.vm import mnemonics
-from eth.vm.computation import (
-    BaseComputation
-)
-from eth.vm.opcode import (
-    Opcode,
-)
+from eth.vm.computation import BaseComputation
+from eth.vm.message import Message
+from eth.vm.opcode import Opcode
 
 from .call import max_child_gas_eip150
 
@@ -193,13 +190,16 @@ def __call__(self, computation: BaseComputation) -> None:
             code=call_data,
             create_address=contract_address,
         )
+        self.apply_create_message(computation, child_msg)
 
+    def apply_create_message(self, computation: BaseComputation, child_msg: Message) -> None:
         child_computation = computation.apply_child_computation(child_msg)
 
         if child_computation.is_error:
             computation.stack_push(0)
         else:
-            computation.stack_push(contract_address)
+            computation.stack_push(child_msg.storage_address)
+
         computation.return_gas(child_computation.get_gas_remaining())
 
 
@@ -240,3 +240,22 @@ def generate_contract_address(self,
             stack_data.salt,
             call_data
         )
+
+    def apply_create_message(self, computation: BaseComputation, child_msg: Message) -> None:
+        # We need to ensure that creation operates on empty storage **and**
+        # that if the initialization code fails that we revert the account back
+        # to its original state root.
+        snapshot = computation.state.snapshot()
+
+        computation.state.account_db.delete_storage(child_msg.storage_address)
+
+        child_computation = computation.apply_child_computation(child_msg)
+
+        if child_computation.is_error:
+            computation.state.revert(snapshot)
+            computation.stack_push(0)
+        else:
+            computation.state.commit(snapshot)
+            computation.stack_push(child_msg.storage_address)
+
+        computation.return_gas(child_computation.get_gas_remaining())

tests/conftest.py

@@ -23,10 +23,13 @@
 # Uncomment this to have logs from tests written to a file.  This is useful for
 # debugging when you need to dump the VM output from test runs.
 """
+import datetime
+import logging
+import os
+from eth.tools.logging import TRACE_LEVEL_NUM
+
 @pytest.yield_fixture(autouse=True)
 def _file_logging(request):
-    import datetime
-    import os
 
     logger = logging.getLogger('eth')
 

tests/json-fixtures/test_transactions.py

@@ -28,6 +28,9 @@
 from eth.vm.forks.byzantium.transactions import (
     ByzantiumTransaction
 )
+from eth.vm.forks.constantinople.transactions import (
+    ConstantinopleTransaction
+)
 
 from eth_typing.enums import (
     ForkName
@@ -92,7 +95,7 @@ def fixture_transaction_class(fixture_data):
     elif fork_name == ForkName.Byzantium:
         return ByzantiumTransaction
     elif fork_name == ForkName.Constantinople:
-        pytest.skip("Constantinople Transaction class has not been implemented")
+        return ConstantinopleTransaction
     elif fork_name == ForkName.Metropolis:
         pytest.skip("Metropolis Transaction class has not been implemented")
     else:

tox.ini

@@ -3,7 +3,7 @@ envlist=
     py{35,36}-{core,database,transactions,vm}
     py{36}-{benchmark,p2p,trinity,lightchain_integration,beacon}
     py{36}-rpc-blockchain
-    py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,quadratic}
+    py{36}-rpc-state-{frontier,homestead,eip150,eip158,byzantium,constantinople,quadratic}
     py{35,36}-native-blockchain-{frontier,homestead,eip150,eip158,byzantium,constantinople,metropolis,transition}
     py37-{core,trinity,trinity-integration,beacon}
     py{35,36}-lint
@@ -32,6 +32,8 @@ commands=
     beacon: pytest {posargs:tests/beacon/}
     # The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
     rpc-state-byzantium: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
+    # Uncomment the next line + modify test_rpc_fixtures.py when Constantinople is included in the mainnet config
+    rpc-state-constantinople: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Constantinople'}
     rpc-state-quadratic: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and stQuadraticComplexityTest'}
     transactions: pytest {posargs:tests/json-fixtures/test_transactions.py}
     vm: pytest {posargs:tests/json-fixtures/test_virtual_machine.py}