Fix flake8 and mypy

Author: carver

eth/_utils/headers.py

@@ -1,28 +1,27 @@
-import time
-from typing import Callable, Tuple, Optional
+from typing import (
+    Dict,
+    Tuple,
+)
 
 from eth_typing import (
-    Address
+    Address,
 )
 
 from eth.abc import BlockHeaderAPI
 from eth.constants import (
     BLANK_ROOT_HASH,
-    EMPTY_UNCLE_HASH,
     GENESIS_BLOCK_NUMBER,
-    GENESIS_GAS_LIMIT,
-    GENESIS_NONCE,
     GENESIS_PARENT_HASH,
     GAS_LIMIT_EMA_DENOMINATOR,
     GAS_LIMIT_ADJUSTMENT_FACTOR,
     GAS_LIMIT_MINIMUM,
     GAS_LIMIT_USAGE_ADJUSTMENT_NUMERATOR,
     GAS_LIMIT_USAGE_ADJUSTMENT_DENOMINATOR,
     ZERO_ADDRESS,
-    ZERO_HASH32,
 )
-from eth.rlp.headers import (
-    BlockHeader,
+from eth.typing import (
+    BlockNumber,
+    HeaderParams,
 )
 
 
@@ -37,41 +36,41 @@ def fill_header_params_from_parent(
         transaction_root: bytes = None,
         state_root: bytes = None,
         mix_hash: bytes = None,
-        receipt_root: bytes = None) -> 'BlockHeaderAPI':
-
-        if parent is None:
-            parent_hash = GENESIS_PARENT_HASH
-            block_number = GENESIS_BLOCK_NUMBER
-            if state_root is None:
-                state_root = BLANK_ROOT_HASH
-        else:
-            parent_hash = parent.hash
-            block_number = parent.block_number + 1
-
-            if state_root is None:
-                state_root = parent.state_root
-
-        header_kwargs: Dict[str, HeaderParams] = {
-            'parent_hash': parent_hash,
-            'coinbase': coinbase,
-            'state_root': state_root,
-            'gas_limit': gas_limit,
-            'difficulty': difficulty,
-            'block_number': block_number,
-            'timestamp': timestamp,
-        }
-        if nonce is not None:
-            header_kwargs['nonce'] = nonce
-        if extra_data is not None:
-            header_kwargs['extra_data'] = extra_data
-        if transaction_root is not None:
-            header_kwargs['transaction_root'] = transaction_root
-        if receipt_root is not None:
-            header_kwargs['receipt_root'] = receipt_root
-        if mix_hash is not None:
-            header_kwargs['mix_hash'] = mix_hash
-
-        return header_kwargs
+        receipt_root: bytes = None) -> Dict[str, HeaderParams]:
+
+    if parent is None:
+        parent_hash = GENESIS_PARENT_HASH
+        block_number = GENESIS_BLOCK_NUMBER
+        if state_root is None:
+            state_root = BLANK_ROOT_HASH
+    else:
+        parent_hash = parent.hash
+        block_number = BlockNumber(parent.block_number + 1)
+
+        if state_root is None:
+            state_root = parent.state_root
+
+    header_kwargs: Dict[str, HeaderParams] = {
+        'parent_hash': parent_hash,
+        'coinbase': coinbase,
+        'state_root': state_root,
+        'gas_limit': gas_limit,
+        'difficulty': difficulty,
+        'block_number': block_number,
+        'timestamp': timestamp,
+    }
+    if nonce is not None:
+        header_kwargs['nonce'] = nonce
+    if extra_data is not None:
+        header_kwargs['extra_data'] = extra_data
+    if transaction_root is not None:
+        header_kwargs['transaction_root'] = transaction_root
+    if receipt_root is not None:
+        header_kwargs['receipt_root'] = receipt_root
+    if mix_hash is not None:
+        header_kwargs['mix_hash'] = mix_hash
+
+    return header_kwargs
 
 
 def compute_gas_limit_bounds(parent: BlockHeaderAPI) -> Tuple[int, int]:

