Fix mypy for real

Author: carver

eth/db/chain.py

@@ -7,6 +7,7 @@
     Sequence,
     Tuple,
     Type,
+    cast,
 )
 
 from eth_typing import (
@@ -291,7 +292,7 @@ def _persist_uncles(
         db.set(
             uncles_hash,
             rlp.encode(uncles, sedes=rlp.sedes.CountableList(header_sedes)))
-        return uncles_hash
+        return cast(Hash32, uncles_hash)
 
     #
     # Transaction API
@@ -335,7 +336,7 @@ def _get_block_transaction_hashes(
             block_header.transaction_root,
         )
         for encoded_transaction in all_encoded_transactions:
-            yield keccak(encoded_transaction)
+            yield cast(Hash32, keccak(encoded_transaction))
 
     @to_tuple
     def get_receipts(self,

eth/db/hash_trie.py

@@ -13,7 +13,7 @@
 
 
 class HashTrie(KeyMapDB):
-    keymap = keccak
+    keymap = keccak  # type: ignore  # mypy doesn't like that keccak accepts bytearray
 
     @contextlib.contextmanager
     def squash_changes(self) -> Iterator['HashTrie']:

eth/rlp/headers.py

@@ -1,6 +1,7 @@
 import time
 from typing import (
     Optional,
+    cast,
     overload,
 )
 
@@ -150,11 +151,12 @@ def __str__(self) -> str:
     def hash(self) -> Hash32:
         if self._hash is None:
             self._hash = keccak(rlp.encode(self))
-        return self._hash
+        return cast(Hash32, self._hash)
 
     @property
     def mining_hash(self) -> Hash32:
-        return keccak(rlp.encode(self[:-2], MiningHeader))
+        result = keccak(rlp.encode(self[:-2], MiningHeader))
+        return cast(Hash32, result)
 
     @property
     def hex_hash(self) -> str:

eth/rlp/transactions.py

@@ -2,6 +2,7 @@
     Optional,
     Sequence,
     Tuple,
+    cast,
 )
 
 from cached_property import cached_property
@@ -73,7 +74,7 @@ class BaseTransactionFields(rlp.Serializable, TransactionFieldsAPI):
 
     @property
     def hash(self) -> Hash32:
-        return keccak(rlp.encode(self))
+        return cast(Hash32, keccak(rlp.encode(self)))
 
 
 class SignedTransactionMethods(BaseTransactionMethods, SignedTransactionAPI):

eth/tools/_utils/hashing.py

@@ -1,15 +1,14 @@
-from eth_hash.auto import keccak
-
-import rlp
-
 from typing import (
     Iterable,
     Tuple,
+    cast,
 )
 
+from eth_hash.auto import keccak
 from eth_typing import (
     Hash32,
 )
+import rlp
 
 from eth.rlp.logs import Log
 
@@ -22,4 +21,4 @@ def hash_log_entries(log_entries: Iterable[Tuple[bytes, Tuple[int, ...], bytes]]
     logs = [Log(*entry) for entry in log_entries]
     encoded_logs = rlp.encode(logs)
     logs_hash = keccak(encoded_logs)
-    return logs_hash
+    return cast(Hash32, logs_hash)

eth/tools/_utils/normalization.py

@@ -84,7 +84,8 @@ def normalize_int(value: IntConvertible) -> int:
         return cast(int, value)
     elif is_bytes(value):
         return big_endian_to_int(cast(bytes, value))
-    elif is_hex(value) and is_0x_prefixed(value):
+    elif is_hex(value) and is_0x_prefixed(value):  # type: ignore
+        # mypy doesn't recognize that is_hex() forces value to be a str
         value = cast(str, value)
         if len(value) == 2:
             return 0

eth/vm/forks/berlin/transactions.py

@@ -4,6 +4,7 @@
     Sequence,
     Tuple,
     Type,
+    cast,
 )
 
 from cached_property import cached_property
@@ -349,7 +350,7 @@ def check_signature_validity(self) -> None:
 
     @cached_property
     def hash(self) -> Hash32:
-        return keccak(self.encode())
+        return cast(Hash32, keccak(self.encode()))
 
     def get_intrinsic_gas(self) -> int:
         return self._inner.get_intrinsic_gas()

eth/vm/forks/london/blocks.py

@@ -1,6 +1,7 @@
 import time
 from typing import (
     Type,
+    cast,
 )
 
 from eth_hash.auto import keccak
@@ -140,11 +141,12 @@ def __str__(self) -> str:
     def hash(self) -> Hash32:
         if self._hash is None:
             self._hash = keccak(rlp.encode(self))
-        return self._hash
+        return cast(Hash32, self._hash)
 
     @property
     def mining_hash(self) -> Hash32:
-        return keccak(rlp.encode(self[:-2], LondonMiningHeader))
+        result = keccak(rlp.encode(self[:-2], LondonMiningHeader))
+        return cast(Hash32, result)
 
     @property
     def hex_hash(self) -> str: