michael.heier/blockstream-electrs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass block headers instead of block hashes

Browse Source
This commit is contained in:
Roman Zeyde 2018-04-11 21:06:38 +03:00
parent e1074e4aec
commit 3f183b8fcc
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
2 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/daemon.rs
View File

@ -61,16 +61,17 @@ impl Daemon {
(headers, blockhash)
}
pub fn enumerate_headers(&self) -> Vec<(usize, Bytes)> {
let (headers, mut blockhash) = self.get_headers();
let mut hashes = VecDeque::<Bytes>::new();
pub fn enumerate_headers(&self) -> Vec<(usize, BlockHeader)> {
let (mut header_map, mut blockhash) = self.get_headers();
let mut header_list = VecDeque::<BlockHeader>::new();
let null_hash = [0u8; 32];
while blockhash != null_hash {
let header: &BlockHeader = headers.get(&blockhash).unwrap();
hashes.push_front(blockhash);
let header: BlockHeader = header_map.remove(&blockhash).unwrap();
blockhash = header.prev_blockhash[..].to_vec();
header_list.push_front(header);
}
enumerate(hashes).collect()
assert!(header_map.is_empty());
enumerate(header_list).collect()
}
}

42
src/index.rs
View File

@ -1,4 +1,4 @@
use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::network::serialize::BitcoinHash;
use bitcoin::network::serialize::{deserialize, serialize};
use bitcoin::util::hash::Sha256dHash;
@ -7,9 +7,11 @@ use crypto::digest::Digest;
use crypto::sha2::Sha256;
use daemon::Daemon;
use store::{Row, Store};
use timer::Timer;
use pbr;
use std::collections::HashMap;
use store::{Row, Store};
use time;
use timer::Timer;
use util;
use Bytes;
@ -76,21 +78,26 @@ fn index_block(block: &Block, height: usize) -> Vec<Row> {
rows
}
fn get_missing_hashes(store: &Store, daemon: &Daemon) -> Vec<(usize, Bytes)> {
let indexed_headers = store.read_headers();
let mut hashes: Vec<(usize, Bytes)> = daemon.enumerate_headers();
fn get_missing_headers(store: &Store, daemon: &Daemon) -> Vec<(usize, BlockHeader)> {
let indexed_headers: HashMap<Bytes, BlockHeader> = store.read_headers();
let mut headers: Vec<(usize, BlockHeader)> = daemon.enumerate_headers();
{
let best_block_header = &headers.last().unwrap().1;
info!(
"got {} headers (indexed {})",
hashes.len(),
"got {} headers (indexed {}), best {} @ {}",
headers.len(),
indexed_headers.len(),
best_block_header.bitcoin_hash(),
time::at_utc(time::Timespec::new(best_block_header.time as i64, 0)).rfc3339(),
);
hashes.retain(|item| !indexed_headers.contains_key(&item.1));
hashes
}
headers.retain(|item| !indexed_headers.contains_key(&item.1.bitcoin_hash()[..]));
headers
}
pub fn update(store: &mut Store, daemon: &Daemon) {
let hashes = get_missing_hashes(store, daemon);
if hashes.is_empty() {
let headers = get_missing_headers(store, daemon);
if headers.is_empty() {
return;
}
@ -100,14 +107,15 @@ pub fn update(store: &mut Store, daemon: &Daemon) {
let mut rows_size = 0usize;
let mut num_of_rows = 0usize;
let mut pb = pbr::ProgressBar::new(hashes.len() as u64);
for (height, blockhash) in hashes {
let mut pb = pbr::ProgressBar::new(headers.len() as u64);
for (height, header) in headers {
let blockhash = header.bitcoin_hash();
timer.start("get");
let buf: Bytes = daemon.get(&format!("block/{}.bin", util::revhex(&blockhash)));
let buf: Bytes = daemon.get(&format!("block/{}.bin", util::revhex(&blockhash[..])));
timer.start("parse");
let block: Block = deserialize(&buf).unwrap();
assert_eq!(&block.bitcoin_hash()[..], blockhash.as_slice());
assert_eq!(block.bitcoin_hash(), blockhash);
timer.start("index");
let rows = index_block(&block, height);
@ -125,7 +133,7 @@ pub fn update(store: &mut Store, daemon: &Daemon) {
pb.inc();
debug!(
"{} @ {}: {:.3}/{:.3} MB, {} rows, {}",
util::revhex(&blockhash),
util::revhex(&blockhash[..]),
height,
rows_size as f64 / 1e6_f64,
blocks_size as f64 / 1e6_f64,