Merge branch 'master' into no-fuzz-proptest

Author: grandizzy

crates/anvil/Cargo.toml

@@ -30,7 +30,7 @@ foundry-evm.workspace = true
 foundry-evm-core.workspace = true
 
 # alloy
-alloy-evm.workspace = true
+alloy-evm = { workspace = true, features = ["call-util"] }
 alloy-op-evm.workspace = true
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }

crates/anvil/src/config.rs

@@ -65,6 +65,7 @@ use tokio::sync::RwLock as TokioRwLock;
 use yansi::Paint;
 
 pub use foundry_common::version::SHORT_VERSION as VERSION_MESSAGE;
+use foundry_evm::traces::{CallTraceDecoderBuilder, identifier::SignaturesIdentifier};
 
 /// Default port the rpc will open
 pub const NODE_PORT: u16 = 8545;
@@ -1102,6 +1103,15 @@ impl NodeConfig {
             genesis_init: self.genesis.clone(),
         };
 
+        let mut decoder_builder = CallTraceDecoderBuilder::new();
+        if self.print_traces {
+            // if traces should get printed we configure the decoder with the signatures cache
+            if let Ok(identifier) = SignaturesIdentifier::new(false) {
+                debug!(target: "node", "using signature identifier");
+                decoder_builder = decoder_builder.with_signature_identifier(identifier);
+            }
+        }
+
         // only memory based backend for now
         let backend = mem::Backend::with_genesis(
             db,
@@ -1112,6 +1122,7 @@ impl NodeConfig {
             self.enable_steps_tracing,
             self.print_logs,
             self.print_traces,
+            Arc::new(decoder_builder.build()),
             self.odyssey,
             self.prune_history,
             self.max_persisted_states,

crates/anvil/src/eth/api.rs

@@ -35,6 +35,7 @@ use alloy_consensus::{
 };
 use alloy_dyn_abi::TypedData;
 use alloy_eips::eip2718::Encodable2718;
+use alloy_evm::overrides::OverrideBlockHashes;
 use alloy_network::{
     AnyRpcBlock, AnyRpcTransaction, BlockResponse, Ethereum, NetworkWallet, TransactionBuilder,
     TransactionResponse, eip2718::Decodable2718,
@@ -2965,7 +2966,7 @@ impl EthApi {
                         )?;
                     }
                     if let Some(block_overrides) = overrides.block {
-                        state::apply_block_overrides(*block_overrides, &mut cache_db, &mut block);
+                        cache_db.apply_block_overrides(*block_overrides, &mut block);
                     }
                     this.do_estimate_gas_with_state(request, &cache_db as &dyn DatabaseRef, block)
                 })

crates/anvil/src/eth/backend/executor.rs

@@ -24,7 +24,10 @@ use anvil_core::eth::{
         DepositReceipt, PendingTransaction, TransactionInfo, TypedReceipt, TypedTransaction,
     },
 };
-use foundry_evm::{backend::DatabaseError, traces::CallTraceNode};
+use foundry_evm::{
+    backend::DatabaseError,
+    traces::{CallTraceDecoder, CallTraceNode},
+};
 use foundry_evm_core::either_evm::EitherEvm;
 use op_revm::{L1BlockInfo, OpContext, precompiles::OpPrecompiles};
 use revm::{
@@ -119,6 +122,8 @@ pub struct TransactionExecutor<'a, Db: ?Sized, V: TransactionValidator> {
     pub optimism: bool,
     pub print_logs: bool,
     pub print_traces: bool,
+    /// Recorder used for decoding traces, used together with print_traces
+    pub call_trace_decoder: Arc<CallTraceDecoder>,
     /// Precompiles to inject to the EVM.
     pub precompile_factory: Option<Arc<dyn PrecompileFactory>>,
     pub blob_params: BlobParams,
@@ -367,7 +372,7 @@ impl<DB: Db + ?Sized, V: TransactionValidator> Iterator for &mut TransactionExec
         };
 
         if self.print_traces {
-            inspector.print_traces();
+            inspector.print_traces(self.call_trace_decoder.clone());
         }
         inspector.print_logs();
 

crates/anvil/src/eth/backend/mem/inspector.rs

@@ -19,6 +19,7 @@ use revm::{
         interpreter::EthInterpreter,
     },
 };
+use std::sync::Arc;
 
 /// The [`revm::Inspector`] used when transacting in the evm
 #[derive(Clone, Debug, Default)]
@@ -40,17 +41,17 @@ impl AnvilInspector {
     }
 
     /// Consumes the type and prints the traces.
