Passing all vm and state tests again

Author: vub

ethereum/blocks.py

@@ -991,7 +991,7 @@ def get_storage_data(self, address, index):
         if len(bytez) >= 32:
             return big_endian_to_int(bytez[-32:])
         else:
-            return big_endian_to_int(bytez) * (1 << (8 * (32 - len(bytez))))
+            return big_endian_to_int(bytez)
 
     def set_storage_data(self, address, index, value):
         """Set a specific item in the storage of an account.
@@ -1112,9 +1112,9 @@ def account_to_dict(self, address, with_storage_root=False,
                 v2 = subcache.get(utils.big_endian_to_int(k), None)
                 hexkey = b'0x' + encode_hex(utils.zunpad(k))
                 if v2 is not None:
-                    if v2 != 0:
+                    if v2 != '':
                         med_dict['storage'][hexkey] = \
-                            b'0x' + encode_hex(utils.int_to_big_endian(v2))
+                            b'0x' + encode_hex(v2)
                 elif v is not None:
                     med_dict['storage'][hexkey] = b'0x' + encode_hex(rlp.decode(v))
 

ethereum/processblock.py

@@ -146,6 +146,7 @@ def rp(what, actual, target):
         return '%r: %r actual:%r target:%r' % (tx, what, actual, target)
 
     intrinsic_gas = tx.intrinsic_gas_used
+    print 'b1', block.get_balance(tx.sender)
     if block.number >= block.config['HOMESTEAD_FORK_BLKNUM']:
         assert tx.s * 2 < transactions.secpk1n
         if not tx.to or tx.to == CREATE_CONTRACT_ADDRESS:
@@ -164,6 +165,7 @@ def rp(what, actual, target):
     message_data = vm.CallData([safe_ord(x) for x in tx.data], 0, len(tx.data))
     message = vm.Message(tx.sender, tx.to, tx.value, message_gas, message_data, code_address=tx.to)
 
+    print 'b2', block.get_balance(tx.sender)
     # MESSAGE
     ext = VMExt(block, tx)
     if tx.to and tx.to != CREATE_CONTRACT_ADDRESS:
@@ -213,6 +215,7 @@ def rp(what, actual, target):
         block.del_account(s)
     block.add_transaction_to_list(tx)
     block.logs = []
+    print 'b3', block.get_balance(tx.sender), success
     return success, output
 
 
@@ -308,7 +311,7 @@ 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._block.number >= ext._block.METROPOLIS_FORK_BLKNUM:
+    if ext._block.number >= ext._block.config["METROPOLIS_FORK_BLKNUM"]:
         msg.to = mk_metropolis_contract_address(msg.sender, code)
         if ext.get_code(msg.to):
             if ext.get_nonce(msg.to) >= 2**40:

ethereum/specials.py

@@ -55,7 +55,7 @@ def proc_ecrecover(ext, msg):
 
         pub = pk.serialize(compressed=False)
     except:
-        recovered_addr = bitcoin.ecdsa_raw_recover(h, (v, r, s))
+        recovered_addr = bitcoin.ecdsa_raw_recover(message_hash, (v, r, s))
         if recovered_addr in (False, (0, 0)):
             return 1, msg.gas - gas_cost, []
         pub = bitcoin.encode_pubkey(recovered_addr, 'bin')

ethereum/testutils.py

@@ -30,7 +30,7 @@
 }
 
 # 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'
+# 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)
 
 FILL = 1
@@ -157,7 +157,7 @@ def run_vm_test(params, mode, profiler=None):
         for k, v in h['storage'].items():
             blk.set_storage_data(address,
                                  utils.big_endian_to_int(decode_hex(k[2:])),
-                                 zpad(decode_hex(v[2:]), 32))
+                                 decode_hex(v[2:]))
 
     # execute transactions
     sender = decode_hex(exek['caller'])  # a party that originates a call
@@ -297,6 +297,7 @@ def run_state_test(params, mode):
         gas_limit=parse_int_or_hex(env['currentGasLimit']),
         timestamp=parse_int_or_hex(env['currentTimestamp']))
     blk = blocks.Block(header, env=db_env)
+    blk.config['HOMESTEAD_FORK_BLKNUM'] = 1000000
 
     # setup state
     for address, h in list(pre.items()):
@@ -309,7 +310,7 @@ def run_state_test(params, mode):
         for k, v in h['storage'].items():
             blk.set_storage_data(address,
                                  utils.big_endian_to_int(decode_hex(k[2:])),
-                                 zpad(decode_hex(v[2:]), 32))
+                                 decode_hex(v[2:]))
 
     for address, h in list(pre.items()):
         address = decode_hex(address)
@@ -360,15 +361,22 @@ def blkhash(n):
             assert False
 
         time_pre = time.time()
+        blk.commit_state()
+        snapshot = blk.snapshot()
         try:
             print('trying')
             success, output = pb.apply_transaction(blk, tx)
+            assert success
             blk.commit_state()
             print('success', blk.get_receipts()[-1].gas_used)
         except InvalidTransaction:
             success, output = False, b''
             blk.commit_state()
             pass
+        except AssertionError:
+            success, output = False, b''
+            blk.commit_state()
+            pass
         time_post = time.time()
 
         if tx.to == b'':
@@ -392,11 +400,13 @@ def blkhash(n):
         compare_post_states(shouldbe, reallyis)
         for k in ['pre', 'exec', 'env', 'callcreates',
                   'out', 'gas', 'logs', 'postStateRoot']:
-            shouldbe = params1.get(k, None)
-            reallyis = params2.get(k, None)
-            if shouldbe != reallyis:
+            _shouldbe = params1.get(k, None)
+            _reallyis = params2.get(k, None)
+            if _shouldbe != _reallyis:
+                print 's', shouldbe
+                print 'r', reallyis
                 raise Exception("Mismatch: " + k + ':\n shouldbe %r\n reallyis %r' %
-                                (shouldbe, reallyis))
+                                (_shouldbe, _reallyis))
 
     elif mode == TIME:
         return time_post - time_pre

ethereum/transactions.py

@@ -1,6 +1,6 @@
 # -*- coding: utf8 -*-
 import rlp
-from bitcoin import encode_pubkey, N, encode_privkey
+from bitcoin import encode_pubkey, N, encode_privkey, ecdsa_raw_sign
 from rlp.sedes import big_endian_int, binary
 from rlp.utils import encode_hex, str_to_bytes, ascii_chr
 try:
@@ -133,14 +133,17 @@ def sign(self, key):
             # we need a binary key
             key = encode_privkey(key, 'bin')
 
-        pk = PrivateKey(key, raw=True)
-        signature = pk.ecdsa_recoverable_serialize(
-            pk.ecdsa_sign_recoverable(rawhash, raw=True)
-        )
-        signature = signature[0] + utils.bytearray_to_bytestr([signature[1]])
-        self.v = utils.safe_ord(signature[64]) + 27
-        self.r = big_endian_to_int(signature[0:32])
-        self.s = big_endian_to_int(signature[32:64])
+        try:
+            pk = PrivateKey(key, raw=True)
+            signature = pk.ecdsa_recoverable_serialize(
+                pk.ecdsa_sign_recoverable(rawhash, raw=True)
+            )
+            signature = signature[0] + utils.bytearray_to_bytestr([signature[1]])
+            self.v = utils.safe_ord(signature[64]) + 27
+            self.r = big_endian_to_int(signature[0:32])
+            self.s = big_endian_to_int(signature[32:64])
+        except:
+            self.v, self.r, self.s = ecdsa_raw_sign(rawhash, key)
 
         self.sender = utils.privtoaddr(key)
         return self

ethereum/vm.py

@@ -435,7 +435,7 @@ def vm_execute(ext, msg, code):
                     return vm_exception('OUT OF GAS')
                 compustate.gas -= gascost
                 ext.add_refund(refund)  # adds neg gascost as a refund if below zero
-                ext.set_storage_data(msg.to, s0, zpad(encode_int(s1), 32))
+                ext.set_storage_data(msg.to, s0, encode_int(s1))
             elif op == 'JUMP':
                 compustate.pc = stk.pop()
                 opnew = processed_code[compustate.pc][0] if \