eth/abc.py

@@ -74,7 +74,6 @@ class MiningHeaderAPI(ABC):
     gas_used: int
     timestamp: int
     extra_data: bytes
-    base_fee_per_gas: int  # EIP-1559, set to None in pre-London header
 
     @property
     @abstractmethod
@@ -123,8 +122,47 @@ def as_dict(self) -> Dict[Hashable, Any]:
         """
         ...
 
+    @property
+    @abstractmethod
+    def base_fee_per_gas(self) -> Optional[int]:
+        """
+        Return the base fee per gas of the block.
+
+        Set to None in pre-EIP-1559 (London) header.
+        """
+        ...
+
+
+class BlockHeaderSedesAPI(ABC):
+    """
+    Serialize and deserialize RLP for a header.
 
-class BlockHeaderAPI(MiningHeaderAPI):
+    The header may be one of several definitions, like a London (EIP-1559) or
+    pre-London header.
+    """
+
+    @classmethod
+    @abstractmethod
+    def deserialize(cls, encoded: List[bytes]) -> 'BlockHeaderAPI':
+        """
+        Extract a header from an encoded RLP object.
+
+        This method is used by rlp.decode(..., sedes=TransactionBuilderAPI).
+        """
+        ...
+
+    @classmethod
+    @abstractmethod
+    def serialize(cls, obj: 'BlockHeaderAPI') -> List[bytes]:
+        """
+        Encode a header to a series of bytes used by RLP.
+
+        This method is used by rlp.encode(obj).
+        """
+        ...
+
+
+class BlockHeaderAPI(MiningHeaderAPI, BlockHeaderSedesAPI):
     """
     A class derived from :class:`~eth.abc.MiningHeaderAPI` to define a block header after it is
     sealed.
@@ -327,9 +365,6 @@ class TransactionFieldsAPI(ABC):
     """
     A class to define all common transaction fields.
     """
-    max_fee_per_gas: int
-    max_priority_fee_per_gas: int
-
     @property
     @abstractmethod
     def nonce(self) -> int:
@@ -339,7 +374,23 @@ def nonce(self) -> int:
     @abstractmethod
     def gas_price(self) -> int:
         """
-        Will raise :cls:`AttributeError` if get or set on a 1559 transaction.
+        Will raise :class:`AttributeError` if get or set on a 1559 transaction.
+        """
+        ...
+
+    @property
+    @abstractmethod
+    def max_fee_per_gas(self) -> int:
+        """
+        Will default to gas_price if this is a pre-1559 transaction.
+        """
+        ...
+
+    @property
+    @abstractmethod
+    def max_priority_fee_per_gas(self) -> int:
+        """
+        Will default to gas_price if this is a pre-1559 transaction.
         """
         ...
 
@@ -1020,9 +1071,12 @@ class ChainDatabaseAPI(HeaderDatabaseAPI):
     # Header API
     #
     @abstractmethod
-    def get_block_uncles(self, uncles_hash: Hash32) -> Tuple[BlockHeaderAPI, ...]:
+    def get_block_uncles(self, niece_header: BlockHeaderAPI) -> Tuple[BlockHeaderAPI, ...]:
         """
-        Return an iterable of uncle headers specified by the given ``uncles_hash``
+        Return an iterable of uncle headers, specified by the header's ``uncles_hash``.
+
+        The header class is used to specify the RLP deserialization used when
+        decoding the uncle headers from the binary blob.
         """
         ...
 
