New fields on clickhouse (#819)

## 📝 Summary

New fields on buidlernet.blocks:
builder_name:  name of the node that submitted the block
rbuilder_commit: git commit of the rbuilder running

builder_name comes from a new cfg parameter
BuiltBlocksClickhouseConfig::builder_name.

As a bonus changed BuiltBlocksClickhouseConfig::password from String to
EnvOrValue<String>.

## ✅ I have completed the following steps:

* [X] Run `make lint`
* [X] Run `make test`
* [ ] Added tests (if applicable)

Author: ZanCorDX

crates/rbuilder-operator/src/clickhouse.rs

@@ -31,6 +31,10 @@ use crate::{flashbots_config::BuiltBlocksClickhouseConfig, metrics::ClickhouseMe
 #[derive(Debug, Clone, Serialize, Deserialize, Row)]
 pub struct BlockRow {
     pub block_number: u64,
+    /// name of the node that submitted the block
+    pub builder_name: String,
+    /// git commit of the rbuilder running
+    pub rbuilder_commit: String,
     pub profit: String,
     pub slot: u64,
     pub hash: String,
@@ -45,6 +49,7 @@ pub struct BlockRow {
     pub timestamp_datetime: i64,
     pub orders_closed_at: i64,
     pub sealed_at: i64,
+    /// name of the algorithm that created the block
     pub algorithm: String,
 
     #[serde(with = "option_u256")]
@@ -106,15 +111,21 @@ const DEFAULT_MAX_MEMORY_SIZE_MB: u64 = KILO;
 #[derive(Debug)]
 pub struct BuiltBlocksWriter {
     blocks_tx: mpsc::Sender<BlockRow>,
+    rbuilder_commit: String,
+    builder_name: String,
 }
 
 impl BuiltBlocksWriter {
-    pub fn new(config: BuiltBlocksClickhouseConfig, cancellation_token: CancellationToken) -> Self {
+    pub fn new(
+        config: BuiltBlocksClickhouseConfig,
+        rbuilder_commit: String,
+        cancellation_token: CancellationToken,
+    ) -> eyre::Result<Self> {
         let client = Client::default()
             .with_url(config.host)
             .with_database(config.database)
             .with_user(config.username)
-            .with_password(config.password)
+            .with_password(config.password.value()?)
             .with_validation(false); // CRITICAL for U256 serialization.
 
         let task_manager = rbuilder_utils::tasks::TaskManager::current();
@@ -142,9 +153,11 @@ impl BuiltBlocksWriter {
             tokio::time::sleep(RUN_SUBMIT_TO_RELAYS_JOB_CANCEL_TIME).await;
             task_manager.graceful_shutdown_with_timeout(Duration::from_secs(5));
         });
-        Self {
+        Ok(Self {
             blocks_tx: block_tx,
-        }
+            rbuilder_commit,
+            builder_name: config.builder_name,
+        })
     }
 }
 
@@ -217,14 +230,16 @@ impl BidObserver for BuiltBlocksWriter {
         slot_data: &MevBoostSlotData,
         submit_block_request: Arc<AlloySubmitBlockRequest>,
         built_block_trace: Arc<BuiltBlockTrace>,
-        builder_name: String,
+        builder_algorithm_name: String,
         best_bid_value: U256,
         _relays: &RelaySet,
         sent_to_relay_at: OffsetDateTime,
     ) {
         let slot = slot_data.slot();
         let block_number = slot_data.block();
         let blocks_tx = self.blocks_tx.clone();
+        let rbuilder_commit = self.rbuilder_commit.clone();
+        let builder_name = self.builder_name.clone();
         tokio::spawn(async move {
             let submit_trace = submit_block_request.bid_trace();
             let execution_payload_v1 = match submit_block_request.as_ref() {
@@ -264,6 +279,8 @@ impl BidObserver for BuiltBlocksWriter {
                 .collect();
             let block_row = BlockRow {
                 block_number,
+                builder_name,
+                rbuilder_commit,
                 profit: format_ether(submit_trace.value),
                 slot,
                 hash: execution_payload_v1.block_hash.to_string(),
@@ -283,7 +300,7 @@ impl BidObserver for BuiltBlocksWriter {
                     built_block_trace.orders_closed_at,
                 ),
                 sealed_at: offset_date_to_clickhouse_timestamp(built_block_trace.orders_sealed_at),
-                algorithm: builder_name,
+                algorithm: builder_algorithm_name,
                 true_value: Some(built_block_trace.true_bid_value),
                 best_relay_value: Some(best_bid_value),
                 block_value: Some(submit_trace.value),

crates/rbuilder-operator/src/flashbots_config.rs

@@ -72,13 +72,16 @@ struct TBVPushRedisConfig {
 
 /// Config used to record built blocks to clickhouse using a local
 /// storage on errors.
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq, Default)]
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
 pub struct BuiltBlocksClickhouseConfig {
     /// clickhouse host url (starts with http/https)
     pub host: String,
     pub database: String,
     pub username: String,
-    pub password: String,
+    /// Unique id for this server.
+    /// Since this is only used in clickhouse to identify the builder blocks we put it here but we could have it in the base_config.
+    pub builder_name: String,
+    pub password: EnvOrValue<String>,
     pub disk_database_path: PathBuf,
     pub disk_max_size_mb: Option<u64>,
     pub memory_max_size_mb: Option<u64>,
@@ -312,10 +315,12 @@ impl FlashbotsConfig {
         block_processor_key: Option<PrivateKeySigner>,
     ) -> eyre::Result<Option<Box<dyn BidObserver + Send + Sync>>> {
         if let Some(built_blocks_clickhouse_config) = &self.built_blocks_clickhouse_config {
+            let rbuilder_version = rbuilder_version();
             let writer = BuiltBlocksWriter::new(
                 built_blocks_clickhouse_config.clone(),
+                rbuilder_version.git_commit,
                 cancellation_token.clone(),
-            );
+            )?;
             Ok(Some(Box::new(writer)))
         } else {
             if block_processor_key.is_some() {
@@ -452,7 +457,7 @@ impl BidObserver for RbuilderOperatorBidObserver {
         slot_data: &MevBoostSlotData,
         submit_block_request: Arc<AlloySubmitBlockRequest>,
         built_block_trace: Arc<BuiltBlockTrace>,
-        builder_name: String,
+        builder_algorithm_name: String,
         best_bid_value: U256,
         relays: &RelaySet,
         sent_to_relay_at: OffsetDateTime,
@@ -462,7 +467,7 @@ impl BidObserver for RbuilderOperatorBidObserver {
                 slot_data,
                 submit_block_request.clone(),
                 built_block_trace.clone(),
-                builder_name.clone(),
+                builder_algorithm_name.clone(),
                 best_bid_value,
                 relays,
                 sent_to_relay_at,
@@ -473,7 +478,7 @@ impl BidObserver for RbuilderOperatorBidObserver {
                 slot_data,
                 submit_block_request,
                 built_block_trace,
-                builder_name,
+                builder_algorithm_name,
                 best_bid_value,
                 relays,
                 sent_to_relay_at,

crates/rbuilder-operator/src/true_block_value_push/best_true_value_observer.rs

@@ -78,7 +78,7 @@ impl BidObserver for BestTrueValueObserver {
         slot_data: &MevBoostSlotData,
         _submit_block_request: Arc<AlloySubmitBlockRequest>,
         built_block_trace: Arc<BuiltBlockTrace>,
-        builder_name: String,
+        builder_algorithm_name: String,
         _best_bid_value: alloy_primitives::U256,
         _relays: &RelaySet,
         _sent_to_relay_at: OffsetDateTime,
@@ -89,7 +89,7 @@ impl BidObserver for BestTrueValueObserver {
             built_block_trace.true_bid_value,
             built_block_trace.bid_value,
             built_block_trace.subsidy,
-            builder_name,
+            builder_algorithm_name,
             slot_data.timestamp().unix_timestamp() as u64,
         );
         self.best_local_value.update_value_safe(block_info);

crates/rbuilder/src/live_builder/block_output/bid_observer_multiplexer.rs

@@ -28,7 +28,7 @@ impl BidObserver for BidObserverMultiplexer {
         slot_data: &MevBoostSlotData,
         submit_block_request: &SubmitBlockRequest,
         built_block_trace: &BuiltBlockTrace,
-        builder_name: String,
+        builder_algorithm_name: String,
         best_bid_value: alloy_primitives::U256,
     ) {
         for obs in &self.observers {

crates/rbuilder/src/live_builder/block_output/bidding_service_interface.rs

@@ -31,7 +31,7 @@ pub trait BidObserver: std::fmt::Debug {
         slot_data: &MevBoostSlotData,
         submit_block_request: Arc<AlloySubmitBlockRequest>,
         built_block_trace: Arc<BuiltBlockTrace>,
-        builder_name: String,
+        builder_algorithm_name: String,
         best_bid_value: U256,
         relays: &RelaySet,
         sent_to_relay_at: OffsetDateTime,
@@ -47,7 +47,7 @@ impl BidObserver for NullBidObserver {
         _slot_data: &MevBoostSlotData,
         _submit_block_request: Arc<AlloySubmitBlockRequest>,
         _built_block_trace: Arc<BuiltBlockTrace>,
-        _builder_name: String,
+        _builder_algorithm_name: String,
         _best_bid_value: U256,
         _relays: &RelaySet,
         _sent_to_relay_at: OffsetDateTime,