feat: Add state root calculation time from latest flashblock state to metering RPC

Cargo.toml

@@ -63,7 +63,8 @@ base-reth-test-utils = { path = "crates/test-utils" }
 base-reth-flashblocks = { path = "crates/flashblocks" }
 
 # base/tips
-tips-core = { git = "https://github.com/base/tips", rev = "b1dfde6a5c8f603f19f9309ca6dc015bad260b44" }
+# Note: default-features = false avoids version conflicts with reth's alloy/op-alloy dependencies
+tips-core = { git = "https://github.com/base/tips", rev = "c08eaa4fe10c26de8911609b41ddab4918698325", default-features = false }
 
 # reth
 reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
@@ -94,10 +95,12 @@ reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag =
 reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3", features = [
     "op",
 ] }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
 
 # revm
 revm = { version = "31.0.2", default-features = false }
 revm-bytecode = { version = "7.1.1", default-features = false }
+revm-database = { version = "9.0.6", default-features = false }
 
 # alloy
 alloy-trie = "0.9.1"

crates/flashblocks/Cargo.toml

@@ -26,6 +26,9 @@ reth-optimism-evm.workspace = true
 reth-optimism-chainspec.workspace = true
 reth-optimism-primitives.workspace = true
 
+# revm
+revm-database.workspace = true
+
 # alloy
 alloy-eips.workspace = true
 alloy-provider.workspace = true
@@ -58,11 +61,14 @@ metrics-derive.workspace = true
 rayon.workspace = true
 
 [dev-dependencies]
+alloy-genesis.workspace = true
 rand.workspace = true
+revm.workspace = true
 reth-db.workspace = true
 once_cell.workspace = true
 reth-provider.workspace = true
 reth-db-common.workspace = true
+reth-optimism-node.workspace = true
 alloy-rpc-client.workspace = true
 op-alloy-consensus.workspace = true
 reth-testing-utils.workspace = true

crates/flashblocks/src/metrics.rs

@@ -60,4 +60,12 @@ pub struct Metrics {
     /// Total number of WebSocket reconnection attempts.
     #[metric(describe = "Total number of WebSocket reconnection attempts")]
     pub reconnect_attempts: Counter,
+
+    /// Time taken to clone bundle state.
+    #[metric(describe = "Time taken to clone bundle state")]
+    pub bundle_state_clone_duration: Histogram,
+
+    /// Size of bundle state being cloned (number of accounts).
+    #[metric(describe = "Size of bundle state being cloned (number of accounts)")]
+    pub bundle_state_clone_size: Histogram,
 }

crates/flashblocks/src/pending_blocks.rs

@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{sync::Arc, time::Instant};
 
 use alloy_consensus::{Header, Sealed};
 use alloy_eips::BlockNumberOrTag;
@@ -14,11 +14,14 @@ use base_flashtypes::Flashblock;
 use eyre::eyre;
 use op_alloy_network::Optimism;
 use op_alloy_rpc_types::{OpTransactionReceipt, Transaction};
-use reth::revm::{db::Cache, state::EvmState};
+use reth::revm::{
+    db::{BundleState, Cache},
+    state::EvmState,
+};
 use reth_rpc_convert::RpcTransaction;
 use reth_rpc_eth_api::{RpcBlock, RpcReceipt};
 
-use crate::PendingBlocksAPI;
+use crate::{Metrics, PendingBlocksAPI};
 
 /// Builder for [`PendingBlocks`].
 #[derive(Debug)]
@@ -36,6 +39,7 @@ pub struct PendingBlocksBuilder {
     state_overrides: Option<StateOverride>,
 
     db_cache: Cache,
+    bundle_state: BundleState,
 }
 
 impl PendingBlocksBuilder {
@@ -52,6 +56,7 @@ impl PendingBlocksBuilder {
             transaction_senders: HashMap::new(),
             state_overrides: None,
             db_cache: Cache::default(),
+            bundle_state: BundleState::default(),
         }
     }
 
@@ -122,6 +127,12 @@ impl PendingBlocksBuilder {
         self
     }
 
+    #[inline]
+    pub(crate) fn with_bundle_state(&mut self, bundle_state: BundleState) -> &Self {
+        self.bundle_state = bundle_state;
+        self
+    }
+
     pub(crate) fn build(self) -> eyre::Result<PendingBlocks> {
         if self.headers.is_empty() {
             return Err(eyre!("missing headers"));
@@ -143,6 +154,7 @@ impl PendingBlocksBuilder {
             transaction_senders: self.transaction_senders,
             state_overrides: self.state_overrides,
             db_cache: self.db_cache,
+            bundle_state: self.bundle_state,
         })
     }
 }
