nakamoto: sync and wait to sync

Based on ElementsProject/lightning#6181 feature to allow sync nakamoto. Link: #54 Signed-off-by: Vincenzo Palazzo <[email protected]>
coffee-tools · Dec 28, 2023 · 0994c62 · 0994c62
1 parent 6b20af4
commit 0994c62
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 38 deletions.
diff --git a/folgore-nakamoto/src/lib.rs b/folgore-nakamoto/src/lib.rs
@@ -6,8 +6,6 @@ use std::net::TcpStream;
 use std::sync::Mutex;
 use std::thread::JoinHandle;
 
-use folgore_common::stragegy::RecoveryStrategy;
-use folgore_esplora::Esplora;
 use nakamoto_client::handle::Handle;
 use nakamoto_common::bitcoin::consensus::{deserialize, serialize};
 use nakamoto_common::bitcoin_hashes::hex::ToHex;
@@ -20,8 +18,10 @@ use folgore_common::cln::json_utils;
 use folgore_common::cln::plugin::error;
 use folgore_common::cln::plugin::errors::PluginError;
 use folgore_common::cln::plugin::plugin::Plugin;
-use folgore_common::cln::plugin::types::LogLevel;
+use folgore_common::prelude::cln_plugin::types::LogLevel;
+use folgore_common::stragegy::RecoveryStrategy;
 use folgore_common::utils::{bitcoin_hashes, hex};
+use folgore_esplora::Esplora;
 
 pub use nakamoto_client::Config;
 pub use nakamoto_client::{Client, Error, Event, Network};
@@ -109,40 +109,34 @@ impl<T: Clone, R: RecoveryStrategy> FolgoreBackend<T> for Nakamoto<R> {
         plugin: &mut Plugin<T>,
         known_height: Option<u64>,
     ) -> Result<Value, PluginError> {
-        match self.handler.get_tip() {
-            Ok((mut height, ..)) => {
-                let mut is_sync = true;
-                if Some(height) <= known_height {
-                    while let Err(err) = self
-                        .handler
-                        .wait_for_height(known_height.ok_or(error!("known height not found"))?)
-                    {
-                        plugin.log(LogLevel::Info, &format!("Waiting for block {height}...."));
-                        plugin.log(
-                            LogLevel::Debug,
-                            &format!("while waiting the block we get an error {err}"),
-                        )
-                    }
-                    height = known_height.ok_or(error!("known height not found"))?;
-                } else {
-                    is_sync = false;
-                }
-                let mut resp = json_utils::init_payload();
-                let height: i64 = height.try_into().map_err(|err| error!("{err}"))?;
-                json_utils::add_number(&mut resp, "headercount", height);
-                json_utils::add_number(&mut resp, "blockcount", height);
-                let network = match self.network {
-                    Network::Mainnet => "main",
-                    Network::Testnet => "test",
-                    Network::Regtest => "regtest",
-                    Network::Signet => "signet",
-                };
-                json_utils::add_str(&mut resp, "chain", network);
-                json_utils::add_bool(&mut resp, "ibd", is_sync);
-                Ok(resp)
+        let (mut height, ..) = self.handler.get_tip().map_err(|err| error!("{err}"))?;
+        let syncing = if let Some(known_height) = known_height {
+            // Wait to sync :)
+            plugin.log(
+                LogLevel::Debug,
+                "nakamoto is out of sync, so we syncing it. It will take a time",
+            );
+            while known_height > height {
+                let (new_height, ..) = self.handler.get_tip().map_err(|err| error!("{err}"))?;
+                height = new_height;
             }
-            Err(err) => Err(error!("{err}")),
-        }
+            known_height > height
+        } else {
+            false
+        };
+        let mut resp = json_utils::init_payload();
+        let height: i64 = height.try_into().map_err(|err| error!("{err}"))?;
+        json_utils::add_number(&mut resp, "headercount", height);
+        json_utils::add_number(&mut resp, "blockcount", height);
+        let network = match self.network {
+            Network::Mainnet => "main",
+            Network::Testnet => "test",
+            Network::Regtest => "regtest",
+            Network::Signet => "signet",
+        };
+        json_utils::add_str(&mut resp, "chain", network);
+        json_utils::add_bool(&mut resp, "ibd", syncing);
+        Ok(resp)
     }
 
     // FIXME: we can use the neutrino API here that it is just a json

diff --git a/folgore-plugin/src/model.rs b/folgore-plugin/src/model.rs
@@ -20,5 +20,5 @@ pub(crate) struct SendRawTx {
 
 #[derive(Deserialize, Serialize)]
 pub(crate) struct GetChainInfo {
-    pub(crate) height: Option<u64>,
+    pub(crate) last_height: Option<u64>,
 }
diff --git a/folgore-plugin/src/plugin.rs b/folgore-plugin/src/plugin.rs
@@ -230,7 +230,7 @@ fn get_chain_info(plugin: &mut Plugin<PluginState>, request: Value) -> Result<Va
 
     let mut result: Result<Value, PluginError> = Err(error!("result undefined"));
     for client in [client, fallback] {
-        result = client.sync_chain_info(plugin, request.height.clone());
+        result = client.sync_chain_info(plugin, request.last_height.clone());
         let Ok(ref result) = result else {
             plugin.log(
                 LogLevel::Warn,