test rblib fix

Author: akundaz

.cargo/config.toml

@@ -0,0 +1,3 @@
+# TODO: Only enable this for debug builds
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

.github/workflows/unichain_builder_release.yaml

@@ -21,6 +21,7 @@ on:
         description: "Binary Compilation Features"
         options:
           - ""
+          - "debug"
         required: false
         type: choice
 

Cargo.toml

@@ -11,24 +11,24 @@ resolver = "2"
 license = "MIT"
 version = "0.0.1"
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.92"
 repository = "https://github.com/flashbots/unichain-builder"
 homepage = "https://github.com/flashbots/unichain-builder"
 authors = ["Flashbots <info@flashbots.net>"]
 exclude = [".github/"]
 
 [workspace.dependencies]
-rblib = { git = "https://github.com/flashbots/rblib", rev = "6911bba2c9d2db67b58eabc52bd62b9aef070d86" }
+rblib = { git = "https://github.com/flashbots/rblib", rev = "c714ef9be7f29c760838daf0e5174ee97ec648ee" }
 
 futures = "0.3"
-tokio = "1.46"
-tokio-tungstenite = "0.27"
+tokio = { version = "1.46", features = ["full", "tracing"] }
+tokio-tungstenite = "0.26.2"
 parking_lot = "0.12"
 eyre = "0.6"
 moka = "0.12"
 tracing = "0.1"
 clap = { version = "4.4", features = ["derive", "env", "string"] }
-reqwest = "0.12.24"
+reqwest = "0.13.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9.33"
@@ -43,8 +43,8 @@ atomic-time = "0.1"
 
 secp256k1 = "0.30"
 jsonrpsee = "0.26.0"
-console-subscriber = "0.4"
-tracing-subscriber = "0.3.20"
+console-subscriber = "0.5.0"
+tracing-subscriber = "0.3.22"
 dashmap = "6.1"
 orx-concurrent-vec = "3.7.0"
 vergen = "9.0.6"

src/main.rs

@@ -13,9 +13,21 @@ use {
 	rblib::{
 		pool::*,
 		prelude::*,
-		reth::optimism::{
-			node::{OpAddOns, OpEngineApiBuilder, OpEngineValidatorBuilder, OpNode},
-			rpc::OpEthApiBuilder,
+		reth::{
+			builder::{NodeBuilder, WithLaunchContext},
+			cli::commands::launcher::Launcher,
+			db::DatabaseEnv,
+			optimism::{
+				chainspec::OpChainSpec,
+				cli::chainspec::OpChainSpecParser,
+				node::{
+					OpAddOns,
+					OpEngineApiBuilder,
+					OpEngineValidatorBuilder,
+					OpNode,
+				},
+				rpc::OpEthApiBuilder,
+			},
 		},
 		steps::*,
 	},
@@ -40,49 +52,73 @@ mod version;
 mod tests;
 
 fn main() {
-	#[cfg(feature = "debug")]
-	console_subscriber::init();
-
-	Cli::parsed()
-		.run(|builder, cli_args| async move {
-			let pool = OrderPool::<Flashblocks>::default();
-			let pipeline = build_pipeline(&cli_args, &pool)?;
-			let opnode = OpNode::new(cli_args.rollup_args.clone());
-			let tx_status_rpc = TransactionStatusRpc::new(&pipeline);
-
-			let addons: OpAddOns<
-				_,
-				OpEthApiBuilder,
-				OpEngineValidatorBuilder,
-				OpEngineApiBuilder<OpEngineValidatorBuilder>,
-			> = opnode
-				.add_ons_builder::<types::RpcTypes<Flashblocks>>()
-				.build();
-
-			let handle = builder
-				.with_types::<OpNode>()
-				.with_components(
-					opnode
-						.components()
-						.attach_pool(&pool)
-						.payload(pipeline.into_service()),
-				)
-				.with_add_ons(addons)
-				.extend_rpc_modules(move |mut rpc_ctx| {
-					pool.attach_rpc(&mut rpc_ctx)?;
-					tx_status_rpc.attach_rpc(&mut rpc_ctx)?;
-					Ok(())
-				})
-				.on_node_started(move |_ctx| {
-					set_version_metric();
-					Ok(())
-				})
-				.launch()
-				.await?;
-
-			handle.wait_for_node_exit().await
-		})
-		.unwrap();
+	#[cfg_attr(not(feature = "debug"), allow(unused_mut))]
+	let mut cli = Cli::parsed().configure();
+
+	// TODO: Re-enable once the devops build can set build-time flags
+	// #[cfg(feature = "debug")]
+	// {
+	// 	let console_layer = console_subscriber::spawn();
+	// 	cli
+	// 		.access_tracing_layers()
+	// 		.expect("failed to access tracing layers")
+	// 		.add_layer(console_layer);
+	// }
+
+	let console_layer = console_subscriber::spawn();
+		cli
+			.access_tracing_layers()
+			.expect("failed to access tracing layers")
+			.add_layer(console_layer);
+
+	cli.run(LauncherImpl).unwrap();
+}
+
+struct LauncherImpl;
+
+impl Launcher<OpChainSpecParser, BuilderArgs> for LauncherImpl {
+	async fn entrypoint(
+		self,
+		builder: WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, OpChainSpec>>,
+		builder_args: BuilderArgs,
+	) -> eyre::Result<()> {
+		let pool = OrderPool::<Flashblocks>::default();
+		let pipeline = build_pipeline(&builder_args, &pool)?;
+		let opnode = OpNode::new(builder_args.rollup_args.clone());
+		let tx_status_rpc = TransactionStatusRpc::new(&pipeline);
+
+		let addons: OpAddOns<
+			_,
+			OpEthApiBuilder,
+			OpEngineValidatorBuilder,
+			OpEngineApiBuilder<OpEngineValidatorBuilder>,
+		> = opnode
+			.add_ons_builder::<types::RpcTypes<Flashblocks>>()
+			.build();
+
+		let handle = builder
+			.with_types::<OpNode>()
+			.with_components(
+				opnode
+					.components()
+					.attach_pool(&pool)
+					.payload(pipeline.into_service()),
+			)
+			.with_add_ons(addons)
+			.extend_rpc_modules(move |mut rpc_ctx| {
+				pool.attach_rpc(&mut rpc_ctx)?;
+				tx_status_rpc.attach_rpc(&mut rpc_ctx)?;
+				Ok(())
+			})
+			.on_node_started(move |_ctx| {
+				set_version_metric();
+				Ok(())
+			})
+			.launch()
+			.await?;
+
+		handle.wait_for_node_exit().await
+	}
 }
 
 fn build_pipeline(