@@ -163,6 +175,7 @@ pub struct PendingBlocks {
     state_overrides: Option<StateOverride>,
 
     db_cache: Cache,
+    bundle_state: BundleState,
 }
 
 impl PendingBlocks {
@@ -211,6 +224,22 @@ impl PendingBlocks {
         self.db_cache.clone()
     }
 
+    /// Returns a clone of the bundle state.
+    ///
+    /// NOTE: This clones the entire BundleState, which contains a HashMap of all touched
+    /// accounts and their storage slots. The cost scales with the number of accounts and
+    /// storage slots modified in the flashblock. Monitor `bundle_state_clone_duration` and
+    /// `bundle_state_clone_size` metrics to track if this becomes a bottleneck.
+    pub fn get_bundle_state(&self) -> BundleState {
+        let metrics = Metrics::default();
+        let size = self.bundle_state.state.len();
+        let start = Instant::now();
+        let cloned = self.bundle_state.clone();
+        metrics.bundle_state_clone_duration.record(start.elapsed());
+        metrics.bundle_state_clone_size.record(size as f64);
+        cloned
+    }
+
     /// Returns all transactions for a specific block number.
     pub fn get_transactions_for_block(&self, block_number: BlockNumber) -> Vec<Transaction> {
         self.transactions

crates/flashblocks/src/processor.rs

@@ -38,6 +38,7 @@ use reth_optimism_primitives::{OpBlock, OpPrimitives};
 use reth_optimism_rpc::OpReceiptBuilder as OpRpcReceiptBuilder;
 use reth_primitives::RecoveredBlock;
 use reth_rpc_convert::transaction::ConvertReceiptInput;
+use revm_database::states::bundle_state::BundleRetention;
 use tokio::sync::{Mutex, broadcast::Sender, mpsc::UnboundedReceiver};
 use tracing::{debug, error, info, warn};
 
@@ -295,12 +296,26 @@ where
         let state_provider =
             self.client.state_by_block_number_or_tag(BlockNumberOrTag::Number(canonical_block))?;
         let state_provider_db = StateProviderDatabase::new(state_provider);
-        let state = State::builder().with_database(state_provider_db).with_bundle_update().build();
         let mut pending_blocks_builder = PendingBlocksBuilder::new();
 
+        // Cache reads across flashblocks, accumulating caches from previous
+        // pending blocks if available
+        let cache_db = match &prev_pending_blocks {
+            Some(pending_blocks) => {
+                CacheDB { cache: pending_blocks.get_db_cache(), db: state_provider_db }
+            }
+            None => CacheDB::new(state_provider_db),
+        };
+
+        // Track state changes across flashblocks, accumulating bundle state
+        // from previous pending blocks if available
         let mut db = match &prev_pending_blocks {
-            Some(pending_blocks) => CacheDB { cache: pending_blocks.get_db_cache(), db: state },
-            None => CacheDB::new(state),
+            Some(pending_blocks) => State::builder()
+                .with_database(cache_db)
+                .with_bundle_update()
+                .with_bundle_prestate(pending_blocks.get_bundle_state())
+                .build(),
+            None => State::builder().with_database(cache_db).with_bundle_update().build(),
         };
 
         let mut state_overrides =
@@ -535,8 +550,12 @@ where
                                         && transaction.is_deposit())
                                     .then(|| {
                                         evm.db_mut()
-                                            .load_account(recovered_transaction.signer())
-                                            .map(|acc| acc.info.nonce)
+                                            .load_cache_account(recovered_transaction.signer())
+                                            .map(|acc| {
+                                                acc.account_info()
+                                                    .map(|info| info.nonce)
+                                                    .unwrap_or(0)
+                                            })
                                     })
                                     .transpose()
                                     .map_err(|_| {
@@ -627,7 +646,9 @@ where
             last_block_header = block.header.clone();
         }
 
-        pending_blocks_builder.with_db_cache(db.cache);
+        db.merge_transitions(BundleRetention::Reverts);
+        pending_blocks_builder.with_bundle_state(db.take_bundle());
+        pending_blocks_builder.with_db_cache(db.database.cache);
         pending_blocks_builder.with_state_overrides(state_overrides);
         Ok(Some(Arc::new(pending_blocks_builder.build()?)))
     }