improve drivechain logging, release

Cargo.toml

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

app/gui/parent_chain/info.rs

@@ -18,8 +18,11 @@ impl Info {
         let mainchain_tip = app.runtime.block_on(async {
             let mainchain_tip_blockhash = dc.get_mainchain_tip().await?;
             dc.client
-                .getblock(&mainchain_tip_blockhash, None)
-                .map_err(bip300301::Error::Jsonrpsee)
+                .getblock(mainchain_tip_blockhash, None)
+                .map_err(|source| bip300301::Error::Jsonrpsee {
+                    source,
+                    main_addr: dc.main_addr,
+                })
                 .await
         })?;
         let sidechain_wealth = app.node.get_sidechain_wealth()?;

lib/miner.rs

@@ -41,11 +41,12 @@ impl Miner {
     }
 
     pub async fn generate(&self) -> Result<(), Error> {
-        self.drivechain
-            .client
-            .generate(1)
-            .await
-            .map_err(bip300301::Error::from)?;
+        self.drivechain.client.generate(1).await.map_err(|source| {
+            bip300301::Error::Jsonrpsee {
+                source,
+                main_addr: self.drivechain.main_addr,
+            }
+        })?;
         Ok(())
     }
 
@@ -72,7 +73,10 @@ impl Miner {
                 prev_bytes,
             )
             .await
-            .map_err(bip300301::Error::from)?;
+            .map_err(|source| bip300301::Error::Jsonrpsee {
+                source,
+                main_addr: self.drivechain.main_addr,
+            })?;
         let txid = value["txid"]["txid"]
             .as_str()
             .map(|s| s.to_owned())
@@ -93,9 +97,9 @@ impl Miner {
             let block_hash = header.hash().into();
             tracing::trace!(%block_hash, "verifying bmm...");
             self.drivechain
-                .verify_bmm(
-                    &header.prev_main_hash,
-                    &block_hash,
+                .verify_bmm_next_block(
+                    header.prev_main_hash,
+                    block_hash,
                     VERIFY_BMM_POLL_INTERVAL,
                 )
                 .await?;

lib/node/mainchain_task.rs

@@ -111,30 +111,18 @@ impl MainchainTask {
         drivechain: &bip300301::Drivechain,
         block_hash: BlockHash,
     ) -> Result<bool, Error> {
-        use jsonrpsee::types::error::ErrorCode as JsonrpseeErrorCode;
         const VERIFY_BMM_POLL_INTERVAL: Duration = Duration::from_secs(15);
         let header = {
             let rotxn = env.read_txn()?;
             archive.get_header(&rotxn, block_hash)?
         };
-        let res = match drivechain
-            .verify_bmm(
-                &header.prev_main_hash,
-                &block_hash.into(),
+        let (res, _next_block_hash) = drivechain
+            .verify_bmm_next_block(
+                header.prev_main_hash,
+                block_hash.into(),
                 VERIFY_BMM_POLL_INTERVAL,
             )
-            .await
-        {
-            Ok(()) => true,
-            Err(bip300301::Error::Jsonrpsee(jsonrpsee::core::Error::Call(
-                err,
-            ))) if JsonrpseeErrorCode::from(err.code())
-                == JsonrpseeErrorCode::ServerError(-1) =>
-            {
-                false
-            }
-            Err(err) => return Err(Error::from(err)),
-        };
+            .await?;
         let mut rwtxn = env.write_txn()?;
         let () = archive.put_bmm_verification(&mut rwtxn, block_hash, res)?;
         rwtxn.commit()?;

lib/node/mod.rs

@@ -217,12 +217,12 @@ impl Node {
         &self,
     ) -> Result<bitcoin::BlockHash, Error> {
         use bip300301::MainClient;
-        let res = self
-            .drivechain
-            .client
-            .getbestblockhash()
-            .await
-            .map_err(bip300301::Error::Jsonrpsee)?;
+        let res = self.drivechain.client.getbestblockhash().await.map_err(
+            |source| bip300301::Error::Jsonrpsee {
+                source,
+                main_addr: self.drivechain.main_addr,
+            },
+        )?;
         Ok(res)
     }