Merge branch 'main' of https://github.com/bluealloy/revm

Author: mrLSD

Cargo.lock

@@ -1,6 +1,6 @@
 use core::ops::{Deref, DerefMut};
 use database_interface::{Database, DatabaseGetter};
-use primitives::{Address, Log, B256, U256};
+use primitives::{Address, HashSet, Log, B256, U256};
 use specification::hardfork::SpecId;
 use state::{Account, Bytecode};
 use std::boxed::Box;
@@ -17,10 +17,10 @@ pub trait Journal {
     fn new(database: Self::Database) -> Self;
 
     /// Returns the database.
-    fn db(&self) -> &Self::Database;
+    fn db_ref(&self) -> &Self::Database;
 
     /// Returns the mutable database.
-    fn db_mut(&mut self) -> &mut Self::Database;
+    fn db(&mut self) -> &mut Self::Database;
 
     /// Returns the storage value from Journal state.
     ///
@@ -63,6 +63,10 @@ pub trait Journal {
 
     fn warm_account(&mut self, address: Address);
 
+    fn warm_precompiles(&mut self, addresses: HashSet<Address>);
+
+    fn precompile_addresses(&self) -> &HashSet<Address>;
+
     fn set_spec_id(&mut self, spec_id: SpecId);
 
     fn touch_account(&mut self, address: Address);

crates/context/interface/src/journaled_state.rs

@@ -54,6 +54,15 @@ impl<HaltReasonT: HaltReasonTrait> ExecutionResult<HaltReasonT> {
         matches!(self, Self::Success { .. })
     }
 
+    /// Returns created address if execution is Create transaction
+    /// and Contract was created.
+    pub fn created_address(&self) -> Option<Address> {
+        match self {
+            Self::Success { output, .. } => output.address().cloned(),
+            _ => None,
+        }
+    }
+
     /// Returns true if execution result is a Halt.
     pub fn is_halt(&self) -> bool {
         matches!(self, Self::Halt { .. })
@@ -175,9 +184,9 @@ impl<DB, TX> FromStringError for EVMError<DB, TX> {
     }
 }
 
-impl<DB, TXERROR: From<InvalidTransaction>> From<InvalidTransaction> for EVMError<DB, TXERROR> {
+impl<DB> From<InvalidTransaction> for EVMError<DB, InvalidTransaction> {
     fn from(value: InvalidTransaction) -> Self {
-        Self::Transaction(value.into())
+        Self::Transaction(value)
     }
 }
 

crates/context/interface/src/result.rs

@@ -313,7 +313,7 @@ where
     where
         F: FnOnce(&mut DB),
     {
-        f(self.journaled_state.db_mut());
+        f(self.journaled_state.db());
     }
 
     pub fn modify_journal<F>(&mut self, f: F)
@@ -395,7 +395,7 @@ where
         if diff <= BLOCK_HASH_HISTORY {
             return self
                 .journaled_state
-                .db_mut()
+                .db()
                 .block_hash(requested_number)
                 .map_err(|e| self.error = Err(e))
                 .ok();
@@ -508,7 +508,11 @@ where
     type Database = DB;
 
     fn db(&mut self) -> &mut Self::Database {
-        self.journaled_state.db_mut()
+        self.journaled_state.db()
+    }
+
+    fn db_ref(&self) -> &Self::Database {
+        self.journaled_state.db_ref()
     }
 }
 

crates/context/src/context.rs

@@ -52,6 +52,8 @@ pub struct JournaledState<DB> {
     /// Note that this not include newly loaded accounts, account and storage
     /// is considered warm if it is found in the `State`.
     pub warm_preloaded_addresses: HashSet<Address>,
+    /// Precompile addresses
+    pub precompiles: HashSet<Address>,
 }
 
 impl<DB: Database> Journal for JournaledState<DB> {
@@ -63,11 +65,11 @@ impl<DB: Database> Journal for JournaledState<DB> {
         Self::new(SpecId::LATEST, database)
     }
 
-    fn db(&self) -> &Self::Database {
+    fn db_ref(&self) -> &Self::Database {
         &self.database
     }
 
-    fn db_mut(&mut self) -> &mut Self::Database {
+    fn db(&mut self) -> &mut Self::Database {
         &mut self.database
     }
 
@@ -112,6 +114,17 @@ impl<DB: Database> Journal for JournaledState<DB> {
         self.warm_preloaded_addresses.insert(address);
     }
 
+    fn warm_precompiles(&mut self, address: HashSet<Address>) {
+        self.precompiles = address;
+        self.warm_preloaded_addresses
+            .extend(self.precompiles.iter());
+    }
+
+    #[inline]
+    fn precompile_addresses(&self) -> &HashSet<Address> {
+        &self.precompiles
+    }
+
     /// Returns call depth.
     #[inline]
     fn depth(&self) -> usize {
@@ -212,6 +225,7 @@ impl<DB: Database> Journal for JournaledState<DB> {
             spec: _,
             database: _,
             warm_preloaded_addresses: _,
+            precompiles: _,
         } = self;
 
         *transient_storage = TransientStorage::default();
@@ -243,6 +257,7 @@ impl<DB: Database> JournaledState<DB> {
             depth: 0,
             spec,
             warm_preloaded_addresses: HashSet::default(),
+            precompiles: HashSet::default(),
         }
     }
 

crates/context/src/journaled_state.rs

@@ -1,19 +1,19 @@
 use core::future::Future;
 
+use crate::{DBErrorMarker, Database, DatabaseRef};
+use core::error::Error;
 use primitives::{Address, B256, U256};
 use state::{AccountInfo, Bytecode};
 use tokio::runtime::{Handle, Runtime};
 
-use crate::{DBErrorMarker, Database, DatabaseRef};
-
 /// The async EVM database interface
 ///
 /// Contains the same methods as [Database], but it returns [Future] type instead.
 ///
 /// Use [WrapDatabaseAsync] to provide [Database] implementation for a type that only implements this trait.
 pub trait DatabaseAsync {
     /// The database error type
-    type Error: Send + DBErrorMarker;
+    type Error: Send + DBErrorMarker + Error;
 
     /// Gets basic account information.
     fn basic_async(
@@ -48,7 +48,7 @@ pub trait DatabaseAsync {
 /// Use [WrapDatabaseAsync] to provide [DatabaseRef] implementation for a type that only implements this trait.
 pub trait DatabaseAsyncRef {
     /// The database error type
-    type Error: Send + DBErrorMarker;
+    type Error: Send + DBErrorMarker + Error;
 
     /// Gets basic account information.
     fn basic_async_ref(

crates/database/interface/src/async_db.rs

@@ -1,4 +1,5 @@
 use crate::{DBErrorMarker, Database, DatabaseRef};
+use core::error::Error;
 use core::{convert::Infallible, fmt, marker::PhantomData};
 use primitives::{keccak256, Address, B256, U256};
 use state::{AccountInfo, Bytecode};
@@ -52,7 +53,7 @@ impl<E> EmptyDBTyped<E> {
     }
 }
 
-impl<E: DBErrorMarker> Database for EmptyDBTyped<E> {
+impl<E: DBErrorMarker + Error> Database for EmptyDBTyped<E> {
     type Error = E;
 
     #[inline]
@@ -76,7 +77,7 @@ impl<E: DBErrorMarker> Database for EmptyDBTyped<E> {
     }
 }
 
-impl<E: DBErrorMarker> DatabaseRef for EmptyDBTyped<E> {
+impl<E: DBErrorMarker + Error> DatabaseRef for EmptyDBTyped<E> {
     type Error = E;
 
     #[inline]

crates/database/interface/src/empty_db.rs

@@ -8,6 +8,7 @@ extern crate alloc as std;
 use core::convert::Infallible;
 
 use auto_impl::auto_impl;
+use core::error::Error;
 use primitives::{Address, HashMap, B256, U256};
 use state::{Account, AccountInfo, Bytecode};
 use std::string::String;
@@ -35,7 +36,7 @@ impl DBErrorMarker for String {}
 #[auto_impl(&mut, Box)]
 pub trait Database {
     /// The database error type.
-    type Error: DBErrorMarker;
+    type Error: DBErrorMarker + Error;
     //type Bytecode: BytecodeTrait;
 
     /// Gets basic account information.
@@ -67,7 +68,7 @@ pub trait DatabaseCommit {
 #[auto_impl(&, &mut, Box, Rc, Arc)]
 pub trait DatabaseRef {
     /// The database error type.
-    type Error: DBErrorMarker;
+    type Error: DBErrorMarker + Error;
 
     /// Gets basic account information.
     fn basic_ref(&self, address: Address) -> Result<Option<AccountInfo>, Self::Error>;
@@ -129,4 +130,6 @@ pub trait DatabaseGetter {
     type Database: Database;
 
     fn db(&mut self) -> &mut Self::Database;
+
+    fn db_ref(&self) -> &Self::Database;
 }

crates/database/interface/src/lib.rs

@@ -7,15 +7,25 @@ use alloy_provider::{
     Network, Provider,
 };
 use alloy_transport::{Transport, TransportError};
+use core::error::Error;
 use database_interface::{async_db::DatabaseAsyncRef, DBErrorMarker};
 use primitives::{Address, B256, U256};
 use state::{AccountInfo, Bytecode};
+use std::fmt::Display;
 
 #[derive(Debug)]
 pub struct DBTransportError(pub TransportError);
 
 impl DBErrorMarker for DBTransportError {}
 
+impl Display for DBTransportError {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "Transport error: {}", self.0)
+    }
+}
+
+impl Error for DBTransportError {}
+
 impl From<TransportError> for DBTransportError {
     fn from(e: TransportError) -> Self {
         Self(e)

crates/database/src/alloydb.rs

@@ -85,7 +85,7 @@ impl<DB: Database> StateBuilder<DB> {
     }
 
     /// With boxed version of database.
-    pub fn with_database_boxed<Error: DBErrorMarker>(
+    pub fn with_database_boxed<Error: DBErrorMarker + core::error::Error>(
         self,
         database: DBBox<'_, Error>,
     ) -> StateBuilder<DBBox<'_, Error>> {