Fixed a bunch of state tests

Author: vub

ethereum/new_statetest_utils.py

@@ -8,9 +8,10 @@
 import ethereum.state_transition as state_transition
 import copy
 
-#from ethereum.slogging import LogRecorder, configure_logging, set_level
-#config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
-#configure_logging(config_string=config_string)
+from ethereum.slogging import LogRecorder, configure_logging, set_level
+config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
+
+# configure_logging(config_string=config_string)
 
 fake_headers = {}
 
@@ -30,6 +31,18 @@ def mk_fake_header(blknum):
 
 konfig = copy.copy(default_config)
 
+konfig_homestead = copy.copy(konfig)
+konfig_homestead["HOMESTEAD_FORK_BLKNUM"] = 0
+konfig_homestead["ANTI_DOS_FORK_BLKNUM"] = 2**99
+konfig_homestead["CLEARING_FORK_BLKNUM"] = 2**99
+konfig_homestead["METROPOLIS_FORK_BLKNUM"] = 2**99
+
+konfig_tangerine = copy.copy(konfig)
+konfig_tangerine["HOMESTEAD_FORK_BLKNUM"] = 0
+konfig_tangerine["ANTI_DOS_FORK_BLKNUM"] = 0
+konfig_tangerine["CLEARING_FORK_BLKNUM"] = 2**99
+konfig_tangerine["METROPOLIS_FORK_BLKNUM"] = 2**99
+
 konfig_spurious = copy.copy(konfig)
 konfig_spurious["HOMESTEAD_FORK_BLKNUM"] = 0
 konfig_spurious["ANTI_DOS_FORK_BLKNUM"] = 0
@@ -43,6 +56,8 @@ def mk_fake_header(blknum):
 konfig_metropolis["METROPOLIS_FORK_BLKNUM"] = 0
 
 configs = {
+    #"Homestead": konfig_homestead,
+    "EIP150": konfig_tangerine,
     "EIP158": konfig_spurious,
     "Metropolis": konfig_metropolis
 }
@@ -115,6 +130,6 @@ def verify_state_test(test):
         for result in results:
             computed = compute_state_test_unit(_state, test["transaction"], result["indexes"], configs[config_name])
             if computed["hash"] != result["hash"]:
-                raise Exception("Hash mismatch: %s computed % supplied" % (computed["hash"], result["hash"]))
+                raise Exception("Hash mismatch, computed: %s, supplied: %s" % (computed["hash"], result["hash"]))
             else:
                 print("Hash matched!: %s" % computed["hash"])

ethereum/processblock.py

@@ -72,7 +72,7 @@ def _apply_msg(ext, msg, code):
     if trace_msg:
         log_msg.debug("MSG APPLY", sender=encode_hex(msg.sender), to=encode_hex(msg.to),
                       gas=msg.gas, value=msg.value,
-                      data=encode_hex(msg.data.extract_all()))
+                      data=encode_hex(msg.data.extract_all()) if msg.data.size < 2500 else ("data<%d>" % msg.data.size))
         if log_state.is_active('trace'):
             log_state.trace('MSG PRE STATE SENDER', account=encode_hex(msg.sender),
                             bal=ext.get_balance(msg.sender),
@@ -97,7 +97,7 @@ def _apply_msg(ext, msg, code):
     # assert utils.is_numeric(gas)
     if trace_msg:
         log_msg.debug('MSG APPLIED', gas_remained=gas,
-                      sender=encode_hex(msg.sender), to=encode_hex(msg.to), data=dat)
+                      sender=encode_hex(msg.sender), to=encode_hex(msg.to), data=dat if len(dat) < 2500 else ("data<%d>" % len(dat)))
         if log_state.is_active('trace'):
             log_state.trace('MSG POST STATE SENDER', account=encode_hex(msg.sender),
                             bal=ext.get_balance(msg.sender),
@@ -118,40 +118,30 @@ def create_contract(ext, msg):
     #print('CREATING WITH GAS', msg.gas)
     sender = decode_hex(msg.sender) if len(msg.sender) == 40 else msg.sender
     code = msg.data.extract_all()
-    if ext.post_metropolis_hardfork():
-        msg.to = mk_metropolis_contract_address(msg.sender, code)
-        if ext.get_code(msg.to):
-            if ext.get_nonce(msg.to) >= 2**40:
-                ext.set_nonce(msg.to, (ext.get_nonce(msg.to) + 1) % 2**160)
-                msg.to = normalize_address((ext.get_nonce(msg.to) - 1) % 2**160)
-            else:
-                ext.set_nonce(msg.to, (big_endian_to_int(msg.to) + 2) % 2**160)
-                msg.to = normalize_address((ext.get_nonce(msg.to) - 1) % 2**160)
-    else:
-        if ext.tx_origin != msg.sender:
-            ext.increment_nonce(msg.sender)
-        nonce = utils.encode_int(ext.get_nonce(msg.sender) - 1)
-        msg.to = mk_contract_address(sender, nonce)
+    if ext.tx_origin != msg.sender:
+        ext.increment_nonce(msg.sender)
+    nonce = utils.encode_int(ext.get_nonce(msg.sender) - 1)
+    msg.to = mk_contract_address(sender, nonce)
     b = ext.get_balance(msg.to)
     if b > 0:
         ext.set_balance(msg.to, b)
         ext.set_nonce(msg.to, 0)
         ext.set_code(msg.to, b'')
-        ext.reset_storage(msg.to)
+        # ext.reset_storage(msg.to)
     msg.is_create = True
     # assert not ext.get_code(msg.to)
     msg.data = vm.CallData([], 0, 0)
     snapshot = ext.snapshot()
     ext.set_nonce(msg.to, 1 if ext.post_clearing_hardfork() else 0)
     res, gas, dat = _apply_msg(ext, msg, code)
     assert utils.is_numeric(gas)
-    log_msg.debug('CONTRACT CREATION FINISHED', res=res, gas=gas, dat=dat)
+    log_msg.debug('CONTRACT CREATION FINISHED', res=res, gas=gas, dat=dat if len(dat) < 2500 else ("data<%d>" % len(dat)))
 
     if res:
         if not len(dat):
             return 1, gas, msg.to
         gcost = len(dat) * opcodes.GCONTRACTBYTE
-        if gas >= gcost and len(dat) < 24000:
+        if gas >= gcost and (len(dat) <= 24576 or not ext.post_anti_dos_hardfork()):
             gas -= gcost
         else:
             dat = []

ethereum/state.py

@@ -11,6 +11,7 @@
 from ethereum.config import default_config, Env
 from ethereum.block import FakeHeader
 from ethereum.db import BaseDB, EphemDB, OverlayDB
+from ethereum.specials import specials as default_specials
 import copy
 import sys
 if sys.version_info.major == 2:
@@ -252,7 +253,7 @@ def commit(self, allow_empties=False):
                 if not acct.deleted:
                     acct._cached_rlp = None
                     # print 'moose', addr.encode('hex'), self.is_CLEARING(), acct.is_blank(), acct.nonce, acct.balance, repr(acct.code)
-                    if self.is_CLEARING() and acct.is_blank() and not allow_empties:
+                    if self.is_CLEARING() and acct.is_blank() and not allow_empties and addr not in default_specials:
                         self.trie.delete(addr)
                     else:
                         self.trie.update(addr, rlp.encode(acct))
@@ -292,11 +293,11 @@ def add_log(self, log):
     # Returns a value x, where State.revert(x) at any later point will return
     # you to the point at which the snapshot was made (unless journal_reset was called).
     def snapshot(self):
-        return (self.trie.root_hash, len(self.journal))
+        return (self.trie.root_hash, len(self.journal), {k: copy.copy(getattr(self, k)) for k in STATE_DEFAULTS})
 
     # Reverts to the provided snapshot
     def revert(self, snapshot):
-        root, journal_length = snapshot
+        root, journal_length, auxvars = snapshot
         if root != self.trie.root_hash and journal_length != 0:
             raise Exception("Cannot return to this snapshot")
         if root != self.trie.root_hash:
@@ -314,6 +315,8 @@ def revert(self, snapshot):
                 self.cache[addr][key] = preval
                 if not premod:
                     del self.modified[addr]
+        for k in STATE_DEFAULTS:
+            setattr(self, k, copy.copy(auxvars[k]))
 
     # Prints the state for a single account
     def account_to_dict(self, address):

ethereum/state_transition.py

@@ -236,7 +236,7 @@ def rp(what, actual, target):
             if tx.startgas < intrinsic_gas:
                 raise InsufficientStartGas(rp('startgas', tx.startgas, intrinsic_gas))
 
-    log_tx.debug('TX NEW', tx_dict=tx.log_dict())
+    log_tx.debug('TX NEW', tx_dict=tx.log_dict(abbrev=True))
     # start transacting #################
     state.increment_nonce(tx.sender)
 

ethereum/tests/test_state.py

@@ -11,26 +11,31 @@
     configure_logging(':trace')
     sys.argv.remove('--trace')
 
-if '--new' in sys.argv:  # not default
-    checker = new_statetest_utils.verify_state_test
-    sys.argv.remove('--new')
+if '--old' in sys.argv:  # not default
+    checker = lambda x: testutils.check_state_test(testutils.fixture_to_bytes(x))
+    place_to_check = 'StateTests'
+    sys.argv.remove('--old')
 else:
-    checker = testutils.check_state_test
+    checker = new_statetest_utils.verify_state_test
+    place_to_check = 'GeneralStateTests'
 
 
 def test_state(filename, testname, testdata):
     logger.debug('running test:%r in %r' % (testname, filename))
-    checker(testutils.fixture_to_bytes(testdata))
+    checker(testdata)
 
 
 def pytest_generate_tests(metafunc):
     testutils.generate_test_params(
-        'StateTests',
+        place_to_check,
         metafunc,
-        lambda filename, _, __: (
-            'stQuadraticComplexityTest.json' in filename or
-            'stMemoryStressTest.json' in filename or
-            'stPreCompiledContractsTransaction.json' in filename
+        exclude_func=lambda filename, _, __: (
+            'stQuadraticComplexityTest' in filename or
+            'stMemoryStressTest' in filename or
+            'stMemoryTest' in filename or
+            'CALLCODE_Bounds3.json' in filename or
+            'stPreCompiledContractsTransaction.json' in filename or
+            'MLOAD_Bounds.json' in filename
         )
     )
 

ethereum/transactions.py

@@ -149,11 +149,11 @@ def to_dict(self):
         d['hash'] = encode_hex(self.hash)
         return d
 
-    def log_dict(self):
+    def log_dict(self, abbrev=False):
         d = self.to_dict()
         d['sender'] = encode_hex(d['sender'] or '')
         d['to'] = encode_hex(d['to'])
-        d['data'] = encode_hex(d['data'])
+        d['data'] = encode_hex(d['data']) if len(d['data']) < 2500 or not abbrev else "data<%d>" % len(d['data'])
         return d
 
     @property

ethereum/vm.py

@@ -245,11 +245,10 @@ def vm_execute(ext, msg, code):
             if steps == 0:
                 trace_data['depth'] = msg.depth
                 trace_data['address'] = msg.to
-            trace_data['op'] = op
             trace_data['steps'] = steps
             if op[:4] == 'PUSH':
                 trace_data['pushvalue'] = pushval
-            log_vm_op.trace('vm', **trace_data)
+            log_vm_op.trace('vm', op=op, **trace_data)
             steps += 1
             _prevop = op
 
@@ -702,7 +701,7 @@ def vm_execute(ext, msg, code):
             ext.set_balance(to, ext.get_balance(to) + xfer)
             ext.set_balance(msg.to, 0)
             ext.add_suicide(msg.to)
-            # print('suiciding %s %s %d' % (msg.to, to, xfer))
+            print('suiciding %s %s %d' % (msg.to, to, xfer))
             return 1, compustate.gas, []
 
         # assert utils.is_numeric(compustate.gas)