fixup! wip: implement basic method with nakamoto

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>

Author: vincenzopalazzo

Cargo.lock

@@ -27,7 +27,7 @@ nonblocking_shutdown = []
 [dependencies]
 # For managing transactions (it re-exports the bitcoin crate)
 miniscript = { version = "11.0", features = ["serde", "compiler", "base64"] }
-nakamoto = { git = "https://github.com/cloudhead/nakamoto.git", features = ["nakamoto-client", "nakamoto-net-poll"]  }
+nakamoto = { git = "https://github.com/vincenzopalazzo/nakamoto.git", branch = "macros/master", features = ["nakamoto-client", "nakamoto-net-poll"]  }
 
 # Coin selection algorithms for spend transaction creation.
 bdk_coin_select = { version = "0.1.0" }

Cargo.toml

@@ -20,7 +20,7 @@ log_level = "debug"
 #
 # YOUR DESCRIPTOR IS UNIQUE AND MUST BE BACKED UP, WITHOUT IT YOU WONT BE ABLE TO RECOVER YOUR FUNDS.
 #
-main_descriptor = "wsh(or_d(pk([92162c45]tpubD6NzVbkrYhZ4WzTf9SsD6h7AH7oQEippXK2KP8qvhMMqFoNeN5YFVi7vRyeRSDGtgd2bPyMxUNmHui8t5yCgszxPPxMafu1VVzDpg9aruYW/<0;1>/*),and_v(v:pkh(tpubD6NzVbkrYhZ4Wdgu2yfdmrce5g4fiH1ZLmKhewsnNKupbi4sxjH1ZVAorkBLWSkhsjhg8kiq8C4BrBjMy3SjAKDyDdbuvUa1ToAHbiR98js/<0;1>/*),older(2))))#uact7s3g"
+#main_descriptor = "wsh(or_d(pk([92162c45]tpubD6NzVbkrYhZ4WzTf9SsD6h7AH7oQEippXK2KP8qvhMMqFoNeN5YFVi7vRyeRSDGtgd2bPyMxUNmHui8t5yCgszxPPxMafu1VVzDpg9aruYW/<0;1>/*),and_v(v:pkh(tpubD6NzVbkrYhZ4Wdgu2yfdmrce5g4fiH1ZLmKhewsnNKupbi4sxjH1ZVAorkBLWSkhsjhg8kiq8C4BrBjMy3SjAKDyDdbuvUa1ToAHbiR98js/<0;1>/*),older(2))))#uact7s3g"
 
 # This section is the configuration related to the Bitcoin backend.
 # On what network shall it operate?
@@ -35,6 +35,6 @@ poll_interval_secs = 30
 # how to authenticate, either by specifying the cookie location with "cookie_path" or otherwise
 # passing a colon-separated user and password with "auth".
 [bitcoind_config]
-addr = "127.0.0.1:18332"
-cookie_path = "/home/wizardsardine/.bitcoin/testnet3/.cookie"
-# auth = "my_user:my_password"
+addr = "192.168.178.30:18332"
+#cookie_path = "/home/wizardsardine/.bitcoin/testnet3/.cookie"
+auth = "vincent:vincent-home-pi"

contrib/lianad_config_example.toml

@@ -70,7 +70,7 @@ fn main() {
         process::exit(1);
     });
 
-    let daemon = DaemonHandle::start_default(config).unwrap_or_else(|e| {
+    let daemon = DaemonHandle::start_nakamoto(config).unwrap_or_else(|e| {
         log::error!("Error starting Liana daemon: {}", e);
         process::exit(1);
     });

src/bin/daemon.rs

@@ -3,8 +3,9 @@
 //! We use the RPC interface and a watchonly descriptor wallet.
 
 // FIXME(vincenzopalazzo): move this outside of the bitcoind crate
-mod nakamoto;
+pub(crate) mod nakamoto;
 mod utils;
+
 use crate::{
     bitcoin::{Block, BlockChainTip},
     config,
@@ -154,7 +155,8 @@ impl std::fmt::Display for BitcoindError {
                     f,
                     "Trying to rescan the block chain past the prune block height."
                 )
-            }
+            },
+            BitcoindError::GenericError => write!(f, "Generic error"),
         }
     }
 }

