From 7d006b7eca4e5f7f2d4ae6759d3f9ccc54b894dc Mon Sep 17 00:00:00 2001
From: Haardik H <haardik.haardik@coinbase.com>
Date: Thu, 9 Oct 2025 12:40:53 -0400
Subject: [PATCH] override default version metadata for reth

---
 Cargo.lock              |  6 +++---
 Cargo.toml              | 10 +++++++---
 crates/node/src/main.rs | 37 ++++++++++++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f9891c..72b2eae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1521,7 +1521,7 @@ dependencies = [
 
 [[package]]
 name = "base-reth-flashblocks-rpc"
-version = "0.1.0"
+version = "0.1.10"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -1575,7 +1575,7 @@ dependencies = [
 
 [[package]]
 name = "base-reth-node"
-version = "0.1.0"
+version = "0.1.10"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -1633,7 +1633,7 @@ dependencies = [
 
 [[package]]
 name = "base-reth-transaction-tracing"
-version = "0.1.0"
+version = "0.1.10"
 dependencies = [
  "alloy-primitives",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 0a96175..63adb97 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.1.0"
+version = "0.1.10"
 edition = "2021"
 rust-version = "1.85"
 license = "MIT"
@@ -8,7 +8,11 @@ repository = "https://github.com/base/node-reth"
 
 [workspace]
 resolver = "2"
-members = ["crates/flashblocks-rpc", "crates/node", "crates/transaction-tracing"]
+members = [
+    "crates/flashblocks-rpc",
+    "crates/node",
+    "crates/transaction-tracing",
+]
 
 default-members = ["crates/node"]
 
@@ -119,4 +123,4 @@ chrono = "0.4.41"
 brotli = "8.0.1"
 arc-swap = "1.7.1"
 once_cell = "1.19"
-rand = "0.9.2"
\ No newline at end of file
+rand = "0.9.2"
diff --git a/crates/node/src/main.rs b/crates/node/src/main.rs
index d1e7cd7..5535d25 100644
--- a/crates/node/src/main.rs
+++ b/crates/node/src/main.rs
@@ -1,6 +1,9 @@
 use base_reth_flashblocks_rpc::rpc::EthApiExt;
 use futures_util::TryStreamExt;
 use once_cell::sync::OnceCell;
+use reth::version::{
+    default_reth_version_metadata, try_init_version_metadata, RethCliVersionConsts,
+};
 use reth_exex::ExExEvent;
 use std::sync::Arc;
 
@@ -9,7 +12,7 @@ use base_reth_flashblocks_rpc::state::FlashblocksState;
 use base_reth_flashblocks_rpc::subscription::FlashblocksSubscriber;
 use base_reth_transaction_tracing::transaction_tracing_exex;
 use clap::Parser;
-use reth::builder::Node;
+use reth::builder::{Node, NodeHandle};
 use reth::{
     builder::{EngineNodeLauncher, TreeConfig},
     providers::providers::BlockchainProvider,
@@ -20,6 +23,8 @@ use reth_optimism_node::OpNode;
 use tracing::info;
 use url::Url;
 
+pub const NODE_RETH_CLIENT_VERSION: &str = concat!("base/v", env!("CARGO_PKG_VERSION"));
+
 #[global_allocator]
 static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 
@@ -54,6 +59,29 @@ impl Args {
 }
 
 fn main() {
+    let default_version_metadata = default_reth_version_metadata();
+    try_init_version_metadata(RethCliVersionConsts {
+        name_client: "Base Reth Node".to_string().into(),
+        cargo_pkg_version: format!(
+            "{}/{}",
+            default_version_metadata.cargo_pkg_version,
+            env!("CARGO_PKG_VERSION")
+        )
+        .into(),
+        p2p_client_version: format!(
+            "{}/{}",
+            default_version_metadata.p2p_client_version, NODE_RETH_CLIENT_VERSION
+        )
+        .into(),
+        extra_data: format!(
+            "{}/{}",
+            default_version_metadata.extra_data, NODE_RETH_CLIENT_VERSION
+        )
+        .into(),
+        ..default_version_metadata
+    })
+    .expect("Unable to init version metadata");
+
     Cli::<OpChainSpecParser, Args>::parse()
         .run(|builder, args| async move {
             info!(message = "starting custom Base node");
@@ -64,7 +92,10 @@ fn main() {
 
             let fb_cell: Arc<OnceCell<Arc<FlashblocksState<_>>>> = Arc::new(OnceCell::new());
 
-            let handle = builder
+            let NodeHandle {
+                node: _node,
+                node_exit_future,
+            } = builder
                 .with_types_and_provider::<OpNode, BlockchainProvider<_>>()
                 .with_components(op_node.components())
                 .with_add_ons(op_node.add_ons())
@@ -147,7 +178,7 @@ fn main() {
                 })
                 .await?;
 
-            handle.wait_for_node_exit().await
+            node_exit_future.await
         })
         .unwrap();
 }