@@ -1072,10 +1126,15 @@ def persist_unexecuted_block(self,
         """
 
     @abstractmethod
-    def persist_uncles(self, uncles: Tuple[BlockHeaderAPI]) -> Hash32:
+    def persist_uncles(
+            self,
+            uncles: Tuple[BlockHeaderAPI],
+            header_sedes: BlockHeaderSedesAPI) -> Hash32:
         """
         Persist the list of uncles to the database.
 
+        Use header_sedes to decode the rlp-encoded uncle headers.
+
         Return the uncles hash.
         """
         ...
@@ -2619,6 +2678,15 @@ def gas_limit(self) -> int:
         """
         ...
 
+    @abstractmethod
+    def get_gas_price(self, transaction: SignedTransactionAPI) -> int:
+        """
+        Return the gas price of the given transaction.
+
+        Factor in the current block's base gase price, if appropriate. (See EIP-1559)
+        """
+        ...
+
     #
     # Access to account db
     #
@@ -2994,36 +3062,6 @@ def get_fee_recipient(cls, header: BlockHeaderAPI) -> Address:
         ...
 
 
-
-class BlockHeaderSedesAPI(ABC):
-    """
-    Serialize and deserialize RLP for a header.
-
-    The header may be one of several definitions, like a London (EIP-1559) or
-    pre-London header.
-    """
-
-    @classmethod
-    @abstractmethod
-    def deserialize(cls, encoded: List[bytes]) -> BlockHeaderAPI:
-        """
-        Extract a header from an encoded RLP object.
-
-        This method is used by rlp.decode(..., sedes=TransactionBuilderAPI).
-        """
-        ...
-
-    @classmethod
-    @abstractmethod
-    def serialize(cls, obj: BlockHeaderAPI) -> List[bytes]:
-        """
-        Encode a header to a series of bytes used by RLP.
-
-        This method is used by rlp.encode(obj).
-        """
-        ...
-
-
 class VirtualMachineAPI(ConfigurableAPI):
     """
     The :class:`~eth.abc.VirtualMachineAPI` class represents the Chain rules for a
@@ -3322,7 +3360,8 @@ def create_genesis_header(cls, **genesis_params: Any) -> BlockHeaderAPI:
         """
         Create a genesis header using this VM's rules.
 
-        This is currently equivalent to create_header_from_parent(None, **genesis_params)
+        This is equivalent to calling :meth:`create_header_from_parent`
+        with ``parent_header`` set to None.
         """
         ...
 

eth/chains/base.py

@@ -22,7 +22,6 @@
 )
 from eth_utils.toolz import (
     concatv,
-    keyfilter,
     sliding_window,
 )
 
@@ -498,7 +497,6 @@ def persist_block(
         if perform_validation:
             self.validate_block(block)
 
-        vm = self.get_vm(block.header)
         (
             new_canonical_hashes,
             old_canonical_hashes,

eth/db/chain.py

@@ -7,6 +7,7 @@
     Sequence,
     Tuple,
     Type,
+    cast,
 )
 
 from eth_typing import (
@@ -54,9 +55,6 @@
 )
 from eth.db.header import HeaderDB
 from eth.db.schema import SchemaV1
-from eth.rlp.headers import (
-    BlockHeader,
-)
 from eth.rlp.sedes import chain_gaps
 from eth.typing import ChainGaps
 from eth.validation import (
@@ -155,7 +153,7 @@ def _update_header_chain_gaps(
     #
     # Header API
     #
-    def get_block_uncles(self, niece_header: BlockHeader) -> Tuple[BlockHeaderAPI, ...]:
+    def get_block_uncles(self, niece_header: BlockHeaderAPI) -> Tuple[BlockHeaderAPI, ...]:
         uncles_hash = niece_header.uncles_hash
         validate_word(uncles_hash, title="Uncles Hash")
         if uncles_hash == EMPTY_UNCLE_HASH:
@@ -294,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
@@ -338,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/db/header.py

@@ -49,7 +49,6 @@
     ParentNotFound,
 )
 from eth.db.schema import SchemaV1
-from eth.rlp.headers import BlockHeader
 from eth.rlp.sedes import chain_gaps
 from eth.typing import ChainGaps
 from eth.validation import (
@@ -60,9 +59,6 @@
     LondonBackwardsHeader,
 )
 
-from rlp.exceptions import (
-    ObjectDeserializationError
-)
 
 class HeaderDB(HeaderDatabaseAPI):
     def __init__(self, db: AtomicDatabaseAPI) -> None: