refactor: remove block context (#31)

* refactor: remove block context

* lint: clippy

* chore: name and doc cleanups in evm

Author: prestwich

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trevm"
-version = "0.3.1"
+version = "0.4.0"
 rust-version = "1.79.0"
 edition = "2021"
 authors = ["init4"]
@@ -33,7 +33,6 @@ alloy-primitives = "0.7.6"
 alloy-rpc-types-eth = "0.2.0"
 alloy-sol-types = "0.7.7"
 revm = { version = "12.0.0", default-features = false, features = ["std"] }
-thiserror = "1.0.63"
 zenith-types = "0.3"
 
 [dev-dependencies]

examples/basic_transact.rs

@@ -7,7 +7,7 @@ use revm::{
     primitives::{hex, AccountInfo, Address, Bytecode, TransactTo, U256},
     EvmBuilder, InMemoryDB,
 };
-use trevm::{trevm_aliases, NoopBlock, NoopCfg, Shanghai, TrevmBuilder, Tx};
+use trevm::{trevm_aliases, NoopBlock, NoopCfg, TrevmBuilder, Tx};
 
 /// Foundry's default Counter.sol contract bytecode.
 const CONTRACT_BYTECODE: &str = "0x6080604052348015600f57600080fd5b5060043610603c5760003560e01c80633fb5c1cb1460415780638381f58a146053578063d09de08a14606d575b600080fd5b6051604c3660046083565b600055565b005b605b60005481565b60405190815260200160405180910390f35b6051600080549080607c83609b565b9190505550565b600060208284031215609457600080fd5b5035919050565b60006001820160ba57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220091e48831e9eee32d4571d6291233a4fdaaa34b7dced8770f36f5368be825c5264736f6c63430008190033";
@@ -51,8 +51,7 @@ fn main() {
         .append_handler_register(inspector_handle_register)
         .build_trevm()
         .fill_cfg(&NoopCfg)
-        .open_block(&NoopBlock, Shanghai::default())
-        .unwrap();
+        .fill_block(&NoopBlock);
 
     let account = evm.read_account_ref(CONTRACT_ADDR).unwrap();
     println!("account: {account:?}");

examples/fork_ref_transact.rs

@@ -10,7 +10,7 @@ use revm::{
     primitives::{address, TxKind, U256},
     Evm,
 };
-use trevm::{NoopBlock, NoopCfg, Shanghai, TrevmBuilder, Tx};
+use trevm::{NoopBlock, NoopCfg, TrevmBuilder, Tx};
 
 sol! {
     #[allow(missing_docs)]
@@ -63,8 +63,7 @@ async fn main() -> eyre::Result<()> {
         .with_db(cache_db)
         .build_trevm()
         .fill_cfg(&NoopCfg)
-        .open_block(&NoopBlock, Shanghai::default())
-        .unwrap()
+        .fill_block(&NoopBlock)
         .fill_tx(&GetReservesFiller)
         .run()
         .inspect_err(|e| panic!("Execution error {e:?}"))

src/driver/alloy.rs

@@ -1,44 +1,36 @@
-use crate::{Block, BlockContext, EvmBlockComplete, EvmBlockDriverErrored, EvmNeedsTx};
+use crate::{Block, EvmBlockDriverErrored, EvmNeedsBlock, EvmNeedsTx};
 use revm::{primitives::EVMError, Database, DatabaseCommit};
 
 /// The result of running transactions for a block driver.
-pub type RunTxResult<'a, 'b, Ext, Db, C, T> =
-    Result<EvmNeedsTx<'a, Ext, Db, C>, EvmBlockDriverErrored<'a, 'b, Ext, Db, C, T>>;
+pub type RunTxResult<'a, Ext, Db, T> =
+    Result<EvmNeedsTx<'a, Ext, Db>, EvmBlockDriverErrored<'a, Ext, Db, T>>;
 
 /// The result of driving a block to completion.
-pub type DriveBlockResult<'a, 'b, Ext, Db, C, T> =
-    Result<EvmBlockComplete<'a, Ext, Db, C>, EvmBlockDriverErrored<'a, 'b, Ext, Db, C, T>>;
+pub type DriveBlockResult<'a, Ext, Db, T> =
+    Result<EvmNeedsBlock<'a, Ext, Db>, EvmBlockDriverErrored<'a, Ext, Db, T>>;
 
 /// Driver for a single trevm block. This trait allows a type to specify the
 /// entire lifecycle of a trevm block, from opening the block to driving the
 /// trevm to completion.
-pub trait BlockDriver<'b, Ext, C: BlockContext<Ext>>
-where
-    Self: 'b,
-{
+pub trait BlockDriver<Ext> {
     /// The [`Block`] filler for this driver.
     type Block: Block;
 
     /// An error type for this driver.
-    type Error<Db: Database>: std::error::Error
-        + From<EVMError<Db::Error>>
-        + From<<C as BlockContext<Ext>>::Error<Db>>;
+    type Error<Db: Database>: std::error::Error + From<EVMError<Db::Error>>;
 
     /// Get a reference to the block filler for this driver.
     fn block(&self) -> &Self::Block;
 
-    /// Get the context for this block.
-    fn context(&'b self) -> C;
-
     /// Run the transactions for the block.
     fn run_txns<'a, Db: Database + DatabaseCommit>(
-        &self,
-        trevm: EvmNeedsTx<'a, Ext, Db, C>,
-    ) -> RunTxResult<'a, 'b, Ext, Db, C, Self>;
+        &mut self,
+        trevm: EvmNeedsTx<'a, Ext, Db>,
+    ) -> RunTxResult<'a, Ext, Db, Self>;
 
     /// Run post
-    fn post_block_checks<Db: Database + DatabaseCommit>(
-        &self,
-        trevm: &EvmBlockComplete<'_, Ext, Db, C>,
+    fn post_block<Db: Database + DatabaseCommit>(
+        &mut self,
+        trevm: &EvmNeedsBlock<'_, Ext, Db>,
     ) -> Result<(), Self::Error<Db>>;
 }

src/driver/block.rs

@@ -1,38 +1,37 @@
-use crate::{BlockContext, BlockDriver, EvmBlockComplete, EvmChainDriverErrored, EvmNeedsBlock};
+use crate::{BlockDriver, EvmChainDriverErrored, EvmNeedsBlock};
 use revm::{
     primitives::{EVMError, SpecId},
     Database, DatabaseCommit,
 };
 
 /// The result of driving a chain to completion.
-pub type DriveChainResult<'a, 'b, Ext, Db, C, D> =
-    Result<(Vec<C>, EvmNeedsBlock<'a, Ext, Db>), EvmChainDriverErrored<'a, 'b, Ext, Db, C, D>>;
+pub type DriveChainResult<'a, Ext, Db, D> =
+    Result<EvmNeedsBlock<'a, Ext, Db>, EvmChainDriverErrored<'a, Ext, Db, D>>;
 
 /// Driver for a chain of blocks.
-pub trait ChainDriver<'b, Ext, C: BlockContext<Ext>> {
+pub trait ChainDriver<Ext> {
     /// The block driver for this chain.
-    type BlockDriver: BlockDriver<'b, Ext, C>;
+    type BlockDriver: BlockDriver<Ext>;
 
     /// An error type for this driver.
     type Error<Db: Database>: std::error::Error
         + From<EVMError<Db::Error>>
-        + From<<C as BlockContext<Ext>>::Error<Db>>
-        + From<<Self::BlockDriver as BlockDriver<'b, Ext, C>>::Error<Db>>;
+        + From<<Self::BlockDriver as BlockDriver<Ext>>::Error<Db>>;
 
     /// Get the spec id for a block.
-    fn spec_id_for(&self, block: &<Self::BlockDriver as BlockDriver<'b, Ext, C>>::Block) -> SpecId;
+    fn spec_id_for(&self, block: &<Self::BlockDriver as BlockDriver<Ext>>::Block) -> SpecId;
 
     /// Get the blocks in this chain. The blocks should be in order, and this
     /// function MUST NOT return an empty slice.
-    fn blocks(&self) -> &[Self::BlockDriver];
+    fn blocks(&mut self) -> &mut [Self::BlockDriver];
 
     /// Checks that run between blocks, e.g. 1559 base fee calculation,
     /// or parent-child relationships.
     ///
     /// The `idx` parameter is the index of the block in the chain.
-    fn check_interblock<Db: Database + DatabaseCommit>(
-        &self,
-        trevm: &EvmBlockComplete<'_, Ext, Db, C>,
+    fn interblock<Db: Database + DatabaseCommit>(
+        &mut self,
+        trevm: &EvmNeedsBlock<'_, Ext, Db>,
         idx: usize,
     ) -> Result<(), Self::Error<Db>>;
 }

src/driver/chain.rs

@@ -1,6 +1,3 @@
-mod alloy;
-pub use alloy::AlloyBlockError;
-
 mod block;
 pub use block::{BlockDriver, DriveBlockResult, RunTxResult};