Update fixtures to the v6.0.0-beta.3 release (#1644)

* Fix exception during fixture failures
* Add ByzantiumToConstantinopleAt5 network
* Check for DAO extradata while running blockchain tests
* extcodehash should treat empty accounts as non-existent

Author: lithp

eth/tools/fixtures/helpers.py

@@ -24,6 +24,9 @@
 from eth.chains.base import (
     BaseChain,
 )
+from eth.chains.mainnet import (
+    MainnetDAOValidatorVM,
+)
 from eth.db.account import (
     BaseAccountDB,
 )
@@ -141,7 +144,7 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
             (5, TangerineWhistleVM),
         )
     elif network == 'HomesteadToDaoAt5':
-        HomesteadVM = BaseHomesteadVM.configure(
+        HomesteadVM = MainnetDAOValidatorVM.configure(
             support_dao_fork=True,
             _dao_fork_block_number=5,
         )
@@ -153,6 +156,11 @@ def chain_vm_configuration(fixture: Dict[str, Any]) -> Iterable[Tuple[int, Type[
             (0, SpuriousDragonVM),
             (5, ByzantiumVM),
         )
+    elif network == 'ByzantiumToConstantinopleAt5':
+        return (
+            (0, ByzantiumVM),
+            (5, ConstantinopleVM),
+        )
     else:
         raise ValueError("Network {0} does not match any known VM rules".format(network))
 

eth/vm/logic/context.py

@@ -151,7 +151,7 @@ def extcodehash(computation: BaseComputation) -> None:
     account = force_bytes_to_address(computation.stack_pop(type_hint=constants.BYTES))
     account_db = computation.state.account_db
 
-    if not account_db.account_exists(account):
+    if account_db.account_is_empty(account):
         computation.stack_push(constants.NULL_BYTE)
     else:
         computation.stack_push(account_db.get_code_hash(account))

fixtures

@@ -42,6 +42,7 @@
 ADDRESS_WITH_CODE = ("0xddd722f3947def4cf144679da39c4c32bdc35681", b'pseudocode')
 EMPTY_ADDRESS_IN_STATE = NORMALIZED_ADDRESS_A
 ADDRESS_NOT_IN_STATE = NORMALIZED_ADDRESS_B
+ADDRESS_WITH_JUST_BALANCE = "0x0000000000000000000000000000000000000001"
 CANONICAL_ADDRESS_A = to_canonical_address("0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6")
 CANONICAL_ADDRESS_B = to_canonical_address("0xcd1722f3947def4cf144679da39c4c32bdc35681")
 GENESIS_HEADER = BlockHeader(
@@ -86,6 +87,8 @@ def prepare_general_computation(vm_class, create_address=None, code=b''):
     computation.state.account_db.touch_account(decode_hex(EMPTY_ADDRESS_IN_STATE))
     computation.state.account_db.set_code(decode_hex(ADDRESS_WITH_CODE[0]), ADDRESS_WITH_CODE[1])
 
+    computation.state.account_db.set_balance(decode_hex(ADDRESS_WITH_JUST_BALANCE), 1)
+
     return computation
 
 
@@ -446,6 +449,11 @@ def test_sar(vm_class, val1, val2, expected):
         (
             ConstantinopleVM,
             EMPTY_ADDRESS_IN_STATE,
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+        ),
+        (
+            ConstantinopleVM,
+            ADDRESS_WITH_JUST_BALANCE,
             '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470',
         ),
         (

tests/core/opcodes/test_opcodes.py

@@ -226,7 +226,7 @@ def test_blockchain_fixtures(fixture_data, fixture):
     try:
         chain = new_chain_from_fixture(fixture)
     except ValueError as e:
-        raise AssertionError("could not load chain for %r" % fixture_data) from e
+        raise AssertionError("could not load chain for {}".format((fixture_data,))) from e
 
     genesis_params = genesis_params_from_fixture(fixture)
     expected_genesis_header = BlockHeader(**genesis_params)
@@ -274,7 +274,6 @@ def test_blockchain_fixtures(fixture_data, fixture):
     latest_block_hash = chain.get_canonical_block_by_number(chain.get_block().number - 1).hash
     if latest_block_hash != fixture['lastblockhash']:
         verify_account_db(fixture['postState'], chain.get_vm().state.account_db)
-        assert False, 'the state must be different if the hashes are'
 
     for block, mined_block in mined_blocks:
         assert_mined_block_unchanged(block, mined_block)