Update state tests

eth/tools/builder/chain/builders.py

@@ -24,13 +24,13 @@
 from eth.validation import (
  validate_vm_configuration,
 )
-from eth.tools.fixtures.normalization import (
- normalize_state,
-)
 from eth.tools.mining import POWMiningMixin
 from eth.tools._utils.mappings import (
  deep_merge,
 )
+from eth.tools._utils.normalization import (
+ normalize_state,
+)
 from eth.vm.forks import (
  FrontierVM,
  HomesteadVM,

eth/tools/fixtures/fillers/common.py

@@ -25,7 +25,7 @@
 from eth.tools.fixtures.helpers import (
  get_test_name,
 )
-from eth.tools.fixtures.normalization import (
+from eth.tools._utils.normalization import (
  normalize_environment,
  normalize_execution,
  normalize_state,

eth/tools/fixtures/fillers/state.py

@@ -12,7 +12,7 @@
 from eth.tools.fixtures.helpers import (
  get_test_name,
 )
-from eth.tools.fixtures.normalization import (
+from eth.tools._utils.normalization import (
  normalize_environment,
  normalize_networks,
  normalize_state,

eth/tools/fixtures/fillers/vm.py

@@ -1,7 +1,7 @@
 from eth.tools.fixtures.helpers import (
  get_test_name,
 )
-from eth.tools.fixtures.normalization import (
+from eth.tools._utils.normalization import (
  normalize_bytes,
  normalize_call_creates,
  normalize_environment,

eth/tools/fixtures/helpers.py

@@ -10,6 +10,9 @@
 
 from eth import MainnetChain
 from eth.db.atomic import AtomicDB
+from eth.tools.builder.chain import (
+ disable_pow_check,
+)
 from eth.utils.state import (
  diff_account_db,
 )
@@ -156,6 +159,9 @@ def new_chain_from_fixture(fixture, chain_cls=MainnetChain):
  vm_configuration=vm_config,
  )
 
+ if 'sealEngine' in fixture and fixture['sealEngine'] == 'NoProof':
+ ChainFromFixture = disable_pow_check(ChainFromFixture)
+
  return ChainFromFixture.from_genesis(
  base_db,
  genesis_params=genesis_params_from_fixture(fixture),

eth/tools/fixtures/normalization.py

@@ -495,6 +495,9 @@ def normalize_blockchain_fixtures(fixture):
  'network': fixture['network'],
  }
 
+ if 'sealEngine' in fixture:
+ normalized_fixture['sealEngine'] = fixture['sealEngine']
+
  if 'genesisRLP' in fixture:
  normalized_fixture['genesisRLP'] = decode_hex(fixture['genesisRLP'])
 

tests/core/fixture-tools/test_normalize_state.py

@@ -5,7 +5,7 @@
  ValidationError,
 )
 
-from eth.tools.fixtures.normalization import normalize_state
+from eth.tools._utils.normalization import normalize_state
 
 
 ADDRESS_A = b'a' + b'\0' * 19

tests/json-fixtures/test_state.py

@@ -273,6 +273,13 @@ def fixture_vm_class(fixture_data):
  raise ValueError("Unknown Fork Name: {0}".format(fork_name))
 
 
+PRE_STATE_CLEARING_VMS = (
+ FrontierVMForTesting,
+ HomesteadVMForTesting,
+ TangerineWhistleVMForTesting,
+)
+
+
 def test_state_fixtures(fixture, fixture_vm_class):
  header = BlockHeader(
  coinbase=fixture['env']['currentCoinbase'],
@@ -320,19 +327,44 @@ def test_state_fixtures(fixture, fixture_vm_class):
  r=r,
  s=s,
  )
+ else:
+ raise Exception("Invariant: No transaction specified")
 
  try:
  header, receipt, computation = vm.apply_transaction(vm.block.header, transaction)
- transactions = vm.block.transactions + (transaction, )
- receipts = vm.block.get_receipts(chaindb) + (receipt, )
- block = vm.set_block_transactions(vm.block, header, transactions, receipts)
  except ValidationError as err:
- block = vm.block
- transaction_error = err
  logger.warning("Got transaction error", exc_info=True)
+ transaction_error = err
  else:
  transaction_error = False
 
+ transactions = vm.block.transactions + (transaction, )
+ receipts = vm.block.get_receipts(chaindb) + (receipt, )
+ vm.block = vm.set_block_transactions(vm.block, header, transactions, receipts)
+ finally:
+ # This is necessary due to the manner in which the state tests are
+ # generated. State tests are generated from the BlockChainTest tests
+ # in which these transactions are included in the larger context of a
+ # block and thus, the mechanisms which would touch/create/clear the
+ # coinbase account based on the mining reward are present during test
+ # generation, but not part of the execution, thus we must artificially
+ # create the account in VMs prior to the state clearing rules,
+ # as well as conditionally cleaning up the coinbase account when left
+ # empty in VMs after the state clearing rules came into effect.
+ # Related change in geth:
+ # https://github.com/ethereum/go-ethereum/commit/32f28a9360d26a661d55915915f12fd3c70f012b#diff-f53696be8527ac422b8d4de7c8e945c1R149 # noqa: E501
+
+ if isinstance(vm, PRE_STATE_CLEARING_VMS):
+ state.account_db.touch_account(vm.block.header.coinbase)
+ state.account_db.persist()
+ vm.block = vm.block.copy(header=vm.block.header.copy(state_root=state.state_root))
+ elif state.account_db.account_is_empty(vm.block.header.coinbase):
+ state.account_db.delete_account(vm.block.header.coinbase)
+ state.account_db.persist()
+ vm.block = vm.block.copy(header=vm.block.header.copy(state_root=state.state_root))
+
+ block = vm.block
+
  if not transaction_error:
  log_entries = computation.get_log_entries()
  actual_logs_hash = hash_log_entries(log_entries)