Get rid of ignores regarding SpoofTransaction

Author: cburgdorf

eth/chains/base.py

@@ -76,12 +76,10 @@
 
 from eth.typing import (  # noqa: F401
     AccountState,
+    BaseOrSpoofTransaction,
     StaticMethod,
 )
 
-from eth.utils.spoof import (
-    SpoofTransaction,
-)
 from eth.utils.db import (
     apply_state_dict,
 )
@@ -280,14 +278,14 @@ def get_canonical_transaction(self, transaction_hash: Hash32) -> BaseTransaction
     @abstractmethod
     def get_transaction_result(
             self,
-            transaction: Union[BaseTransaction, SpoofTransaction],
+            transaction: BaseOrSpoofTransaction,
             at_header: BlockHeader) -> bytes:
         raise NotImplementedError("Chain classes must implement this method")
 
     @abstractmethod
     def estimate_gas(
             self,
-            transaction: Union[BaseTransaction, SpoofTransaction],
+            transaction: BaseOrSpoofTransaction,
             at_header: BlockHeader=None) -> int:
         raise NotImplementedError("Chain classes must implement this method")
 
@@ -338,7 +336,7 @@ class Chain(BaseChain):
     current block number.
     """
     logger = logging.getLogger("eth.chain.chain.Chain")
-    gas_estimator = None  # type: StaticMethod[Callable[[BaseState, Union[BaseTransaction, SpoofTransaction]], int]]  # noqa: E501
+    gas_estimator = None  # type: StaticMethod[Callable[[BaseState, BaseOrSpoofTransaction], int]]
 
     chaindb_class = ChainDB  # type: Type[BaseChainDB]
 
@@ -627,22 +625,21 @@ def create_unsigned_transaction(self,
     #
     def get_transaction_result(
             self,
-            transaction: Union[BaseTransaction, SpoofTransaction],
+            transaction: BaseOrSpoofTransaction,
             at_header: BlockHeader) -> bytes:
         """
         Return the result of running the given transaction.
         This is referred to as a `call()` in web3.
         """
         with self.get_vm(at_header).state_in_temp_block() as state:
-            # Ignore is to not bleed the SpoofTransaction deeper into the code base
-            computation = state.costless_execute_transaction(transaction)  # type: ignore
+            computation = state.costless_execute_transaction(transaction)
 
         computation.raise_if_error()
         return computation.output
 
     def estimate_gas(
             self,
-            transaction: Union[BaseTransaction, SpoofTransaction],
+            transaction: BaseOrSpoofTransaction,
             at_header: BlockHeader=None) -> int:
         """
         Returns an estimation of the amount of gas the given transaction will

eth/estimators/__init__.py

@@ -2,29 +2,25 @@
 from typing import (
     Callable,
     cast,
-    Union,
 )
 
-from eth.rlp.transactions import (
-    BaseTransaction,
+from eth.typing import (
+    BaseOrSpoofTransaction,
 )
 from eth.utils.module_loading import (
     import_string,
 )
-from eth.utils.spoof import (
-    SpoofTransaction,
-)
 from eth.vm.state import (
     BaseState,
 )
 
 
-def get_gas_estimator() -> Callable[[BaseState, Union[BaseTransaction, SpoofTransaction]], int]:
+def get_gas_estimator() -> Callable[[BaseState, BaseOrSpoofTransaction], int]:
     import_path = os.environ.get(
         'GAS_ESTIMATOR_BACKEND_FUNC',
         'eth.estimators.gas.binary_gas_search_intrinsic_tolerance',
     )
     return cast(
-        Callable[[BaseState, Union[BaseTransaction, SpoofTransaction]], int],
+        Callable[[BaseState, BaseOrSpoofTransaction], int],
         import_string(import_path)
     )

eth/estimators/gas.py

@@ -1,5 +1,4 @@
 from typing import (
-    cast,
     Optional,
 )
 
@@ -29,7 +28,7 @@ def _get_computation_error(state: BaseState, transaction: SpoofTransaction) -> O
     snapshot = state.snapshot()
 
     try:
-        computation = state.execute_transaction(cast(BaseTransaction, transaction))
+        computation = state.execute_transaction(transaction)
         if computation.is_error:
             return computation._error
         else:

eth/typing.py

@@ -9,6 +9,7 @@
     Tuple,
     Union,
     TypeVar,
+    TYPE_CHECKING,
 )
 
 from eth_typing import (
@@ -19,6 +20,14 @@
     TypedDict,
 )
 
+if TYPE_CHECKING:
+    from eth.rlp.transactions import (  # noqa: F401
+        BaseTransaction
+    )
+    from eth.utils.spoof import (  # noqa: F401
+        SpoofTransaction
+    )
+
 
 # TODO: Move into eth_typing
 
@@ -32,6 +41,8 @@
 
 AccountDiff = Iterable[Tuple[Address, str, Union[int, bytes], Union[int, bytes]]]
 
