Skip to content

Commit

Permalink
Merge pull request #8 from ckb-cell/feature/split-download-process
Browse files Browse the repository at this point in the history
feat: don't download all bitcoin headers at once
  • Loading branch information
yangby-cryptape authored Mar 29, 2024
2 parents c2b4ca8 + 4452f83 commit 3ade5c9
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 23 deletions.
6 changes: 5 additions & 1 deletion src/cli/serve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ pub struct Args {
#[arg(long, default_value = "10")]
pub(crate) spv_headers_update_limit: u32,

/// The batch size that how many Bitcoin headers will be downloaded at once.
#[arg(long, default_value = "30")]
pub(crate) bitcoin_headers_download_batch_size: u32,

/// Perform all steps without sending.
#[arg(long, hide = true)]
pub(crate) dry_run: bool,
Expand Down Expand Up @@ -98,7 +102,7 @@ impl Args {
let mut prev_tx_hash: Option<H256> = None;

loop {
if !spv_service.sync_storage()? {
if !spv_service.sync_storage(self.bitcoin_headers_download_batch_size)? {
continue;
}

Expand Down
74 changes: 52 additions & 22 deletions src/components/spv_service.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
//! Internal SPV service.
use bitcoin::BlockHash;
use ckb_bitcoin_spv_verifier::types::{
core::Hash,
core::{Hash, Header},
prelude::{Pack as VPack, Unpack as VUnpack},
};
use ckb_sdk::rpc::CkbRpcClient;
Expand Down Expand Up @@ -131,7 +132,7 @@ impl SpvService {
Err(Error::other(msg))
}

pub(crate) fn sync_storage(&self) -> Result<bool> {
pub(crate) fn sync_storage(&self, batch_size: u32) -> Result<bool> {
let spv = &self;
let (stg_tip_height, stg_tip_header) = spv.storage.tip_state()?;
let stg_tip_hash = stg_tip_header.block_hash();
Expand All @@ -151,16 +152,13 @@ impl SpvService {
let btc_header = spv.btc_cli.get_block_header_by_height(stg_tip_height)?;
let btc_hash = btc_header.block_hash();
if stg_tip_hash == btc_hash {
let headers = if let Some(headers) =
spv.btc_cli
.get_headers(stg_tip_height + 1, btc_tip_height, stg_tip_hash)?
{
headers
} else {
return Ok(false);
};
let _ = spv.storage.append_headers(headers)?;
return Ok(true);
let headers_opt = self.sync_storage_internal(
batch_size,
stg_tip_height + 1,
btc_tip_height,
stg_tip_hash,
)?;
return Ok(headers_opt.is_some());
}

log::info!("Try to find the height when fork happened");
Expand Down Expand Up @@ -192,16 +190,48 @@ impl SpvService {
log::warn!("The chain in storage rollback to header#{fork_height:07}, {fork_hash:#x}");
spv.storage.rollback_to(Some(fork_height))?;

let headers = if let Some(headers) =
spv.btc_cli
.get_headers(fork_height + 1, btc_tip_height, fork_hash.into())?
{
headers
} else {
return Ok(false);
};
let _ = spv.storage.append_headers(headers)?;
let headers_opt = self.sync_storage_internal(
batch_size,
fork_height + 1,
btc_tip_height,
fork_hash.into(),
)?;
Ok(headers_opt.is_some())
}

fn sync_storage_internal(
&self,
batch_size: u32,
mut start_height: u32,
end_height: u32,
mut start_hash: BlockHash,
) -> Result<Option<Vec<Header>>> {
let spv = self;
let mut headers = Vec::new();
while start_height <= end_height {
let mut next_height = start_height + batch_size;
if next_height > end_height {
next_height = end_height;
}

Ok(true)
let tmp_headers = if let Some(headers) =
spv.btc_cli
.get_headers(start_height, next_height, start_hash)?
{
headers
} else {
return Ok(None);
};

start_height = next_height + 1;
if let Some(header) = tmp_headers.last() {
start_hash = header.block_hash();
} else {
return Ok(None);
}
headers.extend_from_slice(&tmp_headers);
let _ = spv.storage.append_headers(tmp_headers)?;
}
Ok(Some(headers))
}
}

0 comments on commit 3ade5c9

Please sign in to comment.