Replace println with tracing

packages/ciphernode/aggregator/Cargo.toml

@@ -10,3 +10,4 @@ bincode = { workspace = true }
 enclave-core = { path = "../core" }
 fhe = { path = "../fhe" }
 sortition = { path = "../sortition" }
+tracing = { workspace = true }

packages/ciphernode/aggregator/src/plaintext_aggregator.rs

@@ -7,6 +7,7 @@ use enclave_core::{
 use fhe::{Fhe, GetAggregatePlaintext};
 use sortition::{GetHasNode, Sortition};
 use std::sync::Arc;
+use tracing::error;
 
 #[derive(Debug, Clone)]
 pub enum PlaintextAggregatorState {
@@ -124,7 +125,7 @@ impl Handler<DecryptionshareCreated> for PlaintextAggregator {
             threshold_m, seed, ..
         } = self.state
         else {
-            println!("Aggregator has been closed for collecting.");
+            error!(state=?self.state, "Aggregator has been closed for collecting.");
             return Box::pin(fut::ready(Ok(())));
         };
 
@@ -144,12 +145,12 @@ impl Handler<DecryptionshareCreated> for PlaintextAggregator {
                 .map(move |res, act, ctx| {
                     let has_node = res?;
                     if !has_node {
-                        println!("Node not found in committee"); // TODO: log properly
+                        error!("Node not found in committee");
                         return Ok(());
                     }
 
                     if e3_id != act.e3_id {
-                        println!("Wrong e3_id sent to aggregator. This should not happen.");
+                        error!("Wrong e3_id sent to aggregator. This should not happen.");
                         return Ok(());
                     }
 

packages/ciphernode/aggregator/src/publickey_aggregator.rs

@@ -6,6 +6,7 @@ use enclave_core::{
 use fhe::{Fhe, GetAggregatePublicKey};
 use sortition::{GetHasNode, GetNodes, Sortition};
 use std::sync::Arc;
+use tracing::error;
 
 #[derive(Debug, Clone)]
 pub enum PublicKeyAggregatorState {
@@ -132,8 +133,7 @@ impl Handler<KeyshareCreated> for PublicKeyAggregator {
             threshold_m, seed, ..
         } = self.state.clone()
         else {
-            println!("Aggregator has been closed for collecting keyshares."); // TODO: log properly
-
+            error!(state=?self.state, "Aggregator has been closed for collecting keyshares.");
             return Box::pin(fut::ready(Ok(())));
         };
 
@@ -155,12 +155,12 @@ impl Handler<KeyshareCreated> for PublicKeyAggregator {
                     // we will not be doing a send
                     let has_node = res?;
                     if !has_node {
-                        println!("Node not found in committee"); // TODO: log properly
+                        error!("Node not found in committee");
                         return Ok(());
                     }
 
                     if e3_id != act.e3_id {
-                        println!("Wrong e3_id sent to aggregator. This should not happen.");
+                        error!("Wrong e3_id sent to aggregator. This should not happen.");
                         return Ok(());
                     }
 

packages/ciphernode/core/src/events.rs

@@ -539,6 +539,7 @@ pub enum EnclaveErrorType {
     IO,
     PlaintextAggregation,
     Decryption,
+    Sortition
 }
 
 impl EnclaveError {

packages/ciphernode/enclave/Cargo.toml

@@ -15,3 +15,4 @@ actix-rt = { workspace = true }
 tokio = { workspace = true }
 config = "0.14.0"
 tracing-subscriber = { workspace = true } 
+tracing = { workspace = true }

packages/ciphernode/enclave/src/bin/aggregator.rs

@@ -1,6 +1,7 @@
 use clap::Parser;
 use enclave::load_config;
 use enclave_node::MainAggregator;
+use tracing::info;
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
@@ -20,7 +21,7 @@ struct Args {
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     tracing_subscriber::fmt::init();
     let args = Args::parse();
-    println!("LAUNCHING AGGREGATOR");
+    info!("LAUNCHING AGGREGATOR");
     let config = load_config(&args.config)?;
     let (_, handle) = MainAggregator::attach(
         config,

packages/ciphernode/enclave/src/main.rs

@@ -2,6 +2,7 @@ use alloy::primitives::Address;
 use clap::Parser;
 use enclave::load_config;
 use enclave_node::MainCiphernode;
+use tracing::info;
 
 const OWO: &str = r#"
       ___           ___           ___                         ___                         ___     
@@ -34,7 +35,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("\n\n\n\n");
     let args = Args::parse();
     let address = Address::parse_checksummed(&args.address, None).expect("Invalid address");
-    println!("LAUNCHING CIPHERNODE: ({})", address);
+    info!("LAUNCHING CIPHERNODE: ({})", address);
     let config = load_config(&args.config)?;
     let (_, handle) = MainCiphernode::attach(config, address).await?;
     let _ = tokio::join!(handle);

packages/ciphernode/evm/Cargo.toml

@@ -12,3 +12,4 @@ enclave-core = { path = "../core" }
 futures-util = { workspace = true }
 sortition = { path = "../sortition" }
 tokio = { workspace = true }
+tracing = { workspace = true }

packages/ciphernode/evm/src/ciphernode_registry_sol.rs

@@ -8,6 +8,7 @@ use alloy::{
 };
 use anyhow::Result;
 use enclave_core::{EnclaveEvent, EventBus};
+use tracing::{error, info, trace};
 
 use crate::helpers::{self, create_readonly_provider, ReadonlyProvider};
 
@@ -69,22 +70,25 @@ fn extractor(data: &LogData, topic: Option<&B256>, _: u64) -> Option<EnclaveEven
         Some(&ICiphernodeRegistry::CiphernodeAdded::SIGNATURE_HASH) => {
             let Ok(event) = ICiphernodeRegistry::CiphernodeAdded::decode_log_data(data, true)
             else {
-                println!("Error parsing event CiphernodeAdded"); // TODO: provide more info
+                error!("Error parsing event CiphernodeAdded after topic was matched!");
                 return None;
             };
             Some(EnclaveEvent::from(event))
         }
         Some(&ICiphernodeRegistry::CiphernodeRemoved::SIGNATURE_HASH) => {
             let Ok(event) = ICiphernodeRegistry::CiphernodeRemoved::decode_log_data(data, true)
             else {
-                println!("Error parsing event CiphernodeRemoved"); // TODO: provide more info
+                error!("Error parsing event CiphernodeRemoved after topic was matched!");
                 return None;
             };
             Some(EnclaveEvent::from(event))
         }
 
-        _ => {
-            println!("Unknown event");
+        _topic => {
+            trace!(
+                topic=?_topic,
+                "Unknown event was received by Enclave.sol parser buut was ignored"
+            );
             return None;
         }
     }
@@ -122,7 +126,7 @@ impl CiphernodeRegistrySolReader {
                 .await?
                 .start();
 
-        println!("CiphernodeRegistrySol is listening to {}", contract_address);
+        info!(address=%contract_address, "CiphernodeRegistrySol is listening to address");
         Ok(addr)
     }
 }

packages/ciphernode/evm/src/enclave_sol_reader.rs

@@ -7,6 +7,7 @@ use alloy::{
 };
 use anyhow::Result;
 use enclave_core::{EnclaveEvent, EventBus};
+use tracing::{error, info, trace};
 
 sol!(
     #[sol(rpc)]
@@ -55,21 +56,24 @@ fn extractor(data: &LogData, topic: Option<&B256>, chain_id: u64) -> Option<Encl
     match topic {
         Some(&IEnclave::E3Requested::SIGNATURE_HASH) => {
             let Ok(event) = IEnclave::E3Requested::decode_log_data(data, true) else {
-                println!("Error parsing event E3Requested"); // TODO: provide more info
+                error!("Error parsing event E3Requested after topic matched!");
                 return None;
             };
             Some(EnclaveEvent::from(E3RequestedWithChainId(event, chain_id)))
         }
         Some(&IEnclave::CiphertextOutputPublished::SIGNATURE_HASH) => {
             let Ok(event) = IEnclave::CiphertextOutputPublished::decode_log_data(data, true) else {
-                println!("Error parsing event CiphertextOutputPublished"); // TODO: provide more info
+                error!("Error parsing event CiphertextOutputPublished after topic matched!"); // TODO: provide more info
                 return None;
             };
             Some(EnclaveEvent::from(event))
         }
 
-        _ => {
-            println!("Unknown event");
+        _topic => {
+            trace!(
+                topic=?_topic,
+                "Unknown event was received by Enclave.sol parser buut was ignored"
+            );
             return None;
         }
     }
@@ -105,7 +109,7 @@ impl EnclaveSolReader {
             .await?
             .start();
 
-        println!("Evm is listening to {}", contract_address);
+        info!(address=%contract_address, "Evm is listening to address");
         Ok(addr)
     }
 }

packages/ciphernode/evm/src/enclave_sol_writer.rs

@@ -13,6 +13,7 @@ use alloy::{
 use anyhow::Result;
 use enclave_core::{BusError, E3id, EnclaveErrorType, PlaintextAggregated, Subscribe};
 use enclave_core::{EnclaveEvent, EventBus};
+use tracing::info;
 
 sol!(
     #[sol(rpc)]
@@ -93,7 +94,7 @@ impl Handler<PlaintextAggregated> for EnclaveSolWriter {
                         .await;
                 match result {
                     Ok(receipt) => {
-                        println!("tx:{}", receipt.transaction_hash)
+                        info!(tx=%receipt.transaction_hash, "tx")
                     }
                     Err(err) => bus.err(EnclaveErrorType::Evm, err),
                 }

packages/ciphernode/evm/src/helpers.rs

@@ -15,6 +15,7 @@ use alloy::{
 use anyhow::{Context, Result};
 use enclave_core::{BusError, EnclaveErrorType, EnclaveEvent};
 use futures_util::stream::StreamExt;
+use tracing::{info, trace};
 
 pub async fn stream_from_evm<P: Provider>(
     provider: WithChainId<P>,
@@ -31,10 +32,13 @@ pub async fn stream_from_evm<P: Provider>(
         Ok(subscription) => {
             let mut stream = subscription.into_stream();
             while let Some(log) = stream.next().await {
+                trace!("Received log from EVM");
                 let Some(event) = extractor(log.data(), log.topic0(), provider.get_chain_id())
                 else {
+                    trace!("Failed to extract log from EVM");
                     continue;
                 };
+                info!("Extracted log from evm sending now.");
                 bus.do_send(event);
             }
         }

packages/ciphernode/evm/src/registry_filter_sol.rs

@@ -11,6 +11,7 @@ use enclave_core::{
     BusError, E3id, EnclaveErrorType, EnclaveEvent, EventBus, OrderedSet, PublicKeyAggregated,
     Subscribe,
 };
+use tracing::info;
 use std::sync::Arc;
 
 sol!(
@@ -92,7 +93,7 @@ impl Handler<PublicKeyAggregated> for RegistryFilterSolWriter {
                     publish_committee(provider, contract_address, e3_id, nodes, pubkey).await;
                 match result {
                     Ok(receipt) => {
-                        println!("tx:{}", receipt.transaction_hash);
+                        info!(tx=%receipt.transaction_hash,"tx");
                     }
                     Err(err) => bus.err(EnclaveErrorType::Evm, err),
                 }