add more data to status

binaries/cuprated/src/config.rs

@@ -20,17 +20,17 @@ use cuprate_p2p_core::{ClearNet, ClearNetServerCfg};
 mod args;
 mod fs;
 mod p2p;
+mod rayon;
 mod storage;
 mod tokio;
 mod tracing_config;
-mod rayon;
 
 use crate::config::fs::FileSystemConfig;
+use crate::config::rayon::RayonConfig;
 use crate::config::tokio::TokioConfig;
 use p2p::P2PConfig;
 use storage::StorageConfig;
 use tracing_config::TracingConfig;
-use crate::config::rayon::RayonConfig;
 
 /// Reads the args & config file, returning a [`Config`].
 pub fn read_config_and_args() -> Config {

binaries/cuprated/src/config/rayon.rs

@@ -13,5 +13,3 @@ impl Default for RayonConfig {
         }
     }
 }
-
-

binaries/cuprated/src/main.rs

@@ -18,8 +18,13 @@
 
 use crate::commands::Command;
 use crate::config::Config;
+use crate::constants::PANIC_CRITICAL_SERVICE_ERROR;
+use cuprate_consensus_context::{
+    BlockChainContextRequest, BlockChainContextResponse, BlockChainContextService,
+};
 use cuprate_helper::time::secs_to_hms;
 use tokio::sync::mpsc;
+use tower::{Service, ServiceExt};
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::reload::Handle;
@@ -100,7 +105,7 @@ fn main() {
             blockchain_write_handle,
             blockchain_read_handle,
             txpool_write_handle,
-            context_svc,
+            context_svc.clone(),
             block_verifier,
             config.block_downloader_config(),
         )
@@ -109,7 +114,7 @@ fn main() {
         let (command_tx, command_rx) = mpsc::channel(1);
         std::thread::spawn(|| commands::command_listener(command_tx));
 
-        io_loop(command_rx).await;
+        io_loop(command_rx, context_svc).await;
     });
 }
 
@@ -128,7 +133,10 @@ fn init_global_rayon_pool(config: &Config) {
         .unwrap()
 }
 
-async fn io_loop(mut incoming_commands: mpsc::Receiver<Command>) -> ! {
+async fn io_loop(
+    mut incoming_commands: mpsc::Receiver<Command>,
+    mut context_service: BlockChainContextService,
+) -> ! {
     while let Some(command) = incoming_commands.recv().await {
         match command {
             Command::SetLog { level } => {
@@ -137,10 +145,22 @@ async fn io_loop(mut incoming_commands: mpsc::Receiver<Command>) -> ! {
                 println!("LOG LEVEL CHANGED: {level}");
             }
             Command::Status => {
+                let BlockChainContextResponse::Context(blockchain_context) = context_service
+                    .ready()
+                    .await
+                    .expect(PANIC_CRITICAL_SERVICE_ERROR)
+                    .call(BlockChainContextRequest::Context)
+                    .await
+                    .expect(PANIC_CRITICAL_SERVICE_ERROR)
+                else {
+                    unreachable!();
+                };
+                let context = blockchain_context.unchecked_blockchain_context();
+
                 let uptime = statics::START_INSTANT.elapsed().unwrap_or_default();
                 let (hours, minutes, second) = secs_to_hms(uptime.as_secs());
 
-                println!("STATUS:\n  uptime: {hours}h {minutes}m {second}s");
+                println!("STATUS:\n  uptime: {hours}h {minutes}m {second}s,\n  height: {},\n  top_hash: {}", context.chain_height, hex::encode(context.top_hash));
             }
         }
     }

p2p/address-book/src/store.rs

@@ -39,15 +39,13 @@ pub(crate) fn save_peers_to_disk<Z: BorshNetworkZone>(
     })
     .unwrap();
 
-    let dir = cfg
+    let dir = cfg.peer_store_directory.clone();
-        .peer_store_directory.clone();
+    let file = dir.join(format!("{}_p2p_state", Z::NAME));
-    let file = dir
-        .join(format!("{}_p2p_state", Z::NAME));
 
     spawn_blocking(move || {
         fs::create_dir_all(dir)?;
-        fs::write(&file, &data) }
+        fs::write(&file, &data)
-    )
+    })
 }
 
 pub(crate) async fn read_peers_from_disk<Z: BorshNetworkZone>(