Merge pull request ethereum#434 from konradkonrad/pysha3_keccak

Adjust to pysha3 breaking changes closes ethereum#426 fixes ethereum#430
TrueShine · Mar 3, 2017 · 1bde26e · 1bde26e
2 parents d18c10f + f2b31f2
commit 1bde26e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ethereum/utils.py b/ethereum/utils.py
@@ -3,7 +3,7 @@
     sha3_256 = lambda x: keccak.new(digest_bits=256, data=x).digest()
 except:
     import sha3 as _sha3
-    sha3_256 = lambda x: _sha3.sha3_256(x).digest()
+    sha3_256 = lambda x: _sha3.keccak_256(x).digest()
 from bitcoin import privtopub
 import sys
 import rlp

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 bitcoin
-pysha3
+pysha3>=1.0.1
 PyYAML
 repoze.lru
 pbkdf2