dummy commit

Author: Wukong247

src/bin/taker.rs

@@ -8,7 +8,7 @@ use coinswap::{
 };
 use log::LevelFilter;
 use serde_json::{json, to_string_pretty};
-use std::{path::PathBuf, str::FromStr};
+use std::{path::PathBuf, str::FromStr, thread, time::Duration};
 
 #[cfg(feature = "integration-test")]
 use coinswap::taker::TakerBehavior;
@@ -35,7 +35,7 @@ struct Cli {
         name = "ADDRESS:PORT",
         long,
         short = 'r',
-        default_value = "127.0.0.1:38332"
+        default_value = "172.81.178.3:48332"
     )]
     pub rpc: String,
 
@@ -44,7 +44,7 @@ struct Cli {
         name = "ZMQ",
         long,
         short = 'z',
-        default_value = "tcp://127.0.0.1:28332"
+        default_value = "tcp://172.81.178.3:58332"
     )]
     pub zmq: String,
 
@@ -178,7 +178,7 @@ fn main() -> Result<(), TakerError> {
     let rpc_config = RPCConfig {
         url: args.rpc,
         auth: Auth::UserPass(args.auth.0, args.auth.1),
-        wallet_name: "random".to_string(), // we can put anything here as it will get updated in the init.
+        wallet_name: "random_1".to_string(), // we can put anything here as it will get updated in the init.
     };
 
     match &args.command {
@@ -332,7 +332,10 @@ fn main() -> Result<(), TakerError> {
 
                     taker.get_wallet_mut().sync_and_save()?;
                 }
-                Commands::FetchOffers => {
+                Commands::FetchOffers => loop {
+                    // println!("I am here");
+                    // let makers=  taker.watch_service.request_maker_address();
+                    // println!("{makers:#?}");
                     let all_offers = {
                         let offerbook = taker.fetch_offers()?;
                         offerbook
@@ -343,15 +346,15 @@ fn main() -> Result<(), TakerError> {
                             .collect::<Vec<_>>()
                     };
                     if all_offers.is_empty() {
-                        println!("NO LIVE OFFERS FOUND!! You should run a maker!!");
-                        return Ok(());
+                        // println!("NO LIVE OFFERS FOUND!! You should run a maker!!");
+                        thread::sleep(Duration::from_secs(5));
                     } else {
                         all_offers.iter().try_for_each(|offer| {
                             println!("{}", taker.display_offer(offer)?);
                             Ok::<_, TakerError>(())
                         })?;
                     }
-                }
+                },
                 Commands::Coinswap { makers, amount } => {
                     // Note: taproot coinswap is handled at the top level to avoid
                     // double Taker initialization. Regular ECDSA coinswap goes here.

src/taker/api.rs

@@ -171,7 +171,8 @@ pub struct Taker {
     ongoing_swap_state: OngoingSwapState,
     #[cfg(feature = "integration-test")]
     behavior: TakerBehavior,
-    watch_service: WatchService,
+    /// iyiib
+    pub watch_service: WatchService,
     offer_sync_handle: OfferSyncHandle,
 }
 
@@ -274,7 +275,7 @@ impl Taker {
         )
         .start_legacy();
 
-        wallet.sync_and_save()?;
+        // wallet.sync_and_save()?;
 
         Ok(Self {
             wallet,

src/taker/offers.rs

@@ -46,7 +46,7 @@ use crate::{
 use super::error::TakerError;
 
 #[cfg(not(feature = "integration-test"))]
-const OFFER_SYNC_INTERVAL: Duration = Duration::from_secs(30 * 60);
+const OFFER_SYNC_INTERVAL: Duration = Duration::from_secs(10 * 60);
 
 #[cfg(feature = "integration-test")]
 const OFFER_SYNC_INTERVAL: Duration = Duration::from_secs(2);
@@ -255,10 +255,9 @@ impl OfferSyncService {
     where
         F: FnOnce(Vec<MakerAddress>, u16) -> Result<Vec<OfferAndAddress>, TakerError>,
     {
-        self.watch_service.request_maker_address();
-
+        
         let Some(WatcherEvent::MakerAddresses { maker_addresses }) =
-            self.watch_service.wait_for_event()
+            self.watch_service.request_maker_address()
         else {
             return Ok(());
         };

src/watch_tower/rpc_backend.rs

@@ -1,7 +1,7 @@
 //! Watchtower RPC backend: querying bitcoind, scanning mempool, and running discovery.
 
 use std::{
-    sync::{Arc, Mutex},
+    sync::{Arc, Mutex, atomic::{AtomicU64, Ordering}},
     thread,
     time::Duration,
 };
@@ -90,6 +90,7 @@ impl BitcoinRpc {
     /// Discovers maker fidelity bonds by scanning historical blocks.
     pub fn run_discovery(self, registry: FileRegistry) -> Result<(), WatcherError> {
         log::info!("Starting with market discovery");
+        let scanned_blocks = Arc::new(AtomicU64::new(0));
 
         let blockchain_info = self.get_blockchain_info()?;
         let block_hash = blockchain_info.best_block_hash;
@@ -117,6 +118,7 @@ impl BitcoinRpc {
         let mut handles = Vec::with_capacity(threads);
 
         for thread_id in 0..threads {
+            let scanned_blocks = Arc::clone(&scanned_blocks);
             let registry = Arc::clone(&registry);
             let this = Arc::clone(&this);
 
@@ -147,13 +149,25 @@ impl BitcoinRpc {
                         }
                     };
 
+                    let prev = scanned_blocks.fetch_add(1, Ordering::Relaxed) + 1;
+
+                    if prev % 100 == 0 {
+                        log::info!(
+                            "Market discovery progress: scanned {} blocks (tip={}, cutoff_height~{})",
+                            prev,
+                            tip_height,
+                            lowest_scanned,
+                        );
+                    }
+
                     if block.header.time < cutoff_time as u32 {
                         break;
                     }
 
                     for tx in block.txdata {
                         if let Some(fidelity_announcement) = process_fidelity(&tx) {
                             local_found += 1;
+                            log::info!("Fidelity found: {fidelity_announcement:#?}");
                             registry
                                 .lock()
                                 .unwrap()
@@ -186,11 +200,15 @@ impl BitcoinRpc {
             });
         }
 
+        let total_scanned = scanned_blocks.load(Ordering::Relaxed);
+
         log::info!(
-            "Market discovery completed: scanned shards up to cutoff, found {} makers",
+            "Market discovery completed: scanned {} blocks, found {} makers",
+            total_scanned,
             makers_found
         );
 
+
         Ok(())
     }
 }

src/watch_tower/service.rs

@@ -52,8 +52,9 @@ impl WatchService {
     }
 
     /// Requests the list of maker addresses.
-    pub fn request_maker_address(&self) {
+    pub fn request_maker_address(&self) -> Option<WatcherEvent> {
         _ = self.tx.send(WatcherCommand::MakerAddress);
+        self.rx.lock().ok()?.recv().ok()
     }
 
     /// Signals the watcher to shut down gracefully.

src/watch_tower/watcher.rs

@@ -193,10 +193,10 @@ impl<R: Role> Watcher<R> {
             }
             BackendEvent::BlockConnected(b) => {
                 if let Ok(block) = deserialize::<Block>(&b.hash) {
-                    self.registry.save_checkpoint(Checkpoint {
-                        height: block.bip34_block_height().unwrap(),
-                        hash: block.block_hash(),
-                    });
+                    // self.registry.save_checkpoint(Checkpoint {
+                    //     height: block.bip34_block_height().unwrap(),
+                    //     hash: block.block_hash(),
+                    // });
                     process_block(block, &mut self.registry);
                 }
             }