+BaseOrSpoofTransaction = Union['BaseTransaction', 'SpoofTransaction']
+
 GeneralState = Union[
     AccountState,
     List[Tuple[Address, Dict[str, Union[int, bytes, Dict[int, int]]]]]

eth/vm/forks/frontier/state.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
-from typing import Type  # noqa: F401
+from typing import Type, Union  # noqa: F401
 
 from eth_hash.auto import keccak
 from eth_utils import (
@@ -14,10 +14,9 @@
     ContractCreationCollision,
 )
 
-from eth.rlp.transactions import (
-    BaseTransaction,
+from eth.typing import (
+    BaseOrSpoofTransaction,
 )
-
 from eth.utils.address import (
     generate_contract_address,
 )
@@ -45,15 +44,15 @@
 
 class FrontierTransactionExecutor(BaseTransactionExecutor):
 
-    def validate_transaction(self, transaction: BaseTransaction) -> BaseTransaction:
+    def validate_transaction(self, transaction: BaseOrSpoofTransaction) -> BaseOrSpoofTransaction:
 
         # Validate the transaction
         transaction.validate()
         self.vm_state.validate_transaction(transaction)
 
         return transaction
 
-    def build_evm_message(self, transaction: BaseTransaction) -> Message:
+    def build_evm_message(self, transaction: BaseOrSpoofTransaction) -> Message:
 
         gas_fee = transaction.gas * transaction.gas_price
 
@@ -105,7 +104,9 @@ def build_evm_message(self, transaction: BaseTransaction) -> Message:
         )
         return message
 
-    def build_computation(self, message: Message, transaction: BaseTransaction) -> BaseComputation:
+    def build_computation(self,
+                          message: Message,
+                          transaction: BaseOrSpoofTransaction) -> BaseComputation:
         """Apply the message to the VM."""
         transaction_context = self.vm_state.get_transaction_context(transaction)
         if message.is_create:
@@ -139,7 +140,7 @@ def build_computation(self, message: Message, transaction: BaseTransaction) -> B
         return computation
 
     def finalize_computation(self,
-                             transaction: BaseTransaction,
+                             transaction: BaseOrSpoofTransaction,
                              computation: BaseComputation) -> BaseComputation:
         # Self Destruct Refunds
         num_deletions = len(computation.get_accounts_for_deletion())
@@ -192,9 +193,9 @@ class FrontierState(BaseState):
     account_db_class = AccountDB  # Type[BaseAccountDB]
     transaction_executor = FrontierTransactionExecutor  # Type[BaseTransactionExecutor]
 
-    def validate_transaction(self, transaction: BaseTransaction) -> None:
+    def validate_transaction(self, transaction: BaseOrSpoofTransaction) -> None:
         validate_frontier_transaction(self.account_db, transaction)
 
-    def execute_transaction(self, transaction: BaseTransaction) -> BaseTransactionExecutor:
+    def execute_transaction(self, transaction: BaseOrSpoofTransaction) -> BaseTransactionExecutor:
         executor = self.get_transaction_executor()
         return executor(transaction)

eth/vm/forks/frontier/validation.py

@@ -5,12 +5,18 @@
 from eth.db.account import BaseAccountDB
 
 from eth.rlp.headers import BlockHeader
+
 from eth.rlp.transactions import BaseTransaction
 
+from eth.typing import (
+    BaseOrSpoofTransaction
+)
+
 from eth.vm.base import BaseVM
 
 
-def validate_frontier_transaction(account_db: BaseAccountDB, transaction: BaseTransaction) -> None:
+def validate_frontier_transaction(account_db: BaseAccountDB,
+                                  transaction: BaseOrSpoofTransaction) -> None:
     gas_cost = transaction.gas * transaction.gas_price
     sender_balance = account_db.get_balance(transaction.sender)
 

eth/vm/forks/homestead/state.py

@@ -1,4 +1,6 @@
-from eth.rlp.transactions import BaseTransaction
+from eth.typing import (
+    BaseOrSpoofTransaction,
+)
 
 from eth.vm.forks.frontier.state import (
     FrontierState,
@@ -12,7 +14,7 @@
 class HomesteadState(FrontierState):
     computation_class = HomesteadComputation
 
-    def validate_transaction(self, transaction: BaseTransaction) -> None:
+    def validate_transaction(self, transaction: BaseOrSpoofTransaction) -> None:
         validate_homestead_transaction(self.account_db, transaction)
 
 

eth/vm/forks/homestead/validation.py

@@ -8,14 +8,15 @@
 
 from eth.db.account import BaseAccountDB
 
-from eth.rlp.transactions import BaseTransaction
+from eth.typing import BaseOrSpoofTransaction
 
 from eth.vm.forks.frontier.validation import (
     validate_frontier_transaction,
 )
 
 
-def validate_homestead_transaction(account_db: BaseAccountDB, transaction: BaseTransaction) -> None:
+def validate_homestead_transaction(account_db: BaseAccountDB,
+                                   transaction: BaseOrSpoofTransaction) -> None:
     if transaction.s > SECPK1_N // 2 or transaction.s == 0:
         raise ValidationError("Invalid signature S value")
 

eth/vm/forks/spurious_dragon/state.py

@@ -1,9 +1,11 @@
-from eth.rlp.transactions import BaseTransaction
-
 from eth_utils import (
     encode_hex,
 )
 
+from eth.typing import (
+    BaseOrSpoofTransaction,
+)
+
 from eth.vm.computation import BaseComputation
 
 from eth.vm.forks.homestead.state import (
@@ -17,7 +19,7 @@
 
 class SpuriousDragonTransactionExecutor(HomesteadTransactionExecutor):
     def finalize_computation(self,
-                             transaction: BaseTransaction,
+                             transaction: BaseOrSpoofTransaction,
                              computation: BaseComputation) -> BaseComputation:
         computation = super().finalize_computation(transaction, computation)
 

eth/vm/state.py

@@ -11,6 +11,7 @@
     Tuple,
     Type,
     TYPE_CHECKING,
+    Union,
 )
 from uuid import UUID
 
@@ -34,6 +35,9 @@
 from eth.tools.logging import (
     TraceLogger,
 )
+from eth.typing import (
+    BaseOrSpoofTransaction,
+)
 from eth.utils.datatypes import (
     Configurable,
 )
@@ -49,6 +53,7 @@
     from eth.rlp.transactions import (  # noqa: F401
         BaseTransaction,
     )
+
     from eth.vm.transaction_context import (  # noqa: F401
         BaseTransactionContext,
     )
@@ -250,7 +255,8 @@ def apply_transaction(self, transaction: 'BaseTransaction') -> Tuple[bytes, 'Bas
     def get_transaction_executor(self) -> 'BaseTransactionExecutor':
         return self.transaction_executor(self)
 
-    def costless_execute_transaction(self, transaction: 'BaseTransaction') -> 'BaseComputation':
+    def costless_execute_transaction(self,
+                                     transaction: BaseOrSpoofTransaction) -> 'BaseComputation':
         with self.override_transaction_context(gas_price=transaction.gas_price):
             free_transaction = transaction.copy(gas_price=0)
             return self.execute_transaction(free_transaction)
@@ -270,15 +276,16 @@ def get_custom_transaction_context(transaction: 'BaseTransaction') -> 'BaseTrans
             self.get_transaction_context = original_context     # type: ignore # Remove ignore if https://github.com/python/mypy/issues/708 is fixed. # noqa: E501
 
     @abstractmethod
-    def execute_transaction(self, transaction: 'BaseTransaction') -> 'BaseComputation':
+    def execute_transaction(self, transaction: BaseOrSpoofTransaction) -> 'BaseComputation':
         raise NotImplementedError()
 
     @abstractmethod
-    def validate_transaction(self, transaction: 'BaseTransaction') -> None:
+    def validate_transaction(self, transaction: BaseOrSpoofTransaction) -> None:
         raise NotImplementedError
 
     @classmethod
-    def get_transaction_context(cls, transaction: 'BaseTransaction') -> 'BaseTransactionContext':
+    def get_transaction_context(cls,
+                                transaction: BaseOrSpoofTransaction) -> 'BaseTransactionContext':
         return cls.get_transaction_context_class()(
             gas_price=transaction.gas_price,
             origin=transaction.sender,
@@ -289,29 +296,29 @@ class BaseTransactionExecutor(ABC):
     def __init__(self, vm_state: BaseState) -> None:
         self.vm_state = vm_state
 
-    def __call__(self, transaction: 'BaseTransaction') -> 'BaseComputation':
+    def __call__(self, transaction: BaseOrSpoofTransaction) -> 'BaseComputation':
         valid_transaction = self.validate_transaction(transaction)
         message = self.build_evm_message(valid_transaction)
         computation = self.build_computation(message, valid_transaction)
         finalized_computation = self.finalize_computation(valid_transaction, computation)
         return finalized_computation
 
     @abstractmethod
-    def validate_transaction(self, transaction: 'BaseTransaction') -> 'BaseTransaction':
+    def validate_transaction(self, transaction: BaseOrSpoofTransaction) -> BaseOrSpoofTransaction:
         raise NotImplementedError
 
     @abstractmethod
-    def build_evm_message(self, transaction: 'BaseTransaction') -> Message:
+    def build_evm_message(self, transaction: BaseOrSpoofTransaction) -> Message:
         raise NotImplementedError()
 
     @abstractmethod
     def build_computation(self,
                           message: Message,
-                          transaction: 'BaseTransaction') -> 'BaseComputation':
+                          transaction: BaseOrSpoofTransaction) -> 'BaseComputation':
         raise NotImplementedError()
 
     @abstractmethod
     def finalize_computation(self,
-                             transaction: 'BaseTransaction',
+                             transaction: BaseOrSpoofTransaction,
                              computation: 'BaseComputation') -> 'BaseComputation':
         raise NotImplementedError()