Fix #1564, replace Blake with Keccak (#1611)

* replace blake with keccak

* move test_hash.py to right directory

* test hash_is_keccak and fix formatting

Author: ChihChengLiang

eth/beacon/aggregation.py

@@ -14,7 +14,7 @@
 from eth.utils.bitfield import (
     set_voted,
 )
-from eth.utils.blake import blake
+from eth.beacon.utils.hash import hash_
 
 
 def create_signing_message(slot: int,
@@ -26,7 +26,7 @@ def create_signing_message(slot: int,
     Return the signining message for attesting.
     """
     # TODO: Will be updated with SSZ encoded attestation.
-    return blake(
+    return hash_(
         slot.to_bytes(8, byteorder='big') +
         b''.join(parent_hashes) +
         shard_id.to_bytes(2, byteorder='big') +

eth/beacon/helpers.py

@@ -20,8 +20,8 @@
     get_bitfield_length,
     has_voted,
 )
-from eth.utils.blake import (
-    blake,
+from eth.beacon.utils.hash import (
+    hash_,
 )
 from eth.utils.numeric import (
     clamp,
@@ -388,7 +388,7 @@ def get_new_validator_registry_delta_chain_tip(current_validator_registry_delta_
     """
     Compute the next hash in the validator registry delta hash chain.
     """
-    return blake(
+    return hash_(
         current_validator_registry_delta_chain_tip +
         flag.to_bytes(1, 'big') +
         index.to_bytes(3, 'big') +

eth/beacon/types/blocks.py

@@ -19,7 +19,7 @@
     uint64,
     uint256,
 )
-from eth.utils.blake import blake
+from eth.beacon.utils.hash import hash_
 
 from .attestations import Attestation
 from .proposer_slashings import ProposerSlashing
@@ -101,7 +101,7 @@ def __repr__(self) -> str:
     @property
     def hash(self) -> Hash32:
         if self._hash is None:
-            self._hash = blake(rlp.encode(self))
+            self._hash = hash_(rlp.encode(self))
         return self._hash
 
     @property

eth/beacon/types/states.py

@@ -19,8 +19,8 @@
     uint64,
     hash32,
 )
-from eth.utils.blake import (
-    blake,
+from eth.beacon.utils.hash import (
+    hash_,
 )
 
 from .pending_attestation_records import PendingAttestationRecord
@@ -151,7 +151,7 @@ def __repr__(self) -> str:
     @property
     def hash(self) -> Hash32:
         if self._hash is None:
-            self._hash = blake(rlp.encode(self))
+            self._hash = hash_(rlp.encode(self))
         return self._hash
 
     @property

eth/beacon/utils/hash.py

@@ -0,0 +1,6 @@
+from eth_typing import Hash32
+from eth_hash.auto import keccak
+
+
+def hash_(data: bytes) -> Hash32:
+    return Hash32(keccak(data))

eth/beacon/utils/random.py

@@ -14,8 +14,8 @@
     to_tuple,
 )
 
-from eth.utils.blake import (
-    blake,
+from eth.beacon.utils.hash import (
+    hash_,
 )
 from eth.beacon.constants import (
     RAND_BYTES,
@@ -50,7 +50,7 @@ def shuffle(values: Sequence[Any],
     index = 0
     while index < values_count - 1:
         # Re-hash the `source` to obtain a new pattern of bytes.
-        source = blake(source)
+        source = hash_(source)
 
         # Iterate through the `source` bytes in 3-byte chunks.
         for position in range(0, 32 - (32 % RAND_BYTES), RAND_BYTES):

eth/utils/blake.py

@@ -27,7 +27,7 @@
     curve_order,
     final_exponentiate
 )
-from eth.utils.blake import blake
+from eth.beacon.utils.hash import hash_
 from eth.utils.bn128 import (
     FQP_point_to_FQ2_point,
 )
@@ -75,8 +75,8 @@ def hash_to_G2(m: bytes) -> Tuple[FQ2, FQ2, FQ2]:
         return CACHE[m]
     k2 = m
     while 1:
-        k1 = blake(k2)
-        k2 = blake(k1)
+        k1 = hash_(k2)
+        k2 = hash_(k1)
         x1 = int.from_bytes(k1, 'big') % field_modulus
         x2 = int.from_bytes(k2, 'big') % field_modulus
         x = FQ2([x1, x2])

eth/utils/bls.py

@@ -6,7 +6,7 @@
     ZERO_HASH32,
 )
 import eth.utils.bls as bls
-from eth.utils.blake import blake
+from eth.beacon.utils.hash import hash_
 
 from eth.beacon.types.proposal_signed_data import (
     ProposalSignedData
@@ -46,7 +46,7 @@
 
 @pytest.fixture(scope="session")
 def privkeys():
-    return [int.from_bytes(blake(str(i).encode('utf-8'))[:4], 'big') for i in range(1000)]
+    return [int.from_bytes(hash_(str(i).encode('utf-8'))[:4], 'big') for i in range(1000)]
 
 
 @pytest.fixture(scope="session")

tests/beacon/conftest.py

@@ -14,8 +14,8 @@
     BlockNotFound,
     ParentNotFound,
 )
-from eth.utils.blake import (
-    blake,
+from eth.beacon.utils.hash import (
+    hash_,
 )
 from eth.utils.rlp import (
     validate_rlp_equal,
@@ -68,7 +68,7 @@ def test_chaindb_persist_block_and_slot_to_hash(chaindb, block):
 
 @given(seed=st.binary(min_size=32, max_size=32))
 def test_chaindb_persist_block_and_unknown_parent(chaindb, block, seed):
-    n_block = block.copy(parent_root=blake(seed))
+    n_block = block.copy(parent_root=hash_(seed))
     with pytest.raises(ParentNotFound):
         chaindb.persist_block(n_block)