From 6a7d0ed5f360be033dab983636cf6cdd2d41b04d Mon Sep 17 00:00:00 2001 From: Ferran Borreguero Date: Sun, 8 Jun 2025 20:23:27 +0100 Subject: [PATCH 1/4] Make op-rbuilder a lib --- crates/op-rbuilder/Cargo.toml | 2 +- .../op-rbuilder/src/bin/op-rbuilder/main.rs | 5 ++++ .../op-rbuilder/src/{main.rs => launcher.rs} | 29 ++++++------------- crates/op-rbuilder/src/lib.rs | 8 +++++ 4 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 crates/op-rbuilder/src/bin/op-rbuilder/main.rs rename crates/op-rbuilder/src/{main.rs => launcher.rs} (91%) diff --git a/crates/op-rbuilder/Cargo.toml b/crates/op-rbuilder/Cargo.toml index ac239f4bd..37d5855f1 100644 --- a/crates/op-rbuilder/Cargo.toml +++ b/crates/op-rbuilder/Cargo.toml @@ -160,7 +160,7 @@ custom-engine-api = [] [[bin]] name = "op-rbuilder" -path = "src/main.rs" +path = "src/bin/op-rbuilder/main.rs" [[bin]] name = "tester" diff --git a/crates/op-rbuilder/src/bin/op-rbuilder/main.rs b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs new file mode 100644 index 000000000..529e7d2a3 --- /dev/null +++ b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs @@ -0,0 +1,5 @@ +use op_rbuilder::launcher::launch; + +fn main() -> eyre::Result<()> { + launch() +} diff --git a/crates/op-rbuilder/src/main.rs b/crates/op-rbuilder/src/launcher.rs similarity index 91% rename from crates/op-rbuilder/src/main.rs rename to crates/op-rbuilder/src/launcher.rs index 194958232..6066322ad 100644 --- a/crates/op-rbuilder/src/main.rs +++ b/crates/op-rbuilder/src/launcher.rs @@ -1,24 +1,15 @@ -use args::*; -use builders::{BuilderMode, FlashblocksBuilder, StandardBuilder}; +use crate::args::*; +use crate::builders::{BuilderMode, FlashblocksBuilder, StandardBuilder}; use eyre::Result; -/// CLI argument parsing. -pub mod args; -mod builders; -mod metrics; -mod monitor_tx_pool; -mod primitives; -mod revert_protection; -mod traits; -mod tx; -mod tx_signer; - -use builders::{BuilderConfig, PayloadBuilder}; +use crate::builders::{BuilderConfig, PayloadBuilder}; +use crate::metrics::VERSION; +use crate::monitor_tx_pool::monitor_tx_pool; +use crate::primitives::reth::engine_api_builder::OpEngineApiBuilder; +use crate::revert_protection::{EthApiExtServer, EthApiOverrideServer, RevertProtectionExt}; +use crate::tx::FBPooledTransaction; use core::fmt::Debug; -use metrics::VERSION; use moka::future::Cache; -use monitor_tx_pool::monitor_tx_pool; -use primitives::reth::engine_api_builder::OpEngineApiBuilder; use reth::builder::{NodeBuilder, WithLaunchContext}; use reth_cli_commands::launcher::Launcher; use reth_db::mdbx::DatabaseEnv; @@ -29,16 +20,14 @@ use reth_optimism_node::{ OpNode, }; use reth_transaction_pool::TransactionPool; -use revert_protection::{EthApiExtServer, EthApiOverrideServer, RevertProtectionExt}; use std::{marker::PhantomData, sync::Arc}; -use tx::FBPooledTransaction; // Prefer jemalloc for performance reasons. #[cfg(all(feature = "jemalloc", unix))] #[global_allocator] static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; -fn main() -> Result<()> { +pub fn launch() -> Result<()> { let cli = Cli::parsed(); let mode = cli.builder_mode(); let mut cli_app = cli.configure(); diff --git a/crates/op-rbuilder/src/lib.rs b/crates/op-rbuilder/src/lib.rs index 2abc3a322..421220dac 100644 --- a/crates/op-rbuilder/src/lib.rs +++ b/crates/op-rbuilder/src/lib.rs @@ -6,3 +6,11 @@ pub mod tests; pub mod traits; pub mod tx; + +/// CLI argument parsing. +pub mod args; +mod builders; +pub mod launcher; +mod metrics; +mod monitor_tx_pool; +mod revert_protection; From 4587c0289d9e99b27467d76f44ef1d014dc3efc7 Mon Sep 17 00:00:00 2001 From: Ferran Borreguero Date: Mon, 9 Jun 2025 08:27:09 +0100 Subject: [PATCH 2/4] Fix lint --- crates/op-rbuilder/src/launcher.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/crates/op-rbuilder/src/launcher.rs b/crates/op-rbuilder/src/launcher.rs index 6066322ad..95b66c70c 100644 --- a/crates/op-rbuilder/src/launcher.rs +++ b/crates/op-rbuilder/src/launcher.rs @@ -1,13 +1,15 @@ -use crate::args::*; -use crate::builders::{BuilderMode, FlashblocksBuilder, StandardBuilder}; use eyre::Result; -use crate::builders::{BuilderConfig, PayloadBuilder}; -use crate::metrics::VERSION; -use crate::monitor_tx_pool::monitor_tx_pool; -use crate::primitives::reth::engine_api_builder::OpEngineApiBuilder; -use crate::revert_protection::{EthApiExtServer, EthApiOverrideServer, RevertProtectionExt}; -use crate::tx::FBPooledTransaction; +use crate::{ + args::*, + builders::{BuilderConfig, PayloadBuilder}, + builders::{BuilderMode, FlashblocksBuilder, StandardBuilder}, + metrics::VERSION, + monitor_tx_pool::monitor_tx_pool, + primitives::reth::engine_api_builder::OpEngineApiBuilder, + revert_protection::{EthApiExtServer, EthApiOverrideServer, RevertProtectionExt}, + tx::FBPooledTransaction, +}; use core::fmt::Debug; use moka::future::Cache; use reth::builder::{NodeBuilder, WithLaunchContext}; From b59396d3a7577540323d125b666c1c1276ce7c07 Mon Sep 17 00:00:00 2001 From: Ferran Borreguero Date: Mon, 9 Jun 2025 08:58:41 +0100 Subject: [PATCH 3/4] Two more fixes --- crates/op-rbuilder/src/bin/op-rbuilder/main.rs | 5 +++++ crates/op-rbuilder/src/launcher.rs | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/crates/op-rbuilder/src/bin/op-rbuilder/main.rs b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs index 529e7d2a3..0200979cc 100644 --- a/crates/op-rbuilder/src/bin/op-rbuilder/main.rs +++ b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs @@ -1,5 +1,10 @@ use op_rbuilder::launcher::launch; fn main() -> eyre::Result<()> { + // Prefer jemalloc for performance reasons. + #[cfg(all(feature = "jemalloc", unix))] + #[global_allocator] + static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; + launch() } diff --git a/crates/op-rbuilder/src/launcher.rs b/crates/op-rbuilder/src/launcher.rs index 95b66c70c..a8904ed81 100644 --- a/crates/op-rbuilder/src/launcher.rs +++ b/crates/op-rbuilder/src/launcher.rs @@ -2,8 +2,7 @@ use eyre::Result; use crate::{ args::*, - builders::{BuilderConfig, PayloadBuilder}, - builders::{BuilderMode, FlashblocksBuilder, StandardBuilder}, + builders::{BuilderConfig, BuilderMode, FlashblocksBuilder, PayloadBuilder, StandardBuilder}, metrics::VERSION, monitor_tx_pool::monitor_tx_pool, primitives::reth::engine_api_builder::OpEngineApiBuilder, @@ -24,11 +23,6 @@ use reth_optimism_node::{ use reth_transaction_pool::TransactionPool; use std::{marker::PhantomData, sync::Arc}; -// Prefer jemalloc for performance reasons. -#[cfg(all(feature = "jemalloc", unix))] -#[global_allocator] -static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; - pub fn launch() -> Result<()> { let cli = Cli::parsed(); let mode = cli.builder_mode(); From f49d7215ba80d742f9337a2ac1d04b032e1ac3d8 Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 9 Jun 2025 16:50:06 +0500 Subject: [PATCH 4/4] Move alloc --- crates/op-rbuilder/src/bin/op-rbuilder/main.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/op-rbuilder/src/bin/op-rbuilder/main.rs b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs index 0200979cc..985b93c4e 100644 --- a/crates/op-rbuilder/src/bin/op-rbuilder/main.rs +++ b/crates/op-rbuilder/src/bin/op-rbuilder/main.rs @@ -1,10 +1,10 @@ use op_rbuilder::launcher::launch; -fn main() -> eyre::Result<()> { - // Prefer jemalloc for performance reasons. - #[cfg(all(feature = "jemalloc", unix))] - #[global_allocator] - static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; +// Prefer jemalloc for performance reasons. +#[cfg(all(feature = "jemalloc", unix))] +#[global_allocator] +static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; +fn main() -> eyre::Result<()> { launch() }