bal server route /

ED25519 times signing

Cargo.lock

@@ -1315,9 +1315,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -1753,9 +1753,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.60"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",

README.md

@@ -1,10 +1,11 @@
 # bal-server
 
 ## Installation
-
 ```bash
 $ git clone ....
 $ cd bal-server
+$ openssl genpkey -algorithm ED25519 -out private_key.pem
+$ openssl pkey -in private_key.pem -pubout -out public_key.pem
 $ cargo build --release
 $ sudo cp target/release/bal-server /usr/local/bin
 $ bal-server
@@ -20,6 +21,7 @@ The `bal-server` application can be configured using environment variables. The
 | `BAL_SERVER_DB_FILE` | Path to the SQLite3 database file. If the file does not exist, a new one will be created. | `bal.db` |
 | `BAL_SERVER_BIND_ADDRESS` | Public address for listening to requests. | `127.0.0.1` |
 | `BAL_SERVER_BIND_PORT` | Default port for listening to requests. | `9137` |
+| `BAL_SERVER_PUB_KEY_PATH` | WillExecutor Ed25519 public key | `public_key.pem` |
 | `BAL_SERVER_REGTEST_ADDRESS` | Bitcoin address for the regtest environment. | - |
 | `BAL_SERVER_REGTEST_FIXED_FEE` | Fixed fee for the regtest environment. | 50000 |
 | `BAL_SERVER_SIGNET_ADDRESS` | Bitcoin address for the signet environment. | - |
@@ -28,6 +30,8 @@ The `bal-server` application can be configured using environment variables. The
 | `BAL_SERVER_TESTNET_FIXED_FEE` | Fixed fee for the testnet environment. | 50000 |
 | `BAL_SERVER_BITCOIN_ADDRESS` | Bitcoin address for the mainnet environment. | - |
 | `BAL_SERVER_BITCOIN_FIXED_FEE` | Fixed fee for the mainnet environment. | 50000 |
+
+
 # bal-pusher
 
 `bal-pusher` is a tool that retrieves Bitcoin transactions from a database and pushes them to the Bitcoin network when their **locktime** exceeds the **median time past** (MTP). It listens for Bitcoin block updates via ZMQ.
@@ -48,27 +52,6 @@ To use `bal-pusher`, you need to compile and install Bitcoin with ZMQ (ZeroMQ) s
 2. **Install Rust and Cargo**:
    If you haven't already installed Rust and Cargo, you can follow the official instructions to do so: [Rust Installation](https://www.rust-lang.org/tools/install).
 
-### Installation Steps
-
-1. Clone the repository:
-
-   ```bash
-   git clone <repo-url>
-   cd bal-pusher
-   ```
-
-2. Build the project:
-
-   ```bash
-   cargo build --release
-   ```
-
-3. Install the binary:
-
-   ```bash
-   sudo cp target/release/bal-pusher /usr/local/bin
-   ```
-
 ## Configuration
 
 `bal-pusher` can be configured using environment variables. If no configuration file is provided, a default configuration file will be created.
@@ -85,6 +68,10 @@ To use `bal-pusher`, you need to compile and install Bitcoin with ZMQ (ZeroMQ) s
 | `BAL_PUSHER_BITCOIN_COOKIE_FILE`      | Path to Bitcoin RPC cookie file.         | `$HOME/.bitcoin/.cookie`                     |
 | `BAL_PUSHER_BITCOIN_RPC_USER`         | Bitcoin RPC username.                    | -                                            |
 | `BAL_PUSHER_BITCOIN_RPC_PASSWORD`     | Bitcoin RPC password.                    | -                                            |
+| `BAL_PUSHER_SEND_STATS`               | Contact welist to provide times          | false                                        |
+| `WELIST_SERVER_URL`                   | welist server url to provide times       | https://welist.bitcoin-afer.life             |
+| `BAL_SERVER_URL`                      | WillExecutor server url                  | -                                            |
+| `SSL_KEY_PATH`                        | Ed25519 private key pem file             | `private_key.pem`                            |
 
 
 ## Running `bal-pusher`

bal-pusher.env

@@ -8,4 +8,9 @@ BAL_PUSHER_SIGNET_COOKIE_FILE=/home/bitcoin/.bitcoin/signet/.cookie
 
 BAL_PUSHER_ZMQ_LISTENER=tcp://127.0.0.1:28332
 
+BAL_PUSHER_SEND_STATS=true 
+WELIST_SERVER_URL=http://welist.bitcoin-after.life
+SSL_KEY_PATH=/home/bal/privkey.pem
 
+#your server domain. do not add https or final / only domain. 
+BAL_SERVER_URL="https://we.bitcoin-after.life" 

bal-pusher.sh

@@ -0,0 +1,14 @@
+RUST_LOG=trace
+
+BAL_PUSHER_DB_FILE="$(pwd)/bal.db"
+#export BAL_PUSHER_BITCOIN_COOKIE_FILE=/~/.bitcoin/.cookie
+#export BAL_PUSHER_REGTEST_COOKIE_FILE=/~/.bitcoin/regtest/.cookie
+#export BAL_PUSHER_TESTNET_COOKIE_FILE=/~/.bitcoin/testnet3/.cookie
+#export BAL_PUSHER_SIGNET_COOKIE_FILE=/~/.bitcoin/signet/.cookie
+
+BAL_PUSHER_ZMQ_LISTENER=tcp://127.0.0.1:28332
+export BAL_PUSHER_SEND_STATS=true 
+export WELIST_SERVER_URL=http://localhost:8085
+export BAL_SERVER_URL="http://127.0.0.1:9133"
+export SSL_KEY_PATH="$(pwd)/private_key.pem"
+cargo run --bin=bal-pusher regtest

bal-server.env

@@ -1,10 +1,11 @@
-RUST_LOG=trace
-BAL_SERVER_DB_FILE=/home/bal/bal.db
+RUST_LOG=info
+BAL_SERVER_DB_FILE="/home/bal/bal.db"
 BAL_SERVER_INFO="BAL server test willexecutor"
 BAL_SERVER_BIND_ADDRESS=127.0.0.1
 BAL_SERVER_BIND_PORT=9133
-BAL_SERVER_BITCOIN_ADDRESS="your bitcoin to recive payments here"
+BAL_SERVER_BITCOIN_ADDRESS="your bitcoin or xpub to recive payments here"
 BAL_SERVER_BITCOIN_FIXED_FEE=50000
+BAL_SERVER_PUB_KEY_PATH="/home/bal/public_key.pem"
 
 BAL_SERVER_REGTEST_ADDRESS="vpub5UhLrYG1qQjnJhvJgBdqgpznyH11mxW9hwBYxf3KhfdjiupCFPUVDvgwpeZ9Wj5YUJXjKjXjy7DSbJNBW1sXbKwARiaphm1UjHYy3mKvTG4"
 BAL_SERVER_REGTEST_FEE=5000

bal-server.sh

@@ -0,0 +1,24 @@
+WORKING_DIR=$(pwd)
+if [ ! -f "$WORKING_DIR/public_key.pem" ]; then
+  echo "creating keypairs"
+  openssl genpkey -algorithm ED25519 -out private_key.pem
+  openssl pkey -in private_key.pem -pubout -out public_key.pem
+fi
+
+export RUST_LOG="trace"
+export BAL_SERVER_DB_FILE="$WORKING_DIR/bal.db"
+export BAL_SERVER_INFO="BAL devel willexecutor server"
+export BAL_SERVER_BIND_ADDRESS="127.0.0.1"
+export BAL_SERVER_BIND_PORT=9133
+export BAL_SERVER_PUB_KEY_PATH="$WORKING_DIR/public_key.pem"
+
+#export BAL_SERVER_BITCOIN_ADDRESS="your bitcoin address or xpub to recive payments here"
+#export BAL_SERVER_BITCOIN_FIXED_FEE=50000
+
+export BAL_SERVER_REGTEST_ADDRESS="vpub5UhLrYG1qQjnJhvJgBdqgpznyH11mxW9hwBYxf3KhfdjiupCFPUVDvgwpeZ9Wj5YUJXjKjXjy7DSbJNBW1sXbKwARiaphm1UjHYy3mKvTG4"
+export BAL_SERVER_REGTEST_FEE=5000
+#export BAL_SERVER_TESTNET_ADDRESS=
+#export BAL_SERVER_TESTNET_FEE=100000
+#export BAL_SERVER_SIGNET_ADDRESS=
+#export BAL_SERVER_SIGNET_FEE=100000
+cargo run --bin=bal-server

src/bin/bal-pusher.rs

@@ -11,12 +11,12 @@ use serde::Deserialize;
 use serde_json::json;
 use std::env;
 use log::{info,warn,error,trace,debug};
-use zmq::{Context, Socket};
+use zmq::{Context, Socket, DEALER, DONTWAIT};
 use std::str;
 use std::{thread, time::Duration};
 use std::collections::HashMap;
-//use byteorder::{LittleEndian, ReadBytesExt};
-//use std::io::Cursor;
+use byteorder::{LittleEndian, ReadBytesExt};
+use std::io::Cursor;
 use hex;
 use std::error::Error as StdError;
 
@@ -24,14 +24,19 @@ use reqwest::Client as rClient;
 use openssl::hash::MessageDigest;
 use openssl::pkey::{PKey};
 use openssl::sign::Signer;
+use openssl::sign::Verifier;
 use base64::{engine::general_purpose, Engine as _};
 use std::fs;
+use std::time::Instant;
+
+
+
 
 
 
 
 const LOCKTIME_THRESHOLD:i64 = 5000000;
-const VERSION:&str = "0.0.1";
+const VERSION:&str = "0.0.2";
 #[derive(Debug, Clone,Serialize, Deserialize)]
 struct MyConfig {
     zmq_listener:   String,
@@ -327,7 +332,7 @@ async fn send_stats_report(cfg: &MyConfig, bcinfo: GetBlockchainInfoResult) -> R
                     }))
             .send().await?;
         let body = &(response.text().await?);
-        println!("Body: {}", body);
+        info!("Report to welist({})\tSent: {}", welist_url,body);
     }else {
         debug!("Not sending stats");
     }
@@ -339,16 +344,14 @@ fn sign_message(private_key_path: &str, message: &str) -> String {
     let key_data  = fs::read(private_key_path).unwrap();
 
     let private_key = PKey::private_key_from_pem(&key_data).unwrap();
+    let mut signer =  Signer::new_without_digest(&private_key).unwrap();
 
-    let mut signer = Signer::new(MessageDigest::sha256(), &private_key).unwrap();
+    let signature = signer.sign_oneshot_to_vec(message.as_bytes()).unwrap();
 
-    signer.update(message.as_bytes()).unwrap();
 
-    let firma = signer.sign_to_vec().unwrap();
+    let signature_b64 = general_purpose::STANDARD.encode(&signature);
 
-    let firma_b64 = general_purpose::STANDARD.encode(&firma);
-
-    firma_b64
+    signature_b64
 }
 
 fn parse_env(cfg: &mut MyConfig){
@@ -449,6 +452,74 @@ fn get_default_config()-> MyConfig {
     info!("Default configuration file path is: {:#?}", file);
     confy::load("bal-pusher",None).expect("cant_load")
 }
+
+fn check_zmq_connection(endpoint: &str) -> bool {
+    trace!("check zmq connection");
+    let context = Context::new();
+    let socket = match context.socket(DEALER) {
+        Ok(sock) => sock,
+        Err(_) => return false,
+    };
+    
+    if socket.connect(endpoint).is_err() {
+        return false;
+    }
+    
+    // Try to send an empty message non-blocking
+    socket.send("", DONTWAIT).is_ok()
+}
+
+// Add this struct to monitor connection health
+struct ConnectionMonitor {
+    last_message_time: Instant,
+    timeout: Duration,
+    consecutive_timeouts: u32,
+    max_consecutive_timeouts: u32,
+}
+
+impl ConnectionMonitor {
+    fn new(timeout_secs: u64, max_timeouts: u32) -> Self {
+        Self {
+            last_message_time: Instant::now(),
+            timeout: Duration::from_secs(timeout_secs),
+            consecutive_timeouts: 0,
+            max_consecutive_timeouts: max_timeouts,
+        }
+    }
+    
+    fn update(&mut self) {
+        self.last_message_time = Instant::now();
+        self.consecutive_timeouts = 0;
+    }
+    
+    fn check_connection(&mut self) -> ConnectionStatus {
+        let elapsed = self.last_message_time.elapsed();
+        
+        if elapsed > self.timeout {
+            self.consecutive_timeouts += 1;
+            
+            if self.consecutive_timeouts >= self.max_consecutive_timeouts {
+                ConnectionStatus::Lost(elapsed)
+            } else {
+                ConnectionStatus::Warning(elapsed)
+            }
+        } else {
+            ConnectionStatus::Healthy
+        }
+    }
+    
+    fn reset(&mut self) {
+        self.consecutive_timeouts = 0;
+        self.last_message_time = Instant::now();
+    }
+}
+
+enum ConnectionStatus {
+    Healthy,
+    Warning(Duration),
+    Lost(Duration),
+}
+
 #[tokio::main]
 async fn main()-> std::io::Result<()>{
     env_logger::init();
@@ -489,7 +560,6 @@ async fn main()-> std::io::Result<()>{
     info!("Network: {}",arg_network);
     let network_params = get_network_params(&cfg,network);
 
-
     let context = Context::new();
     let socket: Socket = context.socket(zmq::SUB).unwrap();
 
@@ -502,28 +572,28 @@ async fn main()-> std::io::Result<()>{
     let _ = main_result(&cfg,network_params).await;
     info!("waiting new blocks..");
     let mut last_seq:Vec<u8>=[0;4].to_vec();
+    let mut counter=0;
+    let max=100;
     loop {
         let message = socket.recv_multipart(0).unwrap();
         let topic = message[0].clone();
         let body = message[1].clone();
         let seq = message[2].clone();
-        if last_seq >= seq {
-            continue
-        }
         last_seq = seq;
-        //let mut sequence_str = "Unknown".to_string();
-        /*if seq.len()==4{
-            let mut rdr = Cursor::new(seq);
-            let sequence = rdr.read_u32::<LittleEndian>().expect("Failed to read integer");
-            sequence_str = sequence.to_string();
-        }*/
         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));  
-            //let cfg = cfg.clone();
             let _ = main_result(&cfg,network_params).await;
         }
         thread::sleep(Duration::from_millis(100)); // Sleep for 100ms
     }
 }
+fn seq_to_str(seq:&Vec<u8>) -> String{
+    if seq.len()==4{
+        let mut rdr = Cursor::new(seq);
+        let sequence = rdr.read_u32::<LittleEndian>().expect("Failed to read integer");
+        return sequence.to_string();
+    }
+    "Unknown".to_string()
+}

src/bin/bal-server.rs

@@ -11,6 +11,7 @@ use std::net::IpAddr;
 use std::env;
 
 //use std::time::{SystemTime,UNIX_EPOCH};
+use std::fs;
 use std::sync::{ Arc, Mutex, MutexGuard };
 //use std::net::SocketAddr;
 use std::collections::HashMap;
@@ -33,7 +34,7 @@ use crate::db::{ create_database, get_next_address_index, insert_xpub, save_new_
 #[path = "../xpub.rs"]
 mod xpub;
 use crate::xpub::new_address_from_xpub;
-const VERSION:&str="0.2.1";
+const VERSION:&str="0.2.2";
 const NETWORKS : [&str; 4]= ["bitcoin","testnet","signet","regtest"];
 #[derive(Debug, Clone,Serialize, Deserialize)]
 struct NetConfig {
@@ -48,26 +49,27 @@ struct NetConfig {
 impl NetConfig {
     fn default_network(name:String, network: Network) -> Self {
         NetConfig {
-            address: "".to_string(),
-            fixed_fee: 50000,
-            xpub: false,
+            address:    "".to_string(),
+            fixed_fee:  50000,
+            xpub:       false,
             name,
             network,
-            enabled: false,
+            enabled:    false,
         }
     }
 }
 
 #[derive(Debug, Serialize, Deserialize,Clone)]
 struct MyConfig {
-    regtest: NetConfig,
-    signet: NetConfig,
-    testnet: NetConfig,
-    mainnet: NetConfig,
-    info:   String,
-    bind_address: String,
-    bind_port: u16, // Changed to u16 for port numbers
-    db_file: String,
+    regtest:        NetConfig,
+    signet:         NetConfig,
+    testnet:        NetConfig,
+    mainnet:        NetConfig,
+    info:           String,
+    bind_address:   String,
+    bind_port:      u16, // Changed to u16 for port numbers
+    db_file:        String,
+    pub_key_path:    String,
 }
 
 #[derive(Debug,Serialize, Deserialize)]
@@ -83,14 +85,15 @@ pub struct Info {
 impl Default for MyConfig {
     fn default() -> Self {
         MyConfig {
-            regtest: NetConfig::default_network("regtest".to_string(), Network::Regtest),
-            signet: NetConfig::default_network("signet".to_string(), Network::Signet), 
-            testnet: NetConfig::default_network("testnet".to_string(), Network::Testnet),
-            mainnet: NetConfig::default_network("bitcoin".to_string(), Network::Bitcoin),
-            bind_address: "127.0.0.1".to_string(),
-            bind_port: 9137, 
-            db_file: "bal.db".to_string(),
-            info:"Will Executor Server".to_string()
+            regtest:        NetConfig::default_network("regtest".to_string(), Network::Regtest),
+            signet:         NetConfig::default_network("signet".to_string(), Network::Signet), 
+            testnet:        NetConfig::default_network("testnet".to_string(), Network::Testnet),
+            mainnet:        NetConfig::default_network("bitcoin".to_string(), Network::Bitcoin),
+            bind_address:   "127.0.0.1".to_string(),
+            bind_port:      9137, 
+            db_file:        "bal.db".to_string(),
+            info:           "Will Executor Server".to_string(),
+            pub_key_path:   "public_key.pem".to_string(),
         }
     }
 }
@@ -109,6 +112,18 @@ async fn echo_version(
 ) -> Result<Response<BoxBody<Bytes, hyper::Error>>, hyper::Error> {
     Ok(Response::new(full(VERSION)))
 }
+async fn echo_home(cfg: &MyConfig
+) -> Result<Response<BoxBody<Bytes, hyper::Error>>, hyper::Error> {
+    debug!("echo_home: {}", cfg.info );
+    Ok(Response::new(full(cfg.info.clone())))
+}
+async fn echo_pub_key(
+    cfg: &MyConfig,
+) -> Result<Response<BoxBody<Bytes, hyper::Error>>, hyper::Error> {
+    let pub_key = fs::read_to_string(&cfg.pub_key_path)
+        .expect(format!("Failed to read public key file {}",cfg.pub_key_path).as_str());
+    Ok(Response::new(full(pub_key)))
+}
 async fn echo_info(
                    param: &str,
                    cfg: &MyConfig,
@@ -441,6 +456,12 @@ async fn echo(
             if uri=="/version"{
                 ret= echo_version().await;
             }
+            if uri=="/.pub_key.pem" {
+                ret = echo_pub_key(cfg).await;
+            }
+            if uri=="/"{
+                ret = echo_home(cfg).await;
+            }
             ret
         }
 
@@ -480,6 +501,11 @@ fn parse_env(cfg: &Arc<Mutex<MyConfig>>){
         }
     }
     
+    if let Ok(value) = env::var("BAL_SERVER_PUB_KEY_PATH") {
+        debug!("BAL_SERVER_PUB_KEY_PATH: {}",value);
+        cfg_lock.pub_key_path = value;
+    }
+
 
     if let Ok(value) = env::var("BAL_SERVER_INFO"){
         debug!("BAL_SERVER_INFO: {}",value);