From 9e89ae884e81b6cf074e85d8fb297d58c3509375 Mon Sep 17 00:00:00 2001 From: bitcoinafterlife Date: Tue, 15 Jul 2025 15:12:21 -0400 Subject: [PATCH] fixed db field network --- src/bin/bal-pusher.rs | 27 ++++++++++++++++++--------- src/bin/bal-server.rs | 2 +- src/db.rs | 2 ++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/bin/bal-pusher.rs b/src/bin/bal-pusher.rs index 49520c0..54c8086 100644 --- a/src/bin/bal-pusher.rs +++ b/src/bin/bal-pusher.rs @@ -73,7 +73,7 @@ fn get_network_params(cfg: &MyConfig,network:Network)-> &NetworkParams{ fn get_network_params_default(network:Network) -> NetworkParams{ match network { Network::Testnet => NetworkParams{ - host: "http://localhost".to_string(), + host: "http://i27.0.0.1".to_string(), port: 18332, dir_path: "testnet3/".to_string(), db_field: "testnet".to_string(), @@ -82,7 +82,7 @@ fn get_network_params_default(network:Network) -> NetworkParams{ rpc_pass: "".to_string(), }, Network::Signet => NetworkParams{ - host: "http://localhost".to_string(), + host: "http://127.0.0.1".to_string(), port: 18332, dir_path: "signet/".to_string(), db_field: "signet".to_string(), @@ -91,7 +91,7 @@ fn get_network_params_default(network:Network) -> NetworkParams{ rpc_pass: "".to_string(), }, Network::Regtest => NetworkParams{ - host: "http://localhost".to_string(), + host: "http://127.0.0.1".to_string(), port: 18443, dir_path: "regtest/".to_string(), db_field: "regtest".to_string(), @@ -100,7 +100,7 @@ fn get_network_params_default(network:Network) -> NetworkParams{ rpc_pass: "".to_string(), }, _ => NetworkParams{ - host: "http://localhost".to_string(), + host: "http://127.0.0.1".to_string(), port: 8332, dir_path: "".to_string(), db_field: "bitcoin".to_string(), @@ -147,10 +147,18 @@ fn get_client_from_username(url: &String, network: &NetworkParams) -> Result<(Cl fn get_client_from_cookie(url: &String,network: &NetworkParams)->Result<(Client,GetBlockchainInfoResult),Box>{ match get_cookie_filename(network){ Ok(cookie) => { + dbg!(&cookie); + dbg!(&url); match Client::new(&url[..], Auth::CookieFile(cookie.into())) { - Ok(client) => match client.get_blockchain_info(){ - Ok(bcinfo) => Ok((client,bcinfo)), - Err(err) => Err(err.into()) + Ok(client) => { + dbg!(&client); + match client.get_blockchain_info(){ + Ok(bcinfo) => Ok((client,bcinfo)), + Err(err) => { + println!("si rompe qua"); + Err(err.into()) + } + } }, Err(err)=>Err(err.into()) @@ -160,7 +168,7 @@ fn get_client_from_cookie(url: &String,network: &NetworkParams)->Result<(Client, } } fn get_client(network: &NetworkParams) -> Result<(Client,GetBlockchainInfoResult),Box>{ - let url = format!("{}:{}",network.host,&network.port); + let url = format!("{}:{}/",network.host,&network.port); match get_client_from_username(&url,network){ Ok(client) =>{Ok(client)}, Err(_) =>{ @@ -381,7 +389,7 @@ fn main(){ }; - debug!("Network: {}",arg_network); + info!("Network: {}",arg_network); let network_params = get_network_params(&cfg,network); @@ -389,6 +397,7 @@ fn main(){ let socket: Socket = context.socket(zmq::SUB).unwrap(); let zmq_address = cfg.zmq_listener.clone(); + info!("zmq listening on: {}",zmq_address); socket.connect(&zmq_address).unwrap(); socket.set_subscribe(b"").unwrap(); diff --git a/src/bin/bal-server.rs b/src/bin/bal-server.rs index 5e21993..3f058b7 100644 --- a/src/bin/bal-server.rs +++ b/src/bin/bal-server.rs @@ -369,7 +369,7 @@ async fn echo_push(whole_body: &Bytes, ptx.push((linenum+3,Value::String(line.to_string()))); ptx.push((linenum+4,Value::String(locktime.to_string()))); ptx.push((linenum+5,Value::String(req_time.to_string()))); - ptx.push((linenum+6,Value::String(param.to_string()))); + ptx.push((linenum+6,Value::String(netconfig.name.to_string()))); ptx.push((linenum+7,Value::String(our_address.to_string()))); ptx.push((linenum+8,Value::String(our_fees.to_string()))); linenum += 9; diff --git a/src/db.rs b/src/db.rs index c35f784..beac303 100644 --- a/src/db.rs +++ b/src/db.rs @@ -17,6 +17,8 @@ pub fn create_database(db: &Connection){ let _ = db.execute("CREATE UNIQUE INDEX idx_xpub ON tbl_xpub (network, xpub)"); let _ = db.execute("CREATE TABLE IF NOT EXISTS tbl_address (address TEXT PRIMARY_KEY, path TEXT NOT NULL, date_create TIMESTAMP DEFAULT CURRENT_TIMESTAMP, xpub INTEGER,remote_address TEXT);"); + let _ = db.execute("UPDATE tbl_tx set network='bitcoin' where network='mainnet');"); + } /*