Support basic VM calls in BaseChain & txpool fixup

Author: carver

evm/chains/base.py

@@ -124,9 +124,8 @@ def get_chaindb_class(cls) -> Type[BaseChainDB]:
         raise NotImplementedError("Chain classes must implement this method")
 
     @classmethod
-    @abstractmethod
     def get_vm_configuration(cls) -> Tuple[Tuple[int, Type['BaseVM']], ...]:
-        raise NotImplementedError("Chain classes must implement this method")
+        return cls.vm_configuration
 
     #
     # Chain API
@@ -149,9 +148,11 @@ def from_genesis_header(cls,
     #
     # VM API
     #
-    @abstractmethod
-    def get_vm_class(self, header: BlockHeader=None) -> Type['BaseVM']:
-        raise NotImplementedError("Chain classes must implement this method")
+    def get_vm_class(self, header: BlockHeader) -> Type['BaseVM']:
+        """
+        Returns the VM instance for the given block number.
+        """
+        return self.get_vm_class_for_block_number(header.block_number)
 
     @abstractmethod
     def get_vm(self, header: BlockHeader=None) -> 'BaseVM':
@@ -310,10 +311,6 @@ def get_chaindb_class(cls) -> Type[BaseChainDB]:
             raise AttributeError("`chaindb_class` not set")
         return cls.chaindb_class
 
-    @classmethod
-    def get_vm_configuration(cls) -> Tuple[Tuple[int, Type['BaseVM']], ...]:
-        return cls.vm_configuration
-
     #
     # Chain API
     #
@@ -371,13 +368,6 @@ def from_genesis_header(cls,
     #
     # VM API
     #
-    def get_vm_class(self, at_header: BlockHeader=None) -> Type['BaseVM']:
-        """
-        Returns the VM instance for the given block number.
-        """
-        header = self.ensure_header(at_header)
-        return self.get_vm_class_for_block_number(header.block_number)
-
     def get_vm(self, at_header: BlockHeader=None) -> 'BaseVM':
         """
         Returns the VM instance for the given block number.

trinity/plugins/builtin/tx_pool/plugin.py

@@ -8,11 +8,11 @@
 )
 from evm.chains.mainnet import (
     BYZANTIUM_MAINNET_BLOCK,
-    MainnetChain,
+    BaseMainnetChain,
 )
 from evm.chains.ropsten import (
     BYZANTIUM_ROPSTEN_BLOCK,
-    RopstenChain,
+    BaseRopstenChain,
 )
 
 from p2p.cancel_token import (
@@ -71,14 +71,14 @@ def should_start(self) -> bool:
         return all((self.peer_pool is not None, self.chain is not None, self.is_enabled))
 
     def start(self, context: PluginContext) -> None:
-        if isinstance(self.chain, MainnetChain):
+        if isinstance(self.chain, BaseMainnetChain):
             validator = DefaultTransactionValidator(self.chain, BYZANTIUM_MAINNET_BLOCK)
-        elif isinstance(self.chain, RopstenChain):
+        elif isinstance(self.chain, BaseRopstenChain):
             validator = DefaultTransactionValidator(self.chain, BYZANTIUM_ROPSTEN_BLOCK)
         else:
             # TODO: We could hint the user about e.g. a --tx-pool-no-validation flag to run the
             # tx pool without tx validation in this case
-            raise ValueError("The TxPool plugin does only support MainnetChain or RopstenChain")
+            raise ValueError("The TxPool plugin only supports MainnetChain or RopstenChain")
 
         tx_pool = TxPool(self.peer_pool, validator, self.cancel_token)
         asyncio.ensure_future(tx_pool.run())

trinity/plugins/builtin/tx_pool/validators.py

@@ -49,7 +49,8 @@ def __call__(self, transaction: BaseTransactionFields) -> bool:
 
     @cachetools.func.ttl_cache(maxsize=1024, ttl=300)
     def get_appropriate_tx_class(self) -> Type[BaseTransaction]:
-        current_tx_class = self.chain.get_vm_class().get_transaction_class()
+        head = self.chain.get_canonical_head()
+        current_tx_class = self.chain.get_vm_class(head).get_transaction_class()
         # If the current head of the chain is still on a fork that is before the currently
         # active fork (syncing), ensure that we use the specified initial tx class
         if self._is_outdated_tx_class(current_tx_class):