Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vub

ethereum/chain.py

@@ -284,11 +284,7 @@ def add_block(self, block, forward_pending_transactions=True):
             _log.debug('invalid uncles')
             return False
 
-        if not len(block.nonce) == 8:
-            _log.debug('nonce not set')
-            return False
-        elif not block.header.check_pow(nonce=block.nonce) and\
-                not block.is_genesis():
+        elif not block.header.check_pow() and not block.is_genesis():
             _log.debug('invalid nonce')
             return False
 

ethereum/keys.py

@@ -155,6 +155,32 @@ def make_keystore_json(priv, pw, kdf="pbkdf2", cipher="aes-128-ctr"):
     }
 
 
+def check_keystore_json(jsondata):
+    """Check if ``jsondata`` has the structure of a keystore file version 3.
+
+    Note that this test is not complete, e.g. it doesn't check key derivation or cipher parameters.
+
+    :param jsondata: dictionary containing the data from the json file
+    :returns: `True` if the data appears to be valid, otherwise `False`
+    """
+    if 'crypto' not in jsondata and 'Crypto' not in jsondata:
+        return False
+    if 'version' not in jsondata:
+        return False
+    if jsondata['version'] != 3:
+        return False
+    crypto = jsondata.get('crypto', jsondata.get('Crypto'))
+    if 'cipher' not in crypto:
+        return False
+    if 'ciphertext' not in crypto:
+        return False
+    if 'kdf' not in crypto:
+        return False
+    if 'mac' not in crypto:
+        return False
+    return True
+
+
 def decode_keystore_json(jsondata, pw):
     # Get KDF function and parameters
     if "crypto" in jsondata:

ethereum/tests/test_keys.py

@@ -13,6 +13,7 @@ def gen_func(filename, testname, testdata):
 
 def do_test_key(filename, testname=None, testdata=None, limit=99999999):
     logger.debug('running test:%r in %r' % (testname, filename))
+    assert keys.check_keystore_json(testdata["json"])
     privkey = keys.decode_keystore_json(testdata["json"], testdata["password"])
     assert utils.encode_hex(privkey) == utils.to_string(testdata["priv"])
 

setup.py

@@ -51,6 +51,6 @@ def run_tests(self):
       install_requires=install_requires,
       tests_require=tests_require,
       entry_points=dict(console_scripts=console_scripts),
-      version='1.0.0',
+      version='1.0.1',
       cmdclass=cmdclass
       )