From 31873bdda9284d97220519c2bf76487e384eebed Mon Sep 17 00:00:00 2001 From: cygnet Date: Thu, 22 Oct 2026 22:34:01 +0200 Subject: [PATCH 1/2] refactor: drop BlindbitClient from the public interface Instead of exposing both a BlindbitBackend and a BlindbitClient, only expose the backend. Add extra functions (e.g. chain_height) to BlindbitBackend, which internally calls the client and forwards the result. --- backends/blindbit-v1/src/backend.rs | 8 +++++--- backends/blindbit-v1/src/lib.rs | 1 - scanners/local/examples/simple_scanner.rs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backends/blindbit-v1/src/backend.rs b/backends/blindbit-v1/src/backend.rs index 026f100d..3ec99061 100644 --- a/backends/blindbit-v1/src/backend.rs +++ b/backends/blindbit-v1/src/backend.rs @@ -9,7 +9,7 @@ use bitcoin::{Amount, BlockHash, OutPoint}; use futures::{Stream, StreamExt as _, stream}; use spdk_core::chain::{BoxedBlockData, ChainBackend, SpentIndexData, UtxoData}; -use crate::BlindbitClient; +use crate::client::BlindbitClient; use crate::structs::BlindbitV1BlockData; use crate::utils::input_hashes_map; @@ -21,8 +21,10 @@ pub struct BlindbitBackend { } impl BlindbitBackend { - pub const fn new(client: BlindbitClient) -> Self { - Self { client } + pub fn new(host_url: &str) -> Result { + Ok(Self { + client: BlindbitClient::new(host_url)?, + }) } } diff --git a/backends/blindbit-v1/src/lib.rs b/backends/blindbit-v1/src/lib.rs index 08699723..245bfbb8 100644 --- a/backends/blindbit-v1/src/lib.rs +++ b/backends/blindbit-v1/src/lib.rs @@ -5,4 +5,3 @@ pub mod structs; pub mod utils; pub use backend::BlindbitBackend; -pub use client::BlindbitClient; diff --git a/scanners/local/examples/simple_scanner.rs b/scanners/local/examples/simple_scanner.rs index 9c55105e..905edb52 100644 --- a/scanners/local/examples/simple_scanner.rs +++ b/scanners/local/examples/simple_scanner.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::atomic::AtomicBool; -use backend_blindbit_v1::{BlindbitBackend, BlindbitClient}; +use backend_blindbit_v1::BlindbitBackend; use bitcoin::absolute::Height; use bitcoin::secp256k1::SecretKey; use bitcoin::{Amount, BlockHash, Network, OutPoint}; @@ -40,7 +40,7 @@ async fn main() -> Result<(), Box> { let scan_sk = SecretKey::from_slice(&SCAN_SK_BYTES)?; let spend_sk = SecretKey::from_slice(&SPEND_SK_BYTES)?; - let backend = BlindbitBackend::new(BlindbitClient::new(BLINDBIT_BACKEND_URL)?); + let backend = BlindbitBackend::new(BLINDBIT_BACKEND_URL)?; let client = SpClient::new(scan_sk, SpendKey::Secret(spend_sk), NETWORK)?; let sp_receiver = client.receiver(); From 4a1f35d69cf14d37c066c5f633c40cbb2789393c Mon Sep 17 00:00:00 2001 From: cygnet Date: Thu, 22 Oct 2026 22:35:38 +0200 Subject: [PATCH 2/2] feat: add info, block_height, forward_tx endpoints to backend struct --- backends/blindbit-v1/src/backend.rs | 15 ++++++++++++++- backends/blindbit-v1/src/lib.rs | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/backends/blindbit-v1/src/backend.rs b/backends/blindbit-v1/src/backend.rs index 3ec99061..d919cffb 100644 --- a/backends/blindbit-v1/src/backend.rs +++ b/backends/blindbit-v1/src/backend.rs @@ -5,10 +5,11 @@ use std::pin::Pin; use anyhow::{Result, bail}; use async_trait::async_trait; use bitcoin::absolute::Height; -use bitcoin::{Amount, BlockHash, OutPoint}; +use bitcoin::{Amount, BlockHash, OutPoint, Txid}; use futures::{Stream, StreamExt as _, stream}; use spdk_core::chain::{BoxedBlockData, ChainBackend, SpentIndexData, UtxoData}; +use crate::BackendInfo; use crate::client::BlindbitClient; use crate::structs::BlindbitV1BlockData; use crate::utils::input_hashes_map; @@ -26,6 +27,18 @@ impl BlindbitBackend { client: BlindbitClient::new(host_url)?, }) } + + pub async fn info(&self) -> Result { + self.client.info().await + } + + pub async fn block_height(&self) -> Result { + self.client.block_height().await + } + + pub async fn forward_tx(&self, tx_hex: String) -> Result { + self.client.forward_tx(tx_hex).await + } } #[async_trait] diff --git a/backends/blindbit-v1/src/lib.rs b/backends/blindbit-v1/src/lib.rs index 245bfbb8..4163fb86 100644 --- a/backends/blindbit-v1/src/lib.rs +++ b/backends/blindbit-v1/src/lib.rs @@ -4,4 +4,5 @@ mod client; pub mod structs; pub mod utils; +pub use api_structs::InfoResponse as BackendInfo; pub use backend::BlindbitBackend;