Lifetimed EvmFactory (#63)

* feat: evm factory

* doc: note about trait lifetime

* fix: clippy

* fix: import alloc

Author: prestwich

src/connect.rs

@@ -1,22 +1,36 @@
+use alloc::format;
 use core::convert::Infallible;
-use revm::{Database, DatabaseCommit};
+use revm::{
+    primitives::{EVMError, ResultAndState},
+    Database, DatabaseCommit,
+};
 
-/// Trait for types that can be used to connect to a database. Connectors
-/// should contain configuration information like filesystem paths. They are
-/// intended to enable parallel instantiation of multiple EVMs in multiple
-/// threads sharing some database configuration
-pub trait DbConnect: Sync {
+use crate::{
+    Block, Cfg, EvmErrored, EvmNeedsBlock, EvmNeedsCfg, EvmNeedsTx, EvmReady, EvmTransacted, Tx,
+};
+
+/// Trait for types that can be used to connect to a database.
+///
+/// Connectors should contain configuration information like filesystem paths.
+/// They are intended to enable parallel instantiation of multiple EVMs in
+/// multiple threads sharing some database configuration
+///
+/// The lifetime on this trait allows the resulting DB to borrow from the
+/// connector. E.g. the connector may contain some `Db` and the resulting Db may
+/// contain `&Db`. This allows for (e.g.) shared caches between multiple DB
+/// threads.
+pub trait DbConnect<'a>: Sync {
     /// The database type returned when connecting.
     type Database: Database + DatabaseCommit;
 
     /// The error type returned when connecting to the database.
     type Error: core::error::Error;
 
     /// Connect to the database.
-    fn connect(&self) -> Result<Self::Database, Self::Error>;
+    fn connect(&'a self) -> Result<Self::Database, Self::Error>;
 }
 
-impl<Db> DbConnect for Db
+impl<Db> DbConnect<'_> for Db
 where
     Db: Database + DatabaseCommit + Clone + Sync,
 {
@@ -28,3 +42,100 @@ where
         Ok(self.clone())
     }
 }
+
+/// Trait for types that can create EVM instances.
+pub trait EvmFactory<'a>: DbConnect<'a> {
+    /// The `Ext` type used in the resulting EVM.
+    type Ext: Sync;
+
+    /// Create a new EVM instance with the given database connection and
+    /// extension.
+    fn create(&'a self) -> Result<EvmNeedsCfg<'a, Self::Ext, Self::Database>, Self::Error>;
+
+    /// Create a new EVM instance and parameterize it with a [`Cfg`].
+    fn create_with_cfg<C>(
+        &'a self,
+        cfg: &C,
+    ) -> Result<EvmNeedsBlock<'a, Self::Ext, Self::Database>, Self::Error>
+    where
+        C: Cfg,
+    {
+        self.create().map(|evm| evm.fill_cfg(cfg))
+    }
+
+    /// Create a new EVM instance and parameterize it with a [`Cfg`] and a
+    /// [`Block`].
+    fn create_with_block<C, B>(
+        &'a self,
+        cfg: &C,
+        block: &B,
+    ) -> Result<EvmNeedsTx<'a, Self::Ext, Self::Database>, Self::Error>
+    where
+        C: Cfg,
+        B: Block,
+    {
+        self.create_with_cfg(cfg).map(|evm| evm.fill_block(block))
+    }
+
+    /// Create a new EVM instance, and parameterize it with a [`Cfg`], a
+    /// [`Block`], and a [`Tx`], yielding an [`EvmReady`].
+    fn create_with_tx<C, B, T>(
+        &'a self,
+        cfg: &C,
+        block: &B,
+        tx: &T,
+    ) -> Result<EvmReady<'a, Self::Ext, Self::Database>, Self::Error>
+    where
+        C: Cfg,
+        B: Block,
+        T: Tx,
+    {
+        self.create_with_block(cfg, block).map(|evm| evm.fill_tx(tx))
+    }
+
+    /// Create a new EVM instance, parameterize it with a [`Cfg`], a
+    /// [`Block`], and a [`Tx`], and run the transaction, yielding either
+    /// [`EvmTransacted`] or [`EvmErrored`].
+    #[allow(clippy::type_complexity)]
+    fn transact<C, B, T>(
+        &'a self,
+        cfg: &C,
+        block: &B,
+        tx: &T,
+    ) -> Result<
+        Result<
+            EvmTransacted<'a, Self::Ext, Self::Database>,
+            EvmErrored<'a, Self::Ext, Self::Database>,
+        >,
+        Self::Error,
+    >
+    where
+        C: Cfg,
+        B: Block,
+        T: Tx,
+    {
+        let evm = self.create_with_tx(cfg, block, tx)?;
+        Ok(evm.run())
+    }
+
+    /// Run a transaction, take the [`ResultAndState`], and discard the Evm.
+    /// This is a high-level shortcut function.
+    fn run<C, B, T>(
+        &'a self,
+        cfg: &C,
+        block: &B,
+        tx: &T,
+    ) -> Result<ResultAndState, EVMError<<Self::Database as Database>::Error>>
+    where
+        C: Cfg,
+        B: Block,
+        T: Tx,
+    {
+        let trevm = self.transact(cfg, block, tx).map_err(|e| EVMError::Custom(format!("{e}")))?;
+
+        match trevm {
+            Ok(t) => Ok(t.into_result_and_state()),
+            Err(t) => Err(t.into_error()),
+        }
+    }
+}

src/lib.rs

@@ -364,7 +364,7 @@
 extern crate alloc;
 
 mod connect;
-pub use connect::DbConnect;
+pub use connect::{DbConnect, EvmFactory};
 
 mod driver;
 pub use driver::{