Merge remote-tracking branch 'upstream/develop' into develop

Author: Georgi87

ethereum/abi.py

@@ -4,7 +4,7 @@
 from ethereum import utils
 from rlp.utils import decode_hex, encode_hex
 from ethereum.utils import encode_int, zpad, big_endian_to_int, is_numeric, is_string, ceil32
-from ethereum.utils import isnumeric
+from ethereum.utils import isnumeric, TT256, TT255
 import ast
 
 
@@ -145,35 +145,38 @@ class ValueOutOfBounds(EncodingError):
     pass
 
 
-# Decode an integer
-def decint(n):
+# Decode an unsigned/signed integer
+def decint(n, signed=False):
     if isinstance(n, str):
         n = utils.to_string(n)
-    if is_numeric(n) and n < 2**256 and n >= -2**255:
+
+    if is_numeric(n):
+        min, max = (-TT255,TT255-1) if signed else (0,TT256-1)
+        if n > max or n < min:
+            raise EncodingError("Number out of range: %r" % n)
         return n
-    elif is_numeric(n):
-        raise EncodingError("Number out of range: %r" % n)
-    elif is_string(n) and len(n) == 40:
-        return big_endian_to_int(decode_hex(n))
-    elif is_string(n) and len(n) <= 32:
-        return big_endian_to_int(n)
-    elif is_string(n) and len(n) > 32:
-        raise EncodingError("String too long: %r" % n)
+    elif is_string(n):
+        if len(n) == 40:
+            n = decode_hex(n)
+        if len(n) > 32:
+            raise EncodingError("String too long: %r" % n)
+
+        i = big_endian_to_int(n)
+        return (i - TT256) if signed and i >= TT255 else i
     elif n is True:
         return 1
     elif n is False or n is None:
         return 0
     else:
         raise EncodingError("Cannot encode integer: %r" % n)
 
-
 # Encodes a base datum
 def encode_single(typ, arg):
     base, sub, _ = typ
     # Unsigned integers: uint<sz>
     if base == 'uint':
         sub = int(sub)
-        i = decint(arg)
+        i = decint(arg, False)
 
         if not 0 <= i < 2**sub:
             raise ValueOutOfBounds(repr(arg))
@@ -185,8 +188,8 @@ def encode_single(typ, arg):
     # Signed integers: int<sz>
     elif base == 'int':
         sub = int(sub)
-        i = decint(arg)
-        if not -2**(sub - 1) <= i < 2**sub:
+        i = decint(arg, True)
+        if not -2**(sub - 1) <= i < 2**(sub - 1):
             raise ValueOutOfBounds(repr(arg))
         return zpad(encode_int(i % 2**sub), 32)
     # Unsigned reals: ureal<high>x<low>

ethereum/tests/test_abi.py

@@ -22,6 +22,7 @@ def test_abi_encode_signed_int():
 
 def test_abi_encode_single_int():
     assert abi.encode_single(['int', '256', []], -2**255) == (b'\x80'+b'\x00'*31)
+    assert abi.encode_single(['int', '256', []], (b'\x80'+b'\x00'*31)) == (b'\x80'+b'\x00'*31)
 
     assert abi.encode_single(['int', '8', []], -128) == zpad(b'\x80', 32)
     with pytest.raises(abi.ValueOutOfBounds):

ethereum/tests/test_contracts.py

@@ -1189,7 +1189,7 @@ def test_types():
 
 
 ecrecover_code = """
-def test_ecrecover(h, v, r, s):
+def test_ecrecover(h:uint256, v:uint256, r:uint256, s:uint256):
     return(ecrecover(h, v, r, s))
 """
 

ethereum/tests/test_difficulty.py