-    pub fn into_print_traces(mut self) {
+    pub fn into_print_traces(mut self, decoder: Arc<CallTraceDecoder>) {
         if let Some(a) = self.tracer.take() {
-            print_traces(a)
+            print_traces(a, decoder);
         }
     }
 
     /// Called after the inspecting the evm
     /// This will log all traces
-    pub fn print_traces(&self) {
+    pub fn print_traces(&self, decoder: Arc<CallTraceDecoder>) {
         if let Some(a) = self.tracer.clone() {
-            print_traces(a)
+            print_traces(a, decoder);
         }
     }
 
@@ -60,6 +61,7 @@ impl AnvilInspector {
         self
     }
 
+    /// Configures the `TracingInspector` [`revm::Inspector`]
     pub fn with_tracing_config(mut self, config: TracingInspectorConfig) -> Self {
         self.tracer = Some(TracingInspector::new(config));
         self
@@ -91,11 +93,10 @@ impl AnvilInspector {
 /// # Panics
 ///
 /// If called outside tokio runtime
-fn print_traces(tracer: TracingInspector) {
+fn print_traces(tracer: TracingInspector, decoder: Arc<CallTraceDecoder>) {
     let arena = tokio::task::block_in_place(move || {
         tokio::runtime::Handle::current().block_on(async move {
             let mut arena = tracer.into_traces();
-            let decoder = CallTraceDecoder::new();
             decoder.populate_traces(arena.nodes_mut()).await;
             arena
         })

crates/anvil/src/eth/backend/mem/mod.rs

@@ -1,6 +1,7 @@
 //! In-memory blockchain backend.
 
 use self::state::trie_storage;
+use super::executor::new_evm_with_inspector_ref;
 use crate::{
     ForkChoice, NodeConfig, PrecompileFactory,
     config::PruneStateHistoryConfig,
@@ -40,7 +41,9 @@ use alloy_consensus::{
     transaction::Recovered,
 };
 use alloy_eips::{eip1559::BaseFeeParams, eip4844::kzg_to_versioned_hash, eip7840::BlobParams};
-use alloy_evm::{Database, Evm, eth::EthEvmContext, precompiles::PrecompilesMap};
+use alloy_evm::{
+    Database, Evm, eth::EthEvmContext, overrides::OverrideBlockHashes, precompiles::PrecompilesMap,
+};
 use alloy_network::{
     AnyHeader, AnyRpcBlock, AnyRpcHeader, AnyRpcTransaction, AnyTxEnvelope, AnyTxType,
     EthereumWallet, UnknownTxEnvelope, UnknownTypedTransaction,
@@ -89,7 +92,7 @@ use foundry_evm::{
     constants::DEFAULT_CREATE2_DEPLOYER_RUNTIME_CODE,
     decode::RevertDecoder,
     inspectors::AccessListInspector,
-    traces::TracingInspectorConfig,
+    traces::{CallTraceDecoder, TracingInspectorConfig},
     utils::{get_blob_base_fee_update_fraction, get_blob_base_fee_update_fraction_by_spec_id},
 };
 use foundry_evm_core::either_evm::EitherEvm;
@@ -125,8 +128,6 @@ use std::{
 use storage::{Blockchain, DEFAULT_HISTORY_LIMIT, MinedTransaction};
 use tokio::sync::RwLock as AsyncRwLock;
 
-use super::executor::new_evm_with_inspector_ref;
-
 pub mod cache;
 pub mod fork_db;
 pub mod in_memory_db;
@@ -226,6 +227,8 @@ pub struct Backend {
     enable_steps_tracing: bool,
     print_logs: bool,
     print_traces: bool,
+    /// Recorder used for decoding traces, used together with print_traces
+    call_trace_decoder: Arc<CallTraceDecoder>,
     odyssey: bool,
     /// How to keep history state
     prune_state_history_config: PruneStateHistoryConfig,
@@ -255,6 +258,7 @@ impl Backend {
         enable_steps_tracing: bool,
         print_logs: bool,
         print_traces: bool,
+        call_trace_decoder: Arc<CallTraceDecoder>,
         odyssey: bool,
         prune_state_history_config: PruneStateHistoryConfig,
         max_persisted_states: Option<usize>,
@@ -360,6 +364,7 @@ impl Backend {
             enable_steps_tracing,
             print_logs,
             print_traces,
+            call_trace_decoder,
             odyssey,
             prune_state_history_config,
             transaction_block_keeper,
@@ -1211,7 +1216,7 @@ impl Backend {
         inspector.print_logs();
 
         if self.print_traces {
-            inspector.print_traces();
+            inspector.print_traces(self.call_trace_decoder.clone());
         }
 
         Ok((exit_reason, out, gas_used, state, logs.unwrap_or_default()))
@@ -1254,6 +1259,7 @@ impl Backend {
             enable_steps_tracing: self.enable_steps_tracing,
             print_logs: self.print_logs,
             print_traces: self.print_traces,
+            call_trace_decoder: self.call_trace_decoder.clone(),
             precompile_factory: self.precompile_factory.clone(),
             odyssey: self.odyssey,
             optimism: self.is_optimism(),
@@ -1340,6 +1346,7 @@ impl Backend {
                     enable_steps_tracing: self.enable_steps_tracing,
                     print_logs: self.print_logs,
                     print_traces: self.print_traces,
+                    call_trace_decoder: self.call_trace_decoder.clone(),
                     odyssey: self.odyssey,
                     precompile_factory: self.precompile_factory.clone(),
                     optimism: self.is_optimism(),
@@ -1477,7 +1484,7 @@ impl Backend {
                     state::apply_state_overrides(state_overrides.into_iter().collect(), &mut cache_db)?;
                 }
                 if let Some(block_overrides) = overrides.block {
-                    state::apply_block_overrides(*block_overrides, &mut cache_db, &mut block);
+                    cache_db.apply_block_overrides(*block_overrides, &mut block);
                 }
                 self.call_with_state(&cache_db as &dyn DatabaseRef, request, fee_details, block)
             }?;
@@ -1656,7 +1663,7 @@ impl Backend {
                     state::apply_state_overrides(state_overrides, &mut cache_db)?;
                 }
                 if let Some(block_overrides) = block_overrides {
-                    state::apply_block_overrides(block_overrides, &mut cache_db, &mut block_env);
+                    cache_db.apply_block_overrides(block_overrides, &mut block_env);
                 }
 
                 // execute all calls in that block
@@ -1862,7 +1869,7 @@ impl Backend {
         inspector.print_logs();
 
         if self.print_traces {
-            inspector.into_print_traces();
+            inspector.into_print_traces(self.call_trace_decoder.clone());
         }
 
         Ok((exit_reason, out, gas_used as u128, state))
@@ -1887,7 +1894,7 @@ impl Backend {
                 state::apply_state_overrides(state_overrides, &mut cache_db)?;
             }
             if let Some(block_overrides) = block_overrides {
-                state::apply_block_overrides(block_overrides, &mut cache_db, &mut block);
+                cache_db.apply_block_overrides(block_overrides, &mut block);
             }
 
             if let Some(tracer) = tracer {

crates/anvil/src/eth/backend/mem/state.rs

@@ -3,12 +3,11 @@
 use crate::eth::error::BlockchainError;
 use alloy_primitives::{Address, B256, U256, keccak256, map::HashMap};
 use alloy_rlp::Encodable;
-use alloy_rpc_types::{BlockOverrides, state::StateOverride};
+use alloy_rpc_types::state::StateOverride;
 use alloy_trie::{HashBuilder, Nibbles};
 use foundry_evm::backend::DatabaseError;
 use revm::{
     bytecode::Bytecode,
-    context::BlockEnv,
     database::{CacheDB, DatabaseRef, DbAccount},
     state::AccountInfo,
 };
@@ -121,51 +120,3 @@ where
     }
     Ok(())
 }
-
-/// Applies the given block overrides to the env and updates overridden block hashes in the db.
-pub fn apply_block_overrides<DB>(
-    overrides: BlockOverrides,
-    cache_db: &mut CacheDB<DB>,
-    env: &mut BlockEnv,
-) {
-    let BlockOverrides {
-        number,
-        difficulty,
-        time,
-        gas_limit,
-        coinbase,
-        random,
-        base_fee,
-        block_hash,
-    } = overrides;
-
-    if let Some(block_hashes) = block_hash {
-        // override block hashes
-        cache_db
-            .cache
-            .block_hashes
-            .extend(block_hashes.into_iter().map(|(num, hash)| (U256::from(num), hash)))
-    }
-
-    if let Some(number) = number {
-        env.number = number.saturating_to();
-    }
-    if let Some(difficulty) = difficulty {
-        env.difficulty = difficulty;
-    }
-    if let Some(time) = time {
-        env.timestamp = U256::from(time);
-    }
-    if let Some(gas_limit) = gas_limit {
-        env.gas_limit = gas_limit;
-    }
-    if let Some(coinbase) = coinbase {
-        env.beneficiary = coinbase;
-    }
-    if let Some(random) = random {
-        env.prevrandao = Some(random);
-    }
-    if let Some(base_fee) = base_fee {
-        env.basefee = base_fee.saturating_to();
-    }
-}

crates/evm/traces/src/decoder/mod.rs

@@ -410,18 +410,18 @@ impl CallTraceDecoder {
                     None
                 };
 
-                if let Some(func) = functions.first() {
-                    return DecodedCallTrace {
+                return if let Some(func) = functions.first() {
+                    DecodedCallTrace {
                         label,
                         call_data: Some(self.decode_function_input(trace, func)),
                         return_data,
-                    };
+                    }
                 } else {
-                    return DecodedCallTrace {
+                    DecodedCallTrace {
                         label,
                         call_data: self.fallback_call_data(trace),
                         return_data,
-                    };
+                    }
                 };
             }