rm: very slow stack verification

Author: heikoheiko

ethereum/blocks.py

@@ -1,3 +1,8 @@
+#  ####### dev hack flags ###############
+
+dump_block_on_failed_verification = False
+
+#  ######################################
 import time
 from itertools import count
 import sys
@@ -93,33 +98,6 @@ def calc_difficulty(parent, timestamp):
     return int(max(parent.difficulty + offset * sign, min(parent.difficulty, MIN_DIFF)))
 
 
-# Auxiliary value for must_* error messages
-aux = [None]
-
-
-def set_aux(auxval):
-    aux[0] = auxval
-
-
-def must(what, f, symb, a, b):
-    if not f(a, b):
-        if aux[0]:
-            sys.stderr.write('%r' % aux[0])
-        raise VerificationFailed(what, a, symb, b)
-
-
-def must_equal(what, a, b):
-    return must(what, lambda x, y: x == y, "==", a, b)
-
-
-def must_ge(what, a, b):
-    return must(what, lambda x, y: x >= y, ">=", a, b)
-
-
-def must_le(what, a, b):
-    return must(what, lambda x, y: x <= y, "<=", a, b)
-
-
 class Account(rlp.Serializable):
     """An Ethereum account.
 
@@ -523,8 +501,23 @@ def __init__(self, header, transaction_list=[], uncles=[], db=None,
             # (it doesn't know intermediate states), so reset it
             self.receipts = Trie(self.db, header.receipts_root)
 
-        # checks
-        set_aux(self.to_dict())
+        # checks ##############################
+
+        def must(what, f, symb, a, b):
+            if not f(a, b):
+                if dump_block_on_failed_verification:
+                    sys.stderr.write('%r' % self.to_dict())
+                raise VerificationFailed(what, a, symb, b)
+
+        def must_equal(what, a, b):
+            return must(what, lambda x, y: x == y, "==", a, b)
+
+        def must_ge(what, a, b):
+            return must(what, lambda x, y: x >= y, ">=", a, b)
+
+        def must_le(what, a, b):
+            return must(what, lambda x, y: x <= y, "<=", a, b)
+
         if parent:
             must_equal('prev_hash', self.prevhash, parent.hash)
             must_ge('gas_limit', self.gas_limit,
@@ -540,7 +533,6 @@ def __init__(self, header, transaction_list=[], uncles=[], db=None,
         must_equal('tx_list_root', self.transactions.root_hash, header.tx_list_root)
         must_equal('receipts_root', self.receipts.root_hash, header.receipts_root)
         must_equal('bloom', self.bloom, original_values['bloom'])
-        set_aux(None)
 
         # from now on, trie roots refer to block instead of header
         header.block = self

ethereum/testutils.py

@@ -110,7 +110,7 @@ def mktest(code, language, data=None, fun=None, args=None,
 
 
 # Fills up a vm test without post data, or runs the test
-def run_vm_test(params, mode):
+def run_vm_test(params, mode, profiler=None):
     pre = params['pre']
     exek = params['exec']
     env = params['env']
@@ -144,13 +144,14 @@ def run_vm_test(params, mode):
     # execute transactions
     sender = decode_hex(exek['caller'])  # a party that originates a call
     recvaddr = decode_hex(exek['address'])
-    tx = transactions.Transaction(
-        nonce=blk._get_acct_item(decode_hex(exek['caller']), 'nonce'),
-        gasprice=parse_int_or_hex(exek['gasPrice']),
-        startgas=parse_int_or_hex(exek['gas']),
-        to=recvaddr,
-        value=parse_int_or_hex(exek['value']),
-        data=decode_hex(exek['data'][2:]))
+    nonce = blk._get_acct_item(sender, 'nonce')
+    gasprice = parse_int_or_hex(exek['gasPrice'])
+    startgas = parse_int_or_hex(exek['gas'])
+    value = parse_int_or_hex(exek['value'])
+    data = decode_hex(exek['data'][2:])
+
+    tx = transactions.Transaction(nonce=nonce, gasprice=gasprice, startgas=startgas,
+                                  to=recvaddr, value=value, data=data)
     tx.sender = sender
 
     # capture apply_message calls
@@ -191,9 +192,13 @@ def blkhash(n):
 
     msg = vm.Message(tx.sender, tx.to, tx.value, tx.startgas,
                      vm.CallData([safe_ord(x) for x in tx.data]))
+    code = decode_hex(exek['code'][2:])
     time_pre = time.time()
-    success, gas_remained, output = \
-        vm.vm_execute(ext, msg, decode_hex(exek['code'][2:]))
+    if profiler:
+        profiler.enable()
+    success, gas_remained, output = vm.vm_execute(ext, msg, code)
+    if profiler:
+        profiler.disable()
     pb.apply_msg = orig_apply_msg
     blk.commit_state()
     for s in blk.suicides:

ethereum/vm.py

@@ -1,3 +1,8 @@
+#  ####### dev hack flags ###############
+
+verify_stack_after_op = False
+
+#  ######################################
 from ethereum import utils
 from ethereum.abi import is_numeric
 import copy
@@ -548,9 +553,12 @@ def vm_execute(ext, msg, code):
             ext.add_suicide(msg.to)
             # print('suiciding %s %s %d' % (msg.to, to, xfer))
             return 1, compustate.gas, []
-        for a in stk:
-            assert is_numeric(a)
-            assert a >= 0 and a < 2**256, (a, op, stk)
+
+        # this is slow!
+        if verify_stack_after_op:
+            for a in stk:
+                assert is_numeric(a)
+                assert a >= 0 and a < 2**256, (a, op, stk)
 
 
 class VmExtBase():