add atomic bool to disable logging output for escrow cli input

Author: fbock

taptrade-cli-demo/coordinator/Cargo.lock

@@ -28,6 +28,7 @@ sha2 = "0.10"
 validator = { version = "0.18", features = ["derive"] }
 musig2 = "0.0.11"
 bincode = "1.3.3"
+chrono = "0.4.38"
 
 [profile.release]
 lto = true

taptrade-cli-demo/coordinator/Cargo.toml

@@ -191,7 +191,7 @@ async fn submit_obligation_confirmation(
 // or
 
 // gets called if one of the traders wants to initiate escrow (e.g. claiming they didn't receive the fiat)
-// before timeout ends
+// before timeout ends, just sets the maker unhappy and escrow onging flag in the db
 async fn request_escrow(
 	Extension(coordinator): Extension<Arc<Coordinator>>,
 	Json(payload): Json<TradeObligationsUnsatisfied>,

taptrade-cli-demo/coordinator/src/communication/mod.rs

@@ -150,7 +150,7 @@ impl CoordinatorDB {
 		)
 		.execute(&db_pool)
 		.await?;
-		dbg!("Database initialized");
+		debug!("Database initialized");
 		let shared_db_pool = Arc::new(db_pool);
 		Ok(Self {
 			db_pool: shared_db_pool,
@@ -745,6 +745,8 @@ impl CoordinatorDB {
 		Ok(())
 	}
 
+	// checked by the payout handler on request to determine if the trade is ready for payout and
+	// if escrow is required
 	pub async fn fetch_trader_happiness(&self, offer_id: &str) -> Result<TraderHappiness> {
 		let row = sqlx::query(
 			"SELECT maker_happy, taker_happy, escrow_ongoing FROM taken_offers WHERE offer_id = ?",
@@ -764,6 +766,7 @@ impl CoordinatorDB {
 		})
 	}
 
+	// this will be checked by the payout handler on request, the escrow winner will be set trough CLI input
 	pub async fn fetch_escrow_result(&self, offer_id: &str) -> Result<Option<String>> {
 		let row = sqlx::query("SELECT escrow_winner_robohash FROM taken_offers WHERE offer_id = ?")
 			.bind(offer_id)
@@ -776,30 +779,6 @@ impl CoordinatorDB {
 		Ok(winner_robohash)
 	}
 
-	// pub async fn fetch_escrow_tx_payout_data(
-	// 	&self,
-	// 	offer_id: &str,
-	// ) -> Result<EscrowPsbtConstructionData> {
-	// 	let row = sqlx::query("SELECT taproot_xonly_pubkey_hex_maker, taproot_xonly_pubkey_hex_taker, musig_pubkey_compressed_hex_maker, musig_pubkey_compressed_hex_taker FROM taken_offers WHERE offer_id = ?")
-	// 		.bind(offer_id)
-	// 		.fetch_one(&*self.db_pool)
-	// 		.await?;
-
-	// 	let taproot_xonly_pubkey_hex_maker: String = row.get("taproot_xonly_pubkey_hex_maker");
-	// 	let taproot_xonly_pubkey_hex_taker: String = row.get("taproot_xonly_pubkey_hex_taker");
-	// 	let musig_pubkey_compressed_hex_maker: String =
-	// 		row.get("musig_pubkey_compressed_hex_maker");
-	// 	let musig_pubkey_compressed_hex_taker: String =
-	// 		row.get("musig_pubkey_compressed_hex_taker");
-
-	// 	Ok(EscrowPsbtConstructionData {
-	// 		taproot_xonly_pubkey_hex_maker,
-	// 		taproot_xonly_pubkey_hex_taker,
-	// 		musig_pubkey_compressed_hex_maker,
-	// 		musig_pubkey_compressed_hex_taker,
-	// 	})
-	// }
-
 	pub async fn get_escrow_tx_amounts(
 		&self,
 		trade_id: &str,

taptrade-cli-demo/coordinator/src/database/mod.rs

@@ -3,16 +3,6 @@ mod coordinator;
 mod database;
 mod wallet;
 
-use std::{
-	collections::{HashMap, HashSet},
-	env, fmt,
-	net::SocketAddr,
-	ops::Deref,
-	str::FromStr,
-	sync::{Arc, RwLock},
-	time::{SystemTime, UNIX_EPOCH},
-};
-
 use anyhow::{anyhow, Context, Result};
 use axum::{
 	http::StatusCode,
@@ -42,6 +32,7 @@ use bdk::{
 	wallet::verify::*,
 	KeychainKind, SignOptions, SyncOptions, Wallet,
 };
+use chrono::Local;
 use communication::{api::*, api_server, communication_utils::*, handler_errors::*};
 use coordinator::{
 	bond_monitoring::*, coordinator_utils::*, mempool_monitoring::MempoolHandler,
@@ -58,6 +49,19 @@ use musig2::{
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use sqlx::{sqlite::SqlitePoolOptions, Pool, Row, Sqlite};
+use std::{
+	collections::{HashMap, HashSet},
+	env, fmt,
+	io::Write,
+	net::SocketAddr,
+	ops::Deref,
+	str::FromStr,
+	sync::{
+		atomic::{AtomicBool, Ordering},
+		Arc, RwLock,
+	},
+	time::{SystemTime, UNIX_EPOCH},
+};
 use tokio::{
 	net::TcpListener,
 	sync::{oneshot, Mutex},
@@ -70,12 +74,41 @@ pub struct Coordinator {
 	pub coordinator_wallet: Arc<CoordinatorWallet<MemoryDatabase>>,
 }
 
+static LOGGING_ENABLED: AtomicBool = AtomicBool::new(true);
+
+fn get_logging_color_code(level: log::Level) -> &'static str {
+	match level {
+		log::Level::Error => "\x1B[31m", // Red
+		log::Level::Warn => "\x1B[33m",  // Yellow
+		log::Level::Info => "\x1B[32m",  // Green
+		log::Level::Debug => "\x1B[34m", // Blue
+		log::Level::Trace => "\x1B[36m", // Cyan
+	}
+}
+
 // populate .env with values before starting
 #[tokio::main]
 async fn main() -> Result<()> {
 	env_logger::builder()
 		.filter_module("coordinator", log::LevelFilter::Trace)
 		.filter_level(log::LevelFilter::Info)
+		.format(|buf, record| {
+			if LOGGING_ENABLED.load(Ordering::Relaxed) {
+				let level = record.level();
+				let color_code = get_logging_color_code(level);
+				writeln!(
+					buf,
+					"{} [{}{}{}] - {}",
+					Local::now().format("%Y-%m-%d %H:%M:%S"),
+					color_code,
+					level,
+					"\x1B[0m", // Reset color
+					record.args()
+				)
+			} else {
+				Ok(())
+			}
+		})
 		.init();
 	dotenv().ok();
 	debug!("Starting coordinator");

taptrade-cli-demo/coordinator/src/main.rs

@@ -76,7 +76,7 @@ pub async fn init_coordinator_wallet() -> Result<CoordinatorWallet<MemoryDatabas
 	wallet
 		.sync(&backend, SyncOptions::default())
 		.context("Connection to blockchain server failed.")?; // we could also use Esplora to make this async
-	dbg!(wallet.get_balance()?);
+	info!("{}", wallet.get_balance()?);
 	Ok(CoordinatorWallet {
 		wallet: Arc::new(Mutex::new(wallet)),
 		backend: Arc::new(backend),