src/bitcoin/d/mod.rs

@@ -11,38 +11,41 @@ use nakamoto::client;
 use nakamoto::common::bitcoin_hashes::hex::FromHex;
 use nakamoto::net::poll::{Waker, Reactor};
 use miniscript::bitcoin::hashes::Hash;
-use miniscript::bitcoin::{self, BlockHash};
+use miniscript::bitcoin;
 
 use crate::BitcoindError;
 use crate::bitcoin::BitcoinInterface;
 
+use super::SyncProgress;
+
 /// Nakamoto client
 pub struct Nakamoto {
     /// Nakamoto handler used interact with the client.
     handler: client::Handle<Waker>,
     /// Nakamoto main worked to avoid leave a pending project.
-    worker: JoinHandle<Result<(), client::Error>>
-    network: client::Network,
+    _worker: JoinHandle<Result<(), client::Error>>,
+    _network: client::Network,
 }
 
 impl Nakamoto {
     /// Create a new instance of nakamoto.
     pub fn new(network: &bitcoin::Network, connect: &[net::SocketAddr], data_dir: PathBuf) -> Result<Self, ()> {
-        let network = client::Network::from_str(&network.to_string()).map_err(|err| ())?;
+        let network = client::Network::from_str(&network.to_string()).map_err(|_| ())?;
         let mut config = client::Config::new(network);
         config.root = data_dir;
         config.connect = connect.to_vec();
         config.user_agent = "Liana-Nakamoto-v1";
         let client = client::Client::<Reactor<net::TcpStream>>::new().unwrap();
         let handler = client.handle();
         let worker = std::thread::spawn(|| client.run(config));
-        Ok(Self{ handler, worker, network })
+        Ok(Self{ handler, _worker: worker, _network: network })
     }
 
     /// Stop the nakamoto node
-    pub fn stop(&self) -> Result<(), BitcoindError> {
-        self.handler.shutdown();
-        self.worker.join().map_err(|err| BitcoindError::GenericError)?;
+    #[allow(dead_code)]
+    pub fn stop(self) -> Result<(), BitcoindError> {
+        self.handler.shutdown().map_err(|_| BitcoindError::GenericError)?;
+        let _ = self._worker.join().map_err(|_| BitcoindError::GenericError)?;
         Ok(())
     }
 }
@@ -72,15 +75,15 @@ impl BitcoinInterface for Nakamoto {
     }
 
     fn common_ancestor(&self, tip: &crate::bitcoin::BlockChainTip) -> Option<crate::bitcoin::BlockChainTip> {
-        todo!()
+        None
     }
 
     fn is_in_chain(&self, tip: &crate::bitcoin::BlockChainTip) -> bool {
-        unimplemented!()
+        true
     }
 
     fn block_before_date(&self, timestamp: u32) -> Option<crate::bitcoin::BlockChainTip> {
-        unimplemented!()
+        None
     }
 
     fn confirmed_coins(
@@ -123,7 +126,7 @@ impl BitcoinInterface for Nakamoto {
         desc: &crate::descriptors::LianaDescriptor,
         timestamp: u32,
     ) -> Result<(), String> {
-        // We do not care for the momenet, because we are tracking with nakamoto
+        // We do not care for the moment, because we are tracking with nakamoto
         // all the transactions submitted
         Ok(())
     }
@@ -158,7 +161,8 @@ impl BitcoinInterface for Nakamoto {
     }
 
     fn sync_progress(&self) -> super::SyncProgress {
-        unimplemented!()
+        // FIXME: call tip and try to simulate the bitcoin intergace
+        SyncProgress::new(100.0, 0, 0)
     }
 
     fn tip_time(&self) -> Option<u32> {