Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
20 changes: 8 additions & 12 deletions src/tasks/block/sim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
config::{BuilderConfig, HostProvider, RuProvider},
tasks::env::SimEnv,
};
use alloy::{consensus::Header, eips::BlockId, network::Ethereum, providers::Provider};
use alloy::{consensus::Header, eips::BlockId, network::Ethereum};
use init4_bin_base::{
deps::metrics::{counter, histogram},
utils::calc::SlotCalculator,
Expand Down Expand Up @@ -177,11 +177,8 @@ impl Simulator {
HostEnv<HostAlloyDatabaseProvider, NoOpInspector>,
) {
// Host DB and Env
let host_db = self.create_host_db().await;

let host_block_number = sim_env.host_block_number();
let host_env_block_number = sim_env.host_env().number;
debug!(%host_block_number, %host_env_block_number, " host env comparisons");
let prev_host_block_number = sim_env.prev_host_block_number();
let host_db = self.create_host_db(prev_host_block_number).await;

let host_env = HostEnv::<HostAlloyDatabaseProvider, NoOpInspector>::new(
host_db,
Expand All @@ -192,8 +189,8 @@ impl Simulator {
debug!(?host_env, "created host env");

// Rollup DB and Env
let rollup_block_number = sim_env.rollup_block_number();
let rollup_db = self.create_rollup_db(rollup_block_number);
let prev_rollup_block_number = sim_env.prev_rollup_block_number();
let rollup_db = self.create_rollup_db(prev_rollup_block_number);

let rollup_env = RollupEnv::<RollupAlloyDatabaseProvider, NoOpInspector>::new(
rollup_db,
Expand Down Expand Up @@ -304,11 +301,10 @@ impl Simulator {
}

/// Creates an `AlloyDB` instance from the host provider.
async fn create_host_db(&self) -> HostAlloyDatabaseProvider {
let block_height = self.host_provider.get_block_number().await.unwrap();
debug!(%block_height, "creating host alloyDB at block height");
async fn create_host_db(&self, latest_block_number: u64) -> HostAlloyDatabaseProvider {
debug!(%latest_block_number, "creating host alloyDB at block height");

let alloy_db = AlloyDB::new(self.host_provider.clone(), BlockId::latest());
let alloy_db = AlloyDB::new(self.host_provider.clone(), BlockId::from(latest_block_number));

// Wrap the AlloyDB instance in a WrapDatabaseAsync and return it.
// This is safe to unwrap because the main function sets the proper runtime settings.
Expand Down
12 changes: 11 additions & 1 deletion src/tasks/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ impl SimEnv {
&self.host.prev_header
}

/// Get the block number of the rollup block environment.
pub const fn prev_rollup_block_number(&self) -> u64 {
self.prev_rollup().number
}

/// Get the block number for the host block environment.
pub const fn prev_host_block_number(&self) -> u64 {
self.prev_host().number
}

/// Get the block number of the rollup block environment.
pub const fn rollup_block_number(&self) -> u64 {
self.prev_rollup().number.saturating_add(1)
Expand Down Expand Up @@ -202,7 +212,7 @@ impl EnvTask {
// Construct the block env using the previous block header
let rollup_env = self.construct_rollup_env(rollup_header.into());
let host_env = self.construct_host_env(host_header);

debug!(host_env_block_number = ?host_env.block_env().number, %host_block_number, "host block number comparisons");

span_debug!(
Expand Down
9 changes: 2 additions & 7 deletions tests/block_builder_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,8 @@ async fn test_handle_build() {
let ru_provider = RootProvider::<Ethereum>::new_http(anvil_instance.endpoint_url());
let host_provider = config.connect_host_provider().await.unwrap();

let block_env = EnvTask::new(
config.clone(),
config.connect_host_provider().await.unwrap(),
ru_provider.clone(),
)
.spawn()
.0;
let block_env =
EnvTask::new(config.clone(), host_provider.clone(), ru_provider.clone()).spawn().0;
Copy link
Contributor Author

@anna-carroll anna-carroll Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a drive-by test fix to avoid connecting provider twice which wasn't necessary


let block_builder =
Simulator::new(&config, host_provider.clone(), ru_provider.clone(), block_env);
Expand Down
Loading