Skip to content

feat: complete migration to StateDB #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xForerunner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: complete migration to StateDB #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions crates/evm/src/block/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ use alloc::{boxed::Box, vec::Vec};
use alloy_eips::eip7685::Requests;
use revm::{
context::result::{ExecutionResult, ResultAndState},
database::State,
inspector::NoOpInspector,
Inspector,
DatabaseCommit, Inspector,
};

mod error;
Expand Down Expand Up @@ -328,22 +327,22 @@ pub trait BlockExecutor {
pub trait BlockExecutorFor<'a, F: BlockExecutorFactory + ?Sized, DB, I = NoOpInspector>
where
Self: BlockExecutor<
Evm = <F::EvmFactory as EvmFactory>::Evm<&'a mut State<DB>, I>,
Evm = <F::EvmFactory as EvmFactory>::Evm<DB, I>,
Transaction = F::Transaction,
Receipt = F::Receipt,
>,
DB: Database + 'a,
I: Inspector<<F::EvmFactory as EvmFactory>::Context<&'a mut State<DB>>> + 'a,
DB: Database + DatabaseCommit + StateDB + 'a,
I: Inspector<<F::EvmFactory as EvmFactory>::Context<DB>> + 'a,
{
}

impl<'a, F, DB, I, T> BlockExecutorFor<'a, F, DB, I> for T
where
F: BlockExecutorFactory,
DB: Database + 'a,
I: Inspector<<F::EvmFactory as EvmFactory>::Context<&'a mut State<DB>>> + 'a,
DB: Database + DatabaseCommit + StateDB + 'a,
I: Inspector<<F::EvmFactory as EvmFactory>::Context<DB>> + 'a,
T: BlockExecutor<
Evm = <F::EvmFactory as EvmFactory>::Evm<&'a mut State<DB>, I>,
Evm = <F::EvmFactory as EvmFactory>::Evm<DB, I>,
Transaction = F::Transaction,
Receipt = F::Receipt,
>,
Expand Down Expand Up @@ -467,10 +466,10 @@ pub trait BlockExecutorFactory: 'static {
/// ```
fn create_executor<'a, DB, I>(
&'a self,
evm: <Self::EvmFactory as EvmFactory>::Evm<&'a mut State<DB>, I>,
evm: <Self::EvmFactory as EvmFactory>::Evm<DB, I>,
ctx: Self::ExecutionCtx<'a>,
) -> impl BlockExecutorFor<'a, Self, DB, I>
where
DB: Database + 'a,
I: Inspector<<Self::EvmFactory as EvmFactory>::Context<&'a mut State<DB>>> + 'a;
DB: Database + DatabaseCommit + StateDB + 'a,
I: Inspector<<Self::EvmFactory as EvmFactory>::Context<DB>> + 'a;
}
21 changes: 21 additions & 0 deletions crates/evm/src/block/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! State database abstraction.

use alloc::vec::Vec;
use alloy_primitives::Address;
use revm::database::State;

Expand All @@ -22,6 +23,12 @@ pub trait StateDB: revm::Database {
&mut self,
balances: impl IntoIterator<Item = (Address, u128)>,
) -> Result<(), Self::Error>;

/// Drains balances from the given accounts and returns the removed balances.
fn drain_balances(
&mut self,
addresses: impl IntoIterator<Item = Address>,
) -> Result<Vec<u128>, Self::Error>;
}

/// auto_impl unable to reconcile return associated type from supertrait
Expand All @@ -36,6 +43,13 @@ impl<T: StateDB> StateDB for &mut T {
) -> Result<(), Self::Error> {
StateDB::increment_balances(*self, balances)
}

fn drain_balances(
&mut self,
addresses: impl IntoIterator<Item = Address>,
) -> Result<Vec<u128>, Self::Error> {
StateDB::drain_balances(*self, addresses)
}
}

impl<DB: revm::Database> StateDB for State<DB> {
Expand All @@ -49,4 +63,11 @@ impl<DB: revm::Database> StateDB for State<DB> {
) -> Result<(), Self::Error> {
Self::increment_balances(self, balances)
}

fn drain_balances(
&mut self,
addresses: impl IntoIterator<Item = Address>,
) -> Result<Vec<u128>, Self::Error> {
Self::drain_balances(self, addresses)
}
}
18 changes: 7 additions & 11 deletions crates/evm/src/eth/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::{
state_changes::{balance_increment_state, post_block_balance_increments},
BlockExecutionError, BlockExecutionResult, BlockExecutor, BlockExecutorFactory,
BlockExecutorFor, BlockValidationError, ExecutableTx, OnStateHook,
StateChangePostBlockSource, StateChangeSource, SystemCaller,
StateChangePostBlockSource, StateChangeSource, StateDB, SystemCaller,
},
Database, Evm, EvmFactory, FromRecoveredTx, FromTxWithEncoded,
};
Expand All @@ -20,10 +20,7 @@ use alloy_consensus::{Header, Transaction, TxReceipt};
use alloy_eips::{eip4895::Withdrawals, eip7685::Requests, Encodable2718};
use alloy_hardforks::EthereumHardfork;
use alloy_primitives::{Log, B256};
use revm::{
context::Block, context_interface::result::ResultAndState, database::State, DatabaseCommit,
Inspector,
};
use revm::{context::Block, context_interface::result::ResultAndState, DatabaseCommit, Inspector};

/// Context for Ethereum block execution.
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -83,11 +80,10 @@ where
}
}

impl<'db, DB, E, Spec, R> BlockExecutor for EthBlockExecutor<'_, E, Spec, R>
impl<E, Spec, R> BlockExecutor for EthBlockExecutor<'_, E, Spec, R>
where
DB: Database + 'db,
E: Evm<
DB = &'db mut State<DB>,
DB: Database + DatabaseCommit + StateDB,
Tx: FromRecoveredTx<R::Transaction> + FromTxWithEncoded<R::Transaction>,
>,
Spec: EthExecutorSpec,
Expand Down Expand Up @@ -314,12 +310,12 @@ where

fn create_executor<'a, DB, I>(
&'a self,
evm: EvmF::Evm<&'a mut State<DB>, I>,
evm: EvmF::Evm<DB, I>,
ctx: Self::ExecutionCtx<'a>,
) -> impl BlockExecutorFor<'a, Self, DB, I>
where
DB: Database + 'a,
I: Inspector<EvmF::Context<&'a mut State<DB>>> + 'a,
DB: Database + DatabaseCommit + StateDB + 'a,
I: Inspector<EvmF::Context<DB>> + 'a,
{
EthBlockExecutor::new(evm, ctx, &self.spec, &self.receipt_builder)
}
Expand Down
9 changes: 4 additions & 5 deletions crates/op-evm/src/block/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pub use receipt_builder::OpAlloyReceiptBuilder;
use receipt_builder::OpReceiptBuilder;
use revm::{
context::{result::ResultAndState, Block},
database::State,
Database as _, DatabaseCommit, Inspector,
};

Expand Down Expand Up @@ -416,12 +415,12 @@ where

fn create_executor<'a, DB, I>(
&'a self,
evm: EvmF::Evm<&'a mut State<DB>, I>,
evm: EvmF::Evm<DB, I>,
ctx: Self::ExecutionCtx<'a>,
) -> impl BlockExecutorFor<'a, Self, DB, I>
where
DB: Database + 'a,
I: Inspector<EvmF::Context<&'a mut State<DB>>> + 'a,
DB: Database + DatabaseCommit + StateDB + 'a,
I: Inspector<EvmF::Context<DB>> + 'a,
{
OpBlockExecutor::new(evm, ctx, &self.spec, &self.receipt_builder)
}
Expand All @@ -446,7 +445,7 @@ mod tests {
};
use revm::{
context::BlockEnv,
database::{CacheDB, EmptyDB, InMemoryDB},
database::{CacheDB, EmptyDB, InMemoryDB, State},
inspector::NoOpInspector,
primitives::HashMap,
state::AccountInfo,
Expand Down