From ca10284479922d355f2174d7daf828a9cbc08bd6 Mon Sep 17 00:00:00 2001 From: bitcoinafterlife Date: Sat, 19 Jul 2025 07:12:18 -0400 Subject: [PATCH] logs about current block --- src/bin/bal-pusher.rs | 14 +++++++++----- src/bin/bal-server.rs | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/bin/bal-pusher.rs b/src/bin/bal-pusher.rs index dcb267c..b84905a 100644 --- a/src/bin/bal-pusher.rs +++ b/src/bin/bal-pusher.rs @@ -9,8 +9,6 @@ use sqlite::{Value}; use serde::Serialize; use serde::Deserialize; use std::env; -use std::fs::OpenOptions; -use std::io::{ Write}; use log::{info,warn,error,trace,debug}; use zmq::{Context, Socket}; use std::str; @@ -203,15 +201,21 @@ fn main_result(cfg: &MyConfig, network_params: &NetworkParams) -> Result<(), Err //} //let average_time = time_sum/11; info!("median time: {}",bcinfo.median_time); + info!("blocks: {}",bcinfo.blocks); + debug!("best block hash: {}",bcinfo.best_block_hash); + let average_time = bcinfo.median_time; let db = sqlite::open(&cfg.db_file).unwrap(); + + + let sqlquery = "SELECT * FROM tbl_tx WHERE network = :network AND status = :status AND ( locktime < :bestblock_height OR locktime > :locktime_threshold AND locktime < :bestblock_time);"; + let query_tx = db.prepare(sqlquery).unwrap().into_iter(); + trace!("query_tx: {}",sqlquery); trace!(":locktime_threshold: {}", LOCKTIME_THRESHOLD ); trace!(":bestblock_time: {}", average_time); trace!(":bestblock_height: {}", bcinfo.blocks); trace!(":network: {}", network_params.db_field.clone()); trace!(":status: {}", 0); - - let query_tx = db.prepare("SELECT * FROM tbl_tx WHERE network = :network AND status = :status AND ( locktime < :bestblock_height OR locktime > :locktime_threshold AND locktime < :bestblock_time);").unwrap().into_iter(); //let query_tx = db.prepare("SELECT * FROM tbl_tx where status = :status").unwrap().into_iter(); let mut pushed_txs:Vec = Vec::new(); let mut invalid_txs: std::collections::HashMap = HashMap::new(); @@ -428,7 +432,7 @@ fn main(){ debug!("ZMQ:GET TOPIC: {}", String::from_utf8(topic.clone()).expect("invalid topic")); trace!("ZMQ:GET BODY: {}", hex::encode(&body)); if topic == b"hashblock" { - info!("NEW BLOCK{}", hex::encode(&body)); + info!("NEW BLOCK: {}", hex::encode(&body)); //let cfg = cfg.clone(); let _ = main_result(&cfg,network_params); } diff --git a/src/bin/bal-server.rs b/src/bin/bal-server.rs index ec0bc43..e41e360 100644 --- a/src/bin/bal-server.rs +++ b/src/bin/bal-server.rs @@ -499,7 +499,7 @@ fn parse_env_netconfig<'a>(mut cfg_lock: MutexGuard<'a, MyConfig>, chain: &'a st } } - if let Ok(value) = env::var(format!("BAL_SERVER_{}_FIXE_FEE",chain.to_uppercase())) { + if let Ok(value) = env::var(format!("BAL_SERVER_{}_FIXED_FEE",chain.to_uppercase())) { if let Ok(v) = value.parse::(){ cfg.fixed_fee = v; }