Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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: 15 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ alethia-reth-consensus = { git = "https://github.com/taikoxyz/alethia-reth", rev
"full",
] }
alethia-reth-primitives = { git = "https://github.com/taikoxyz/alethia-reth", rev = "1ed7c19d1f9652c5fed96185f4ab8f930e812dd3", default-features = false }
alethia-reth-evm = { git = "https://github.com/taikoxyz/alethia-reth", rev = "1ed7c19d1f9652c5fed96185f4ab8f930e812dd3", default-features = false }

# Reth (aligned with the current taiko-mono and alethia-reth compatibility surface)
reth = { git = "https://github.com/paradigmxyz/reth", package = "reth", rev = "27bfddeada3953edc22759080a3659ccea62ca1f" }
Expand Down Expand Up @@ -212,3 +213,13 @@ c-kzg = { version = "2.1.7", default-features = false, features = [
"std",
] }
kzg-rs = { git = "https://github.com/taikoxyz/kzg-rs", branch = "feat/raiko2", default-features = false }

# Temporary: redirect the alethia-reth deps to the companion PR branch
# (taikoxyz/alethia-reth#195) until it merges. Drop this patch and bump the revs above to
# the merge commit once it lands.
[patch."https://github.com/taikoxyz/alethia-reth"]
alethia-reth-block = { git = "https://github.com/jmadibekov/alethia-reth", rev = "5333f16b48d11cdf7abba3453e5bdd7893c05a60" }
alethia-reth-chainspec = { git = "https://github.com/jmadibekov/alethia-reth", rev = "5333f16b48d11cdf7abba3453e5bdd7893c05a60" }
alethia-reth-consensus = { git = "https://github.com/jmadibekov/alethia-reth", rev = "5333f16b48d11cdf7abba3453e5bdd7893c05a60" }
alethia-reth-evm = { git = "https://github.com/jmadibekov/alethia-reth", rev = "5333f16b48d11cdf7abba3453e5bdd7893c05a60" }
alethia-reth-primitives = { git = "https://github.com/jmadibekov/alethia-reth", rev = "5333f16b48d11cdf7abba3453e5bdd7893c05a60" }
9 changes: 9 additions & 0 deletions crates/guest-common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use raiko2_primitives_shasta::{
build_shasta_commitment_from_proof_carry_data_vec, shasta_aggregation_output,
shasta_zk_aggregation_output, SHASTA_PROPOSAL_ID_MAX,
},
l1_precompiles::populate_l1_precompile_caches_for_proving,
roll_proposal_ancestor_headers_in_place, should_bypass_stalled_anchor_linkage,
validate_anchor_progression, verify_proposal_mode_blob_usage, GuestInput,
ShastaZkAggregationGuestInput,
Expand Down Expand Up @@ -602,6 +603,9 @@ fn shasta_block_env_attributes(
.header
.base_fee_per_gas()
.context("missing base fee per gas in Shasta block header")?,
// The L1 origin global is set directly by `populate_l1sload_cache` before the validation
// loop; the executor hook no-ops on `None`, leaving that global intact for re-execution.
l1_origin_block_number: None,
})
}

Expand Down Expand Up @@ -756,6 +760,11 @@ where
let mut last_block_hash = None;
let mut last_state_root = None;

// Verify + populate the L1 precompile caches before any block re-executes: the L1Sload /
// L1Staticcall precompiles read these caches during the stateless validation loop below. The
// lock guard is held across the loop so concurrent proofs don't race on the process globals.
let _l1_precompile_guard = populate_l1_precompile_caches_for_proving(guest_input)?;

bench_report_start("proposal_stateless_validation");
for (index, stateless_input) in guest_input.witnesses.iter().enumerate() {
let block = &stateless_input.block;
Expand Down
2 changes: 2 additions & 0 deletions crates/pipeline/src/forks/shasta/checkpoint_verify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ mod tests {
},
proposal_ancestor_headers: Vec::new(),
proposal_state_nodes: Vec::new(),
l1_storage_proofs: Vec::new(),
l1_staticcall_witnesses: Vec::new(),
}
}

Expand Down
Loading