Skip to content

chore(test): use reth_optimism_chainspec::BASE_SEPOLIA in tests #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emhane merged 3 commits into from
Dec 16, 2025
Merged

chore(test): use reth_optimism_chainspec::BASE_SEPOLIA in tests #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdc7a24
Fix todo use jovian chain spec in tests
emhane Dec 16, 2025
4a704ed
Fix lint
emhane Dec 16, 2025
d59cfbd
Merge branch 'unstable' into emhane/fix-todo-jovian-chainspec
emhane Dec 16, 2025
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions crates/optimism/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ reth-rpc-eth-types.workspace = true
alloy-network.workspace = true
futures.workspace = true
op-alloy-network.workspace = true
alloy-op-hardforks.workspace = true

[features]
default = ["reth-codec"]
Expand Down
92 changes: 43 additions & 49 deletions crates/optimism/node/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,39 +299,13 @@ mod test {
use super::*;

use crate::engine;
use alloy_op_hardforks::BASE_SEPOLIA_JOVIAN_TIMESTAMP;
use alloy_primitives::{b64, Address, B256, B64};
use alloy_rpc_types_engine::PayloadAttributes;
use reth_chainspec::{ChainSpec, ForkCondition, Hardfork};
use reth_optimism_chainspec::{OpChainSpec, BASE_SEPOLIA};
use reth_optimism_forks::OpHardfork;
use reth_optimism_chainspec::BASE_SEPOLIA;
use reth_provider::noop::NoopProvider;
use reth_trie_common::KeccakKeyHasher;

const JOVIAN_TIMESTAMP: u64 = 1744909000;

fn get_chainspec() -> Arc<OpChainSpec> {
let mut base_sepolia_spec = BASE_SEPOLIA.inner.clone();

// TODO: Remove this once we know the Jovian timestamp
base_sepolia_spec
.hardforks
.insert(OpHardfork::Jovian.boxed(), ForkCondition::Timestamp(JOVIAN_TIMESTAMP));

Arc::new(OpChainSpec {
inner: ChainSpec {
chain: base_sepolia_spec.chain,
genesis: base_sepolia_spec.genesis,
genesis_header: base_sepolia_spec.genesis_header,
paris_block_and_final_difficulty: base_sepolia_spec
.paris_block_and_final_difficulty,
hardforks: base_sepolia_spec.hardforks,
base_fee_params: base_sepolia_spec.base_fee_params,
prune_delete_limit: 10000,
..Default::default()
},
})
}

const fn get_attributes(
eip_1559_params: Option<B64>,
min_base_fee: Option<u64>,
Expand All @@ -355,8 +329,10 @@ mod test {

#[test]
fn test_well_formed_attributes_pre_holocene() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(None, None, 1732633199);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -369,8 +345,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_no_eip1559_params() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(None, None, 1732633200);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -383,8 +361,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_eip1559_params_zero_denominator() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(Some(b64!("0000000000000008")), None, 1732633200);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -397,8 +377,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_valid() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(Some(b64!("0000000800000008")), None, 1732633200);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -411,8 +393,10 @@ mod test {

#[test]
fn test_well_formed_attributes_holocene_valid_all_zero() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(Some(b64!("0000000000000000")), None, 1732633200);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -425,9 +409,12 @@ mod test {

#[test]
fn test_well_formed_attributes_jovian_valid() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let attributes = get_attributes(Some(b64!("0000000000000000")), Some(1), JOVIAN_TIMESTAMP);
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes =
get_attributes(Some(b64!("0000000000000000")), Some(1), BASE_SEPOLIA_JOVIAN_TIMESTAMP);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
OpEngineTypes,
Expand All @@ -440,9 +427,11 @@ mod test {
/// After Jovian (and holocene), eip1559 params must be Some
#[test]
fn test_malformed_attributes_jovian_with_eip_1559_params_none() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let attributes = get_attributes(None, Some(1), JOVIAN_TIMESTAMP);
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(None, Some(1), BASE_SEPOLIA_JOVIAN_TIMESTAMP);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
OpEngineTypes,
Expand All @@ -455,8 +444,10 @@ mod test {
/// Before Jovian, min base fee must be None
#[test]
fn test_malformed_attributes_pre_jovian_with_min_base_fee() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes = get_attributes(Some(b64!("0000000000000000")), Some(1), 1732633200);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
Expand All @@ -470,9 +461,12 @@ mod test {
/// After Jovian, min base fee must be Some
#[test]
fn test_malformed_attributes_post_jovian_with_min_base_fee_none() {
let validator =
OpEngineValidator::new::<KeccakKeyHasher>(get_chainspec(), NoopProvider::default());
let attributes = get_attributes(Some(b64!("0000000000000000")), None, JOVIAN_TIMESTAMP);
let validator = OpEngineValidator::new::<KeccakKeyHasher>(
BASE_SEPOLIA.clone(),
NoopProvider::default(),
);
let attributes =
get_attributes(Some(b64!("0000000000000000")), None, BASE_SEPOLIA_JOVIAN_TIMESTAMP);

let result = <engine::OpEngineValidator<_, _, _> as EngineApiValidator<
OpEngineTypes,
Expand Down
Loading