cleaned logs (#142)

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next release
 
+- fix(logs): fixed some logs and others
 - fix(rpc): fixed block storage column
 - chore: update dependencies
 - fix(hashers): cleaned hashers using types core hashers and Felt

crates/client/db/Cargo.toml

@@ -3,11 +3,7 @@ name = "mc-db"
 version.workspace = true
 edition.workspace = true
 description = "Starknet database backend"
-authors = [
-  "Kasar <https://github.com/kasarlabs>",
-  "KSS <https://github.com/keep-starknet-strange>",
-  "Substrate DevHub <https://github.com/substrate-developer-hub>",
-]
+authors = ["Kasar <https://github.com/kasarlabs>"]
 homepage = "https://github.com/kasarlabs/deoxys"
 license = "MIT"
 publish = false

crates/client/db/src/lib.rs

@@ -344,7 +344,7 @@ impl Drop for DBDropHook {
     fn drop(&mut self) {
         let backend = BACKEND_SINGLETON.get().unwrap() as *const _ as *mut Arc<DeoxysBackend>;
         let db = DB_SINGLETON.get().unwrap() as *const _ as *mut Arc<DB>;
-        log::info!("⏳ Closing database...");
+        log::info!("⏳ Closing database properly...");
         // TODO(HACK): again, i can't emphasize enough how bad of a hack this is
         unsafe {
             std::ptr::drop_in_place(backend);

crates/client/rpc/Cargo.toml

@@ -1,9 +1,5 @@
 [package]
-authors = [
-  "Kasar <https://github.com/kasarlabs>",
-  "KSS <https://github.com/keep-starknet-strange>",
-  "Substrate DevHub <https://github.com/substrate-developer-hub>",
-]
+authors = ["Kasar <https://github.com/kasarlabs>"]
 description = "Starknet RPC compatibility layer for Substrate"
 edition.workspace = true
 homepage = "https://github.com/kasarlabs/deoxys"

crates/client/rpc/src/methods/read/get_events.rs

@@ -41,7 +41,7 @@ pub async fn get_events(starknet: &Starknet, filter: EventFilterWithPage) -> Rpc
         return Err(StarknetRpcApiError::PageSizeTooBig.into());
     }
 
-    // Get the substrate block numbers for the requested range
+    // Get the block numbers for the requested range
     let (from_block, to_block, latest_block) =
         block_range(starknet, filter.event_filter.from_block, filter.event_filter.to_block)?;
 

crates/client/sync/src/l1.rs

@@ -10,7 +10,7 @@ use ethers::types::{Address, BlockNumber as EthBlockNumber, Filter, TransactionR
 use ethers::utils::hex::decode;
 use futures::stream::StreamExt;
 use mc_db::{DeoxysBackend, WriteBatchWithTransaction};
-use mp_felt::Felt252Wrapper;
+use mp_felt::{trim_hash, Felt252Wrapper};
 use primitive_types::H256;
 use prometheus_endpoint::prometheus::core::Number;
 use reqwest::Url;
@@ -172,10 +172,10 @@ impl EthereumClient {
 /// Update the L1 state with the latest data
 pub fn update_l1(state_update: L1StateUpdate, block_metrics: Option<BlockMetrics>) -> anyhow::Result<()> {
     log::info!(
-        "🔄 Updated L1 head: Number: #{}, Hash: {}, Root: {}",
+        "🔄 Updated L1 head #{} ({}) with state root ({})",
         state_update.block_number,
-        state_update.block_hash,
-        state_update.global_root
+        trim_hash(&Felt252Wrapper::from(state_update.block_hash)),
+        trim_hash(&Felt252Wrapper::from(state_update.global_root))
     );
 
     if let Some(block_metrics) = block_metrics {

crates/client/sync/src/l2.rs

@@ -85,6 +85,7 @@ async fn l2_verify_and_apply_task(
     verify: bool,
     backup_every_n_blocks: Option<u64>,
     block_metrics: Option<BlockMetrics>,
+    starting_block: u64,
     sync_timer: Arc<Mutex<Option<Instant>>>,
     telemetry: TelemetryHandle,
 ) -> anyhow::Result<()> {
@@ -149,6 +150,7 @@ async fn l2_verify_and_apply_task(
         update_sync_metrics(
             // &mut command_sink,
             block_n,
+            starting_block,
             block_metrics.as_ref(),
             sync_timer.clone(),
         )
@@ -301,6 +303,7 @@ pub async fn sync(
     provider: SequencerGatewayProvider,
     config: L2SyncConfig,
     block_metrics: Option<BlockMetrics>,
+    starting_block: u64,
     chain_id: StarkFelt,
     telemetry: TelemetryHandle,
 ) -> anyhow::Result<()> {
@@ -335,6 +338,7 @@ pub async fn sync(
         config.verify,
         config.backup_every_n_blocks,
         block_metrics,
+        starting_block,
         Arc::clone(&sync_timer),
         telemetry,
     ));
@@ -349,6 +353,7 @@ pub async fn sync(
 
 async fn update_sync_metrics(
     block_number: u64,
+    starting_block: u64,
     block_metrics: Option<&BlockMetrics>,
     sync_timer: Arc<Mutex<Option<Instant>>>,
 ) -> anyhow::Result<()> {
@@ -370,7 +375,7 @@ async fn update_sync_metrics(
         let sync_time = block_metrics.l2_sync_time.get() + elapsed_time;
         block_metrics.l2_sync_time.set(sync_time);
         block_metrics.l2_latest_sync_time.set(elapsed_time);
-        block_metrics.l2_avg_sync_time.set(block_metrics.l2_sync_time.get() / block_number as f64);
+        block_metrics.l2_avg_sync_time.set(block_metrics.l2_sync_time.get() / (block_number - starting_block) as f64);
     }
 
     Ok(())

crates/client/sync/src/lib.rs

@@ -50,7 +50,7 @@ pub mod starknet_sync_worker {
                 .unwrap_or_default() as _
         };
 
-        log::info!("☕ Starting L2 sync from block {}", starting_block);
+        log::info!("⛓️  Starting L2 sync from block {}", starting_block);
 
         let provider = SequencerGatewayProvider::new(
             fetch_config.gateway.clone(),
@@ -74,6 +74,7 @@ pub mod starknet_sync_worker {
                     backup_every_n_blocks,
                 },
                 block_metrics,
+                starting_block,
                 chain_id,
                 telemetry,
             ),

crates/client/sync/src/utils/convert.rs

@@ -7,6 +7,7 @@ use std::sync::Arc;
 use blockifier::block::GasPrices;
 use mp_block::{DeoxysBlock, DeoxysBlockInfo, DeoxysBlockInner};
 use mp_felt::Felt252Wrapper;
+use mp_hashers::pedersen::PedersenHasher;
 use starknet_api::block::BlockHash;
 use starknet_api::hash::StarkFelt;
 use starknet_api::transaction::{
@@ -70,7 +71,7 @@ pub fn convert_block(block: p::Block, chain_id: StarkFelt) -> Result<DeoxysBlock
         extra_data,
     };
 
-    let computed_block_hash: FieldElement = header.hash::<mp_hashers::pedersen::PedersenHasher>().into();
+    let computed_block_hash: FieldElement = header.hash::<PedersenHasher>().into();
     // mismatched block hash is allowed for blocks 1466..=2242
     if computed_block_hash != block_hash && !(1466..=2242).contains(&block_number) {
         return Err(L2SyncError::MismatchedBlockHash(block_number));

crates/node/Cargo.toml

@@ -1,9 +1,5 @@
 [package]
-authors = [
-  "Kasar <https://github.com/kasarlabs>",
-  "KSS <https://github.com/keep-starknet-strange>",
-  "Substrate DevHub <https://github.com/substrate-developer-hub>",
-]
+authors = ["Kasar <https://github.com/kasarlabs>"]
 description = "Deoxys node"
 edition.workspace = true
 homepage = "https://github.com/kasarlabs/deoxys"
@@ -51,6 +47,7 @@ reqwest = { workspace = true }
 url = { workspace = true }
 
 anyhow.workspace = true
+chrono = "0.4.38"
 env_logger = "0.11.3"
 forwarded-header-value = "0.1.1"
 governor.workspace = true

crates/node/src/main.rs

@@ -2,6 +2,7 @@
 #![warn(missing_docs)]
 
 use anyhow::Context;
+use chrono::Local;
 use clap::Parser;
 
 mod cli;
@@ -11,16 +12,21 @@ mod util;
 use cli::RunCmd;
 use mc_telemetry::{SysInfo, TelemetryService};
 use service::{DatabaseService, RpcService, SyncService};
+use std::io::Write;
 use tokio::task::JoinSet;
 
 const GREET_IMPL_NAME: &str = "Deoxys";
 const GREET_SUPPORT_URL: &str = "https://kasar.io";
-const GREET_AUTHORS: &[&str] =
-    &["Kasar <https://github.com/kasarlabs>", "KSS <https://github.com/keep-starknet-strange>"];
+const GREET_AUTHORS: &[&str] = &["Kasar <https://github.com/kasarlabs>"];
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
+        .format(|buf, record| {
+            let ts = Local::now().format("%Y-%m-%d %H:%M:%S");
+            writeln!(buf, "[{} {}] {}", ts, record.level(), record.args())
+        })
+        .init();
 
     crate::util::setup_rayon_threadpool()?;
     let mut run_cmd: RunCmd = RunCmd::parse();
@@ -30,11 +36,11 @@ async fn main() -> anyhow::Result<()> {
     log::info!("👽 {} Node", GREET_IMPL_NAME);
     log::info!("✌️  Version {}", node_version);
     for author in GREET_AUTHORS {
-        log::info!("❤️   by {}", author);
+        log::info!("❤️  By {}", author);
     }
     log::info!("💁 Support URL: {}", GREET_SUPPORT_URL);
-    log::info!("👤 Role: full node");
-    log::info!("🏷  Node name: {}", node_name);
+    log::info!("🏷  Node Name: {}", node_name);
+    log::info!("👤 Role: Full Node");
 
     let sys_info = SysInfo::probe();
     sys_info.show();