Improve mainchain reorg and IBD, bump version for release

Cargo.toml

@@ -13,11 +13,11 @@ authors = [
     "Nikita Chashchinskii <[email protected]>"
 ]
 edition = "2021"
-version = "0.8.14"
+version = "0.9.0"
 
 [workspace.dependencies.bip300301]
 git = "https://github.com/Ash-L2L/bip300301.git"
-rev = "b74c5bbf6022701cbdfbd9a412327577e115ceda"
+rev = "eb0b8e41dbe1dd8eb397aa5bfb3b793b46cafc30"
 
 [workspace.dependencies.rustreexo]
 git = "https://github.com/Ash-L2L/rustreexo.git"

app/Cargo.toml

@@ -39,7 +39,7 @@ tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"] }
 tokio-util = { version = "0.7.10", features = ["rt"] }
 tracing = "0.1.40"
 tracing-appender = "0.2.3"
-tracing-subscriber = "0.3.18"
+tracing-subscriber = { version = "0.3.18", features = ["json"] }
 utoipa = "4.2.3"
 
 [[bin]]

app/app.rs

@@ -181,9 +181,14 @@ impl App {
             .await?;
         // miner_write.generate().await?;
         tracing::trace!("confirming bmm...");
-        if let Some((header, body)) = miner_write.confirm_bmm().await? {
-            tracing::trace!("confirmed bmm, submitting block");
-            self.node.submit_block(&header, &body).await?;
+        if let Some((main_hash, header, body)) =
+            miner_write.confirm_bmm().await?
+        {
+            tracing::trace!(
+                "confirmed bmm, submitting block {}",
+                header.hash()
+            );
+            self.node.submit_block(main_hash, &header, &body).await?;
         }
         drop(miner_write);
         self.update_wallet()?;