Fixes to state tests

Author: vub

ethereum/state_transition.py

@@ -295,7 +295,7 @@ def rp(what, actual, target):
     state.add_to_list('receipts', r)
     state.set_param('bloom', state.bloom | r.bloom)
     state.set_param('txindex', state.txindex + 1)
-    return success, output, _logs  # FIXME, @vub how should the interface look like?
+    return success, output
 
 
 def mk_receipt_sha(receipts):

ethereum/testutils.py

@@ -295,7 +295,7 @@ def run_state_test(params, mode):
     assert len(env['currentCoinbase']) == 40
 
     konfig = copy.deepcopy(default_config)
-    konfig['HOMESTEAD_FORK_BLKNUM'] = 1000000
+    # konfig['HOMESTEAD_FORK_BLKNUM'] = 1000000
 
     state = State(env=Env(db, konfig),
                   prev_headers=[mk_fake_header(i) for i in range(parse_int_or_hex(env['currentNumber']) -1, max(-1, parse_int_or_hex(env['currentNumber']) -257), -1)],
@@ -355,7 +355,8 @@ def run_state_test(params, mode):
         snapshot = state.snapshot()
         try:
             print('trying')
-            success, output, logs = state_transition.apply_transaction(state, tx)
+            success, output = state_transition.apply_transaction(state, tx)
+            logs = state.receipts[-1].logs
             assert success
             state.commit()
             print('success')

ethereum/utils.py

@@ -25,6 +25,7 @@
 TT256 = 2 ** 256
 TT256M1 = 2 ** 256 - 1
 TT255 = 2 ** 255
+SECP256K1P = 2**256 - 4294968273
 
 if sys.version_info.major == 2:
     is_numeric = lambda x: isinstance(x, (int, long))
@@ -72,7 +73,10 @@ def bytearray_to_bytestr(value):
 
 def ecrecover_to_pub(rawhash, v, r, s):
     if secp256k1:
+        # Legendre symbol check; the secp256k1 library does not seem to do this
         pk = secp256k1.PublicKey(flags=secp256k1.ALL_FLAGS)
+        xc = r * r * r + 7
+        assert pow(xc, (SECP256K1P - 1) / 2, SECP256K1P) == 1
         try:
             pk.public_key = pk.ecdsa_recover(
                 rawhash,