Reorgs, bump version number for release

Author: Ash-L2L

Cargo.lock

@@ -13,11 +13,11 @@ authors = [
     "Nikita Chashchinskii <nikita.chashchinskii@gmail.com>"
 ]
 edition = "2021"
-version = "0.7.0"
+version = "0.8.0"
 
 [workspace.dependencies.bip300301]
 git = "https://github.com/Ash-L2L/bip300301.git"
-rev = "43ba4d7bee075ecd2504f87b5ec2a5ba3b10cd3b"
+rev = "d1da609b4c77d2b53bea2c8e922891b83612a03b"
 
 
 [profile.release]

Cargo.toml

@@ -34,6 +34,7 @@ thunder_app_cli = { path = "../cli" }
 thunder_app_rpc_api = { path = "../rpc-api" }
 tiny-bip39 = "1.0.0"
 tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
+tokio-util = { version = "0.7.10", features = ["rt"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 

app/Cargo.toml

@@ -11,6 +11,7 @@ use thunder::{
     wallet::{self, Wallet},
 };
 use tokio::sync::RwLock as TokioRwLock;
+use tokio_util::task::LocalPoolHandle;
 
 use crate::cli::Config;
 
@@ -40,6 +41,7 @@ pub struct App {
     pub utxos: Arc<RwLock<HashMap<OutPoint, Output>>>,
     pub transaction: Arc<RwLock<Transaction>>,
     pub runtime: Arc<tokio::runtime::Runtime>,
+    pub local_pool: LocalPoolHandle,
 }
 
 impl App {
@@ -61,12 +63,14 @@ impl App {
             &config.main_password,
         )?;
         let rt_guard = runtime.enter();
+        let local_pool = LocalPoolHandle::new(1);
         let node = Node::new(
             &config.datadir,
             config.net_addr,
             config.main_addr,
             &config.main_user,
             &config.main_password,
+            local_pool.clone(),
         )?;
         drop(rt_guard);
         let utxos = {
@@ -90,6 +94,7 @@ impl App {
                 outputs: vec![],
             })),
             runtime: Arc::new(runtime),
+            local_pool,
         })
     }
 

app/app.rs

@@ -1,6 +1,10 @@
 use eframe::egui;
 use human_size::{Byte, Kibibyte, Mebibyte, SpecificSize};
-use thunder::{bip300301::bitcoin, state::State, types::GetValue};
+use thunder::{
+    bip300301::bitcoin,
+    state::State,
+    types::{Body, GetValue, Header},
+};
 
 use crate::app::App;
 
@@ -15,8 +19,17 @@ impl BlockExplorer {
 
     pub fn show(&mut self, app: &mut App, ui: &mut egui::Ui) {
         let max_height = app.node.get_height().unwrap_or(0);
-        let header = app.node.get_header(self.height).ok().flatten();
-        let body = app.node.get_body(self.height).ok().flatten();
+        let block: Option<(Header, Body)> = {
+            if let Ok(Some(block_hash)) =
+                app.node.try_get_block_hash(self.height)
+                && let Ok(header) = app.node.get_header(block_hash)
+                && let Ok(body) = app.node.get_body(block_hash)
+            {
+                Some((header, body))
+            } else {
+                None
+            }
+        };
         egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("Block");
             ui.horizontal(|ui| {
@@ -31,7 +44,7 @@ impl BlockExplorer {
                     self.height = max_height;
                 }
             });
-            if let (Some(header), Some(body)) = (header, body) {
+            if let Some((header, body)) = block {
                 let hash = &format!("{}", header.hash());
                 let merkle_root = &format!("{}", header.merkle_root);
                 let prev_side_hash = &format!("{}", header.prev_side_hash);

app/gui/block_explorer.rs

@@ -35,10 +35,10 @@ impl Miner {
             .clicked()
         {
             self.running.store(true, atomic::Ordering::SeqCst);
-            app.runtime.spawn({
+            app.local_pool.spawn_pinned({
                 let app = app.clone();
                 let running = self.running.clone();
-                async move {
+                || async move {
                     tracing::debug!("Mining...");
                     let mining_result = app.mine(None).await;
                     running.store(false, atomic::Ordering::SeqCst);

app/gui/miner.rs

@@ -1,3 +1,5 @@
+#![feature(let_chains)]
+
 use std::sync::mpsc;
 
 use clap::Parser as _;

app/main.rs

@@ -87,7 +87,10 @@ impl RpcServer for RpcServerImpl {
 
     async fn mine(&self, fee: Option<u64>) -> RpcResult<()> {
         let fee = fee.map(bip300301::bitcoin::Amount::from_sat);
-        self.app.mine(fee).await.map_err(convert_app_err)
+        self.app.local_pool.spawn_pinned({
+            let app = self.app.clone();
+            move || async move { app.mine(fee).await.map_err(convert_app_err) }
+        }).await.unwrap()
     }
 
     async fn remove_from_mempool(&self, txid: Txid) -> RpcResult<()> {

app/rpc_server.rs

@@ -15,6 +15,7 @@ byteorder = "1.4.3"
 bytes = "1.4.0"
 ed25519-dalek = { version = "2.1.1", features = ["batch", "serde"] }
 ed25519-dalek-bip32 = "0.3.0"
+fallible-iterator = "0.3.0"
 futures = "0.3.30"
 heed = { git = "https://github.com/meilisearch/heed", tag = "v0.12.4", version = "0.12.4" }
 hex = { version = "0.4.3", features = ["serde"] }
@@ -31,6 +32,7 @@ thiserror = "1.0.44"
 tiny-bip39 = "1.0.0"
 tokio = { version = "1.29.1", features = ["sync"] }
 tokio-stream = "0.1.15"
+tokio-util = { version = "0.7.10", features = ["rt"] }
 tracing = "0.1.40"
 
 [lib]