_

Author: Einar Rasmussen

Cargo.lock

@@ -165,12 +165,15 @@ alloy-hardforks = "0.4.7"
 alloy-op-evm = { version = "0.26.3", default-features = false }
 alloy-op-hardforks = "0.4.7"
 op-alloy-rpc-types = { version = "0.23.1", default-features = false }
+# here
 op-alloy-rpc-types-engine = { version = "0.23.1", default-features = false, features = ["serde"] }
 op-alloy-rpc-jsonrpsee = { version = "0.23.1", default-features = false }
 op-alloy-network = { version = "0.23.1", default-features = false }
 op-alloy-consensus = { version = "0.23.1", default-features = false }
 op-alloy-flz = { version = "0.13.1", default-features = false }
 
+base-access-lists = { git = "https://github.com/base/base.git" }
+
 async-trait = { version = "0.1.83" }
 clap = { version = "4.4.3", features = ["derive", "env", "string"] }
 clap_builder = { version = "4.5.19" }
@@ -211,3 +214,6 @@ time = { version = "0.3.36", features = ["macros", "formatting", "parsing"] }
 vergen = "9.0.4"
 vergen-git2 = "9.0.4"
 opentelemetry = { version = "0.31", features = ["trace"] }
+
+[patch.crates-io]
+op-alloy-rpc-types-engine = { path = "../optimism/rust/op-alloy/crates/rpc-types-engine" }

Cargo.toml

@@ -90,6 +90,8 @@ op-alloy-flz.workspace = true
 revm.workspace = true
 op-revm.workspace = true
 
+base-access-lists.workspace = true
+
 tracing.workspace = true
 eyre.workspace = true
 serde_with.workspace = true

crates/op-rbuilder/Cargo.toml

@@ -21,6 +21,7 @@ use alloy_consensus::{
 use alloy_eips::{Encodable2718, eip7685::EMPTY_REQUESTS_HASH, merge::BEACON_NONCE};
 use alloy_evm::block::BlockExecutionResult;
 use alloy_primitives::{Address, B256, U256};
+use base_access_lists::FlashblockAccessList;
 use eyre::WrapErr as _;
 use op_alloy_rpc_types_engine::{
     OpFlashblockPayload, OpFlashblockPayloadBase, OpFlashblockPayloadDelta,
@@ -88,6 +89,8 @@ type NextBestFlashblocksTxs<Pool> = BestFlashblocksTxs<
 pub(super) struct FlashblocksExecutionInfo {
     /// Index of the last consumed flashblock
     last_flashblock_index: usize,
+    // here
+    pub access_list: Option<FlashblockAccessList>,
 }
 
 #[derive(Debug, Default, Clone)]
@@ -1084,10 +1087,12 @@ where
         .zip(new_receipts.iter())
         .map(|(tx, receipt)| (tx.tx_hash(), convert_receipt(receipt)))
         .collect::<BTreeMap<B256, op_alloy_consensus::OpReceipt>>();
+    // here
     let metadata = OpFlashblockPayloadMetadata {
         receipts: receipts_with_hash,
         new_account_balances,
         block_number: ctx.parent().number + 1,
+        access_lists: info.extra.access_list,
     };
 
     let (_, blob_gas_used) = ctx.blob_fields(info);

crates/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -25,10 +25,15 @@ use reth_optimism_payload_builder::OpBuiltPayload;
 use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
 use reth_payload_builder::EthPayloadBuilderAttributes;
 use reth_primitives_traits::SealedHeader;
-use std::sync::Arc;
+use std::{
+    cmp::{max, min},
+    sync::Arc,
+};
 use tokio::sync::mpsc;
 use tracing::warn;
 
+use base_access_lists::FBALBuilderDb;
+
 /// Handles newly built or received flashblock payloads.
 ///
 /// In the case of a payload built by this node, it is broadcast to peers and an event is sent to the payload builder.
@@ -182,6 +187,7 @@ where
         .state_by_block_hash(parent_hash)
         .wrap_err("failed to get state for parent hash")?;
     let db = StateProviderDatabase::new(&state_provider);
+    // here
     let mut state = State::builder()
         .with_database(cached_reads.as_db_mut(db))
         .with_bundle_update()
@@ -333,9 +339,18 @@ fn execute_transactions(
     use reth_primitives_traits::SignedTransaction;
     use revm::{DatabaseCommit as _, context::result::ResultAndState};
 
-    let mut evm = ctx.evm_config().evm_with_env(&mut *state, evm_env);
+    //here
+    let mut fbal_db = FBALBuilderDb::new(state);
+    let mut evm = ctx.evm_config().evm_with_env(&mut fbal_db, evm_env);
+
+    let mut min_tx_index = u64::MAX;
+    let mut max_tx_index = u64::MIN;
+    for (i, tx) in txs.into_iter().enumerate() {
+        let j: u64 = i.try_into().unwrap();
+        evm.db_mut().set_index(j);
+        min_tx_index = min(min_tx_index, j);
+        max_tx_index = max(max_tx_index, j);
 
-    for tx in txs {
         // Convert to recovered transaction
         let tx_recovered = tx
             .try_clone_into_recovered()
@@ -350,6 +365,7 @@ fn execute_transactions(
         let depositor_nonce = (ctx.is_regolith_active(timestamp) && tx_recovered.is_deposit())
             .then(|| {
                 evm.db_mut()
+                    .db_mut()
                     .load_cache_account(sender)
                     .map(|acc| acc.account_info().unwrap_or_default().nonce)
             })
@@ -406,6 +422,9 @@ fn execute_transactions(
         });
     info.da_footprint_scalar = da_footprint_gas_scalar;
 
+    let fbal_builder = fbal_db.finish()?;
+    info.extra.access_list = Some(fbal_builder.build(min_tx_index, max_tx_index));
+
     Ok(())
 }