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

Author: vub

.travis.yml

@@ -15,3 +15,13 @@ script:
 
 after_success:
 - coveralls
+
+deploy:
+  provider: pypi
+  user: ethereum_pypi_automated
+  password:
+    secure: "FvkEn1xULi9mGxAL9sKlTuxJZvk0Uyd2GaDPAHN5ZAfaJUNwzA6+m7PRAMPd44Uy/LOw0+Ah9X1rxAxZc+7yx+FJjwH1Nl8MjtqYTWp+Ue6TFUNdJXNHjekC5ce4rbULudrqlmwmaWzi5iRC7qhpxuTg1y3iBw3Fsd8E82qbDac="
+  on:
+    tags: true
+    repo: ethereum/pyethereum
+    branch: develop

dev_requirements.txt

@@ -2,5 +2,5 @@ tox
 coveralls
 pytest
 pytest-catchlog==1.1
-pytest-timeout
+pytest-timeout==0.5
 https://github.com/ethereum/serpent/tarball/develop

ethereum/__init__.py

@@ -1,18 +1,40 @@
+# -*- coding: utf-8 -*-
 # ############# version ##################
 from pkg_resources import get_distribution, DistributionNotFound
 import os.path
+import subprocess
+import re
+
+
+GIT_DESCRIBE_RE = re.compile('^(?P<version>v\d+\.\d+\.\d+)-(?P<git>\d+-g[a-fA-F0-9]+(?:-dirty)?)$')
+
+
+__version__ = None
 try:
-    _dist = get_distribution('ethereum')
+    _dist = get_distribution('pyethapp')
     # Normalize case for Windows systems
     dist_loc = os.path.normcase(_dist.location)
     here = os.path.normcase(__file__)
-    if not here.startswith(os.path.join(dist_loc, 'ethereum')):
+    if not here.startswith(os.path.join(dist_loc, 'pyethapp')):
         # not installed, but there is another version that *is*
         raise DistributionNotFound
-except DistributionNotFound:
-    __version__ = 'Please install this project with setup.py'
-else:
     __version__ = _dist.version
+except DistributionNotFound:
+    pass
+
+if not __version__:
+    try:
+        rev = subprocess.check_output(['git', 'describe', '--tags', '--dirty'],
+                                      stderr=subprocess.STDOUT)
+        match = GIT_DESCRIBE_RE.match(rev)
+        if match:
+            __version__ = "{}+git-{}".format(match.group("version"), match.group("git"))
+    except:
+        pass
+
+if not __version__:
+    __version__ = 'undefined'
+
 # ########### endversion ##################
 
 '''from ethereum import utils

ethereum/ethash_utils.py

@@ -1,4 +1,6 @@
-import sha3
+from Crypto.Hash import keccak
+sha3_256 = lambda x: keccak.new(digest_bits=256, data=x)
+sha3_512 = lambda x: keccak.new(digest_bits=512, data=x)
 from rlp.utils import decode_hex, encode_hex
 import sys
 
@@ -59,11 +61,11 @@ def to_bytes(x):
 
 # sha3 hash function, outputs 64 bytes
 def sha3_512(x):
-    return hash_words(lambda v: sha3.sha3_512(to_bytes(v)).digest(), 64, x)
+    return hash_words(sha3_512(to_bytes(v)).digest(), 64, x)
 
 
 def sha3_256(x):
-    return hash_words(lambda v: sha3.sha3_256(to_bytes(v)).digest(), 32, x)
+    return hash_words(sha3_256(to_bytes(v)).digest(), 32, x)
 
 
 def xor(a, b):

ethereum/ethpow.py

@@ -2,6 +2,7 @@
 import time
 import sys
 import sha3
+import warnings
 from collections import OrderedDict
 from ethereum.slogging import get_logger
 
@@ -15,10 +16,9 @@
 try:
     import pyethash
     ETHASH_LIB = 'pyethash'  # the C++ based implementation
-    log.warn('using C++ implementation')
 except ImportError:
     ETHASH_LIB = 'ethash'
-    log.warn('using pure python implementation')
+    warnings.warn('using pure python implementation', ImportWarning)
 
 if ETHASH_LIB == 'ethash':
     mkcache = ethash.mkcache

ethereum/keys.py

@@ -23,7 +23,8 @@
 import binascii
 import struct
 from math import ceil
-from sha3 import sha3_256
+from Crypto.Hash import keccak
+sha3_256 = lambda x: keccak.new(digest_bits=256, data=x)
 from Crypto.Cipher import AES
 from Crypto.Hash import SHA256
 from Crypto.Util import Counter

ethereum/transactions.py

@@ -144,7 +144,7 @@ def intrinsic_gas_used(self):
     @property
     def creates(self):
         "returns the address of a contract created by this tx"
-        if self.to == '':
+        if self.to in (b'', '\0'*20):
             return mk_contract_address(self.sender, self.nonce)
 
 

ethereum/utils.py

@@ -1,8 +1,5 @@
-try:
-    from keccak import sha3_256  # pypy
-except ImportError:
-    from sha3 import sha3_256 as _sha3_256
-    sha3_256 = lambda x: _sha3_256(x).digest()
+from Crypto.Hash import keccak
+sha3_256 = lambda x: keccak.new(digest_bits=256, data=x).digest()
 from bitcoin import privtopub
 import sys
 import rlp

requirements.txt

@@ -3,7 +3,7 @@ pysha3
 PyYAML
 repoze.lru
 pbkdf2
-pycrypto
+pycryptodome>=3.3.1
 scrypt
-https://github.com/ethereum/pyrlp/tarball/develop
+rlp==0.4.4
 https://github.com/ethereum/ethash/tarball/master

setup.cfg

@@ -0,0 +1,8 @@
+[bumpversion]
+current_version = 1.0.8
+commit = True
+tag = True
+
+[bumpversion:file:setup.py]
+search = version = "{current_version}"
+