@@ -0,0 +1,78 @@
+from ethereum import tester, blocks
+import ethereum.utils as utils
+import rlp
+import ethereum.testutils as testutils
+from ethereum.testutils import fixture_to_bytes
+import ethereum.config as config
+import sys
+import os
+import json
+
+from ethereum.slogging import get_logger
+logger = get_logger()
+# customize VM log output to your needs
+# hint: use 'py.test' with the '-s' option to dump logs to the console
+# configure_logging(':trace')
+
+
+def test_difficulty(filename, testname, testdata):
+    testdata = fixture_to_bytes(testdata)
+
+    parent_timestamp=int(testdata["parentTimestamp"], 10 if testdata["parentTimestamp"].isdigit() else 16)
+    parent_difficulty=int(testdata["parentDifficulty"], 10 if testdata["parentDifficulty"].isdigit() else 16)
+    parent_blk_number=int(testdata["currentBlockNumber"], 10 if testdata["currentBlockNumber"].isdigit() else 16)-1
+    cur_blk_timestamp=int(testdata["currentTimestamp"], 10 if testdata["currentTimestamp"].isdigit() else 16)
+    reference_dif = int(testdata["currentDifficulty"], 10 if testdata["currentDifficulty"].isdigit() else 16)
+
+
+    env = tester.state().env
+    if 'Homestead' in filename:
+        env.config['HOMESTEAD_FORK_BLKNUM'] = 0
+    if 'difficultyMorden' in filename:
+        env.config['HOMESTEAD_FORK_BLKNUM'] = 494000
+
+    parent_bh = blocks.BlockHeader(timestamp=parent_timestamp,
+                             difficulty=parent_difficulty,
+                             number=parent_blk_number)
+    block = blocks.Block(parent_bh, [], env=env,
+                      making=True)
+
+
+    calculated_dif = blocks.calc_difficulty(block, cur_blk_timestamp)
+
+    print calculated_dif
+    print reference_dif
+    assert calculated_dif == reference_dif
+
+
+def not_a_difficulty_test(filename, testname, testdata):
+    if 'difficultyOlimpic.json' in filename:
+        return True
+    if 'difficulty' in filename:
+        return False
+
+    return True
+
+
+def pytest_generate_tests(metafunc):
+    testutils.generate_test_params('BasicTests', metafunc, exclude_func=not_a_difficulty_test)
+
+
+def main():
+    import pdb; pdb.set_trace()
+    if len(sys.argv) == 1:
+        # read fixture from stdin
+        fixtures = {'stdin': json.load(sys.stdin)}
+    else:
+        # load fixtures from specified file or dir
+        fixtures = testutils.get_tests_from_file_or_dir(sys.argv[1])
+    for filename, tests in list(fixtures.items()):
+        for testname, testdata in list(tests.items()):
+            if len(sys.argv) < 3 or testname == sys.argv[2]:
+                print("Testing: %s %s" % (filename, testname))
+                # testutils.check_state_test(testdata)
+                test_difficulty(filename, testname, testdata)
+
+
+if __name__ == '__main__':
+    main()

ethereum/testutils.py

@@ -362,7 +362,7 @@ def blkhash(n):
             success, output = pb.apply_transaction(blk, tx)
             blk.commit_state()
             print 'success', blk.get_receipts()[-1].gas_used
-        except pb.InvalidTransaction:
+        except InvalidTransaction:
             success, output = False, b''
             blk.commit_state()
             pass
@@ -476,7 +476,7 @@ def run_abi_test(params, mode):
 def run_genesis_test(params, mode):
     params = copy.deepcopy(params)
     if 'difficulty' not in params:
-        params['difficulty'] = int_to_hex(2**34)
+        params['difficulty'] = int_to_hex(2 ** 34)
     if 'mixhash' not in params:
         params['mixhash'] = '0x' + '0' * 64
     if 'nonce' not in params:
@@ -576,18 +576,19 @@ def generate_test_params(testsource, metafunc, skip_func=None, exclude_func=None
     base_dir = os.path.dirname(os.path.dirname(__file__))
     params = []
     for filename, tests in fixtures.items():
-        filename = os.path.relpath(filename, base_dir)
-        for testname, testdata in tests.items():
-            if exclude_func and exclude_func(filename, testname, testdata):
-                continue
-            if skip_func:
-                skipif = pytest.mark.skipif(
-                    skip_func(filename, testname, testdata),
-                    reason="Excluded"
-                )
-                params.append(skipif((filename, testname, testdata)))
-            else:
-                params.append((filename, testname, testdata))
+        if isinstance(tests, dict):
+            filename = os.path.relpath(filename, base_dir)
+            for testname, testdata in tests.items():
+                if exclude_func and exclude_func(filename, testname, testdata):
+                    continue
+                if skip_func:
+                    skipif = pytest.mark.skipif(
+                        skip_func(filename, testname, testdata),
+                        reason="Excluded"
+                    )
+                    params.append(skipif((filename, testname, testdata)))
+                else:
+                    params.append((filename, testname, testdata))
 
     metafunc.parametrize(
         ('filename', 'testname', 'testdata'),

fixtures

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.1
+current_version = 1.2.0
 commit = True
 tag = True
 

setup.cfg

@@ -20,7 +20,7 @@
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
-version = '1.2.1'
+version = '1.2.0'
 
 setup(
     name="ethereum",