Passing state and block tests

Author: vub

ethereum/config.py

@@ -44,7 +44,7 @@
     # Blank account initial nonce
     ACCOUNT_INITIAL_NONCE=0,
     # Homestead fork (500k on livenet?)
-    HOMESTEAD_FORK_BLKNUM=900000,
+    HOMESTEAD_FORK_BLKNUM=1000000,
     HOMESTEAD_DIFF_ADJUSTMENT_CUTOFF=10,
 )
 assert default_config['NEPHEW_REWARD'] == \

ethereum/processblock.py

@@ -228,19 +228,20 @@ def _apply_msg(ext, msg, code):
                       gas=msg.gas, value=msg.value,
                       data=encode_hex(msg.data.extract_all()))
         if log_state.is_active('trace'):
-            log_state.trace('MSG PRE STATE SENDER', account=msg.sender,
+            log_state.trace('MSG PRE STATE SENDER', account=msg.sender.encode('hex'),
                             bal=ext.get_balance(msg.sender),
                             state=ext.log_storage(msg.sender))
-            log_state.trace('MSG PRE STATE RECIPIENT', account=msg.to,
+            log_state.trace('MSG PRE STATE RECIPIENT', account=msg.to.encode('hex'),
                             bal=ext.get_balance(msg.to),
                             state=ext.log_storage(msg.to))
         # log_state.trace('CODE', code=code)
     # Transfer value, instaquit if not enough
     snapshot = ext._block.snapshot()
-    if not ext._block.transfer_value(msg.sender, msg.to, msg.value):
-        log_msg.debug('MSG TRANSFER FAILED', have=ext.get_balance(msg.to),
-                      want=msg.value)
-        return 1, msg.gas, []
+    if msg.transfers_value:
+        if not ext._block.transfer_value(msg.sender, msg.to, msg.value):
+            log_msg.debug('MSG TRANSFER FAILED', have=ext.get_balance(msg.to),
+                          want=msg.value)
+            return 1, msg.gas, []
     # Main loop
     if msg.code_address in specials.specials:
         res, gas, dat = specials.specials[msg.code_address](ext, msg)
@@ -252,10 +253,10 @@ def _apply_msg(ext, msg, code):
         log_msg.debug('MSG APPLIED', gas_remained=gas,
                       sender=msg.sender, to=msg.to, data=dat)
         if log_state.is_active('trace'):
-            log_state.trace('MSG PRE STATE SENDER', account=msg.sender,
+            log_state.trace('MSG POST STATE SENDER', account=msg.sender.encode('hex'),
                             bal=ext.get_balance(msg.sender),
                             state=ext.log_storage(msg.sender))
-            log_state.trace('MSG PRE STATE RECIPIENT', account=msg.to,
+            log_state.trace('MSG POST STATE RECIPIENT', account=msg.to.encode('hex'),
                             bal=ext.get_balance(msg.to),
                             state=ext.log_storage(msg.to))
 
@@ -267,6 +268,7 @@ def _apply_msg(ext, msg, code):
 
 
 def create_contract(ext, msg):
+    log_msg.debug('CONTRACT CREATION')
     #print('CREATING WITH GAS', msg.gas)
     sender = decode_hex(msg.sender) if len(msg.sender) == 40 else msg.sender
     if ext.tx_origin != msg.sender:
@@ -295,7 +297,7 @@ def create_contract(ext, msg):
             gas -= gcost
         else:
             dat = []
-            log_msg.debug('CONTRACT CREATION OOG', have=gas, want=gcost)
+            log_msg.debug('CONTRACT CREATION OOG', have=gas, want=gcost, block_number=ext._block.number)
             if ext._block.number >= ext._block.config['HOMESTEAD_FORK_BLKNUM']:
                 ext._block.revert(snapshot)
                 return 0, 0, b''

ethereum/tests/test_blocks.py

@@ -72,6 +72,7 @@ def run_block_test(params, config_overrides = {}):
     old_config = copy.deepcopy(env.config)
     for k, v in config_overrides.items():
         env.config[k] = v
+    b2 = None
     for blk in params["blocks"]:
         if 'blockHeader' not in blk:
             try:
@@ -91,7 +92,8 @@ def run_block_test(params, config_overrides = {}):
             assert b2.validate_uncles()
             blockmap[b2.hash] = b2
             env.db.put(b2.hash, rlp.encode(b2))
-        print 'Block %d with state root %s' % (b2.number, b2.state.root_hash.encode('hex'))
+        if b2:
+            print 'Block %d with state root %s' % (b2.number, b2.state.root_hash.encode('hex'))
         # blkdict = b.to_dict(False, True, False, True)
         # assert blk["blockHeader"] == \
         #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])
@@ -106,7 +108,7 @@ def run_block_test(params, config_overrides = {}):
 
 def do_test_block(filename, testname=None, testdata=None, limit=99999999):
     print('\nrunning test:%r in %r' % (testname, filename))
-    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0} if 'Homestead' in filename else {})
+    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
 
 excludes = [('bcWalletTest.json', u'walletReorganizeOwners'),
             ('bl10251623GO.json', u'randomBlockTest'),
@@ -122,13 +124,13 @@ def do_test_block(filename, testname=None, testdata=None, limit=99999999):
             for testname, testdata in list(tests.items()):
                 if testname == sys.argv[2]:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0} if 'Homestead' in filename else {})
+                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
     else:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if (filename.split('/')[-1], testname) not in excludes:
                     print("Testing: %s %s" % (filename, testname))
-                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0} if 'Homestead' in filename else {})
+                    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
 else:
     fixtures = testutils.get_tests_from_file_or_dir(
         os.path.join(testutils.fixture_path, 'BlockchainTests'))

ethereum/vm.py

@@ -55,8 +55,8 @@ def extract_copy(self, mem, memstart, datastart, size):
 
 class Message(object):
 
-    def __init__(self, sender, to, value, gas, data,
-                 depth=0, code_address=None, is_create=False):
+    def __init__(self, sender, to, value, gas, data, depth=0, 
+            code_address=None, is_create=False, transfers_value=True):
         self.sender = sender
         self.to = to
         self.value = value
@@ -66,6 +66,7 @@ def __init__(self, sender, to, value, gas, data,
         self.logs = []
         self.code_address = code_address
         self.is_create = is_create
+        self.transfers_value = transfers_value
 
     def __repr__(self):
         return '<Message(to:%s...)>' % self.to[:8]
@@ -555,7 +556,7 @@ def vm_execute(ext, msg, code):
                 cd = CallData(mem, meminstart, meminsz)
                 if ext.post_homestead_hardfork() and op == 'DELEGATECALL':
                     call_msg = Message(msg.sender, msg.to, msg.value, submsg_gas, cd,
-                                       msg.depth + 1, code_address=to)
+                                       msg.depth + 1, code_address=to, transfers_value=False)
                 elif op == 'DELEGATECALL':
                     return vm_exception('OPCODE INACTIVE')
                 else: