Skip to content

Commit

Permalink
Less intermediary data states in sync
Browse files Browse the repository at this point in the history 
Use BTrees to store ordered sets rather than HashSets -> VecDequeue
  • Loading branch information
@LLFourn
LLFourn committed Nov 9, 2021
1 parent dfb63d3 commit d394011
Showing 1 changed file with 20 additions and 40 deletions.
60 changes: 20 additions & 40 deletions src/blockchain/script_sync.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
};
use bitcoin::{OutPoint, Script, Transaction, TxOut, Txid};
use log::*;
use std::collections::{HashMap, HashSet, VecDeque};
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};

/// A request for on-chain information
pub enum Request<'a, D: BatchDatabase> {
Expand Down Expand Up @@ -44,8 +44,6 @@ pub fn start<D: BatchDatabase>(db: &D, stop_gap: usize) -> Result<Request<'_, D>
stop_gap,
keychain,
next_keychains: keychains,
tx_interested: HashSet::default(),
tx_conftime_interested: HashSet::default(),
}))
}

Expand All @@ -56,8 +54,6 @@ pub struct ScriptReq<'a, D: BatchDatabase> {
stop_gap: usize,
keychain: KeychainKind,
next_keychains: Vec<KeychainKind>,
tx_interested: HashSet<Txid>,
tx_conftime_interested: HashSet<Txid>,
}

/// The sync starts by returning script pubkeys we are interested in.
Expand Down Expand Up @@ -93,11 +89,11 @@ impl<'a, D: BatchDatabase> ScriptReq<'a, D> {
(None, Some(_)) => {
// It looks like the tx has confirmed since we last saw it -- we
// need to know the confirmation time.
self.tx_conftime_interested.insert(*txid);
self.state.tx_missing_conftime.insert(*txid, details);
}
(Some(old_height), Some(new_height)) if old_height != *new_height => {
// The height of the tx has changed !? -- get the confirmation time.
self.tx_conftime_interested.insert(*txid);
self.state.tx_missing_conftime.insert(*txid, details);
}
(Some(_), None) => {
details.confirmation_time = None;
Expand All @@ -108,7 +104,7 @@ impl<'a, D: BatchDatabase> ScriptReq<'a, D> {
}
None => {
// we've never seen it let's get the whole thing
self.tx_interested.insert(*txid);
self.state.tx_needed.insert(*txid);
}
};
}
Expand Down Expand Up @@ -147,8 +143,6 @@ impl<'a, D: BatchDatabase> ScriptReq<'a, D> {
.collect();
Request::Script(self)
} else {
self.state.conftime_needed = self.tx_conftime_interested.into_iter().collect();
self.state.tx_needed = self.tx_interested.into_iter().collect();
Request::Tx(TxReq { state: self.state })
}
} else {
Expand Down Expand Up @@ -225,11 +219,10 @@ impl<'a, D: BatchDatabase> TxReq<'a, D> {
.collect::<Result<Vec<_>, _>>()?;

for tx_detail in tx_details {
self.state.conftime_needed.push_back(tx_detail.txid);
self.state.tx_needed.remove(&tx_detail.txid);
self.state
.tx_missing_conftime
.insert(tx_detail.txid, tx_detail);
self.state.tx_needed.pop_front();
}

if !self.state.tx_needed.is_empty() {
Expand All @@ -247,34 +240,28 @@ pub struct ConftimeReq<'a, D> {

impl<'a, D: BatchDatabase> ConftimeReq<'a, D> {
pub fn request(&self) -> impl Iterator<Item = &Txid> + Clone {
self.state.conftime_needed.iter()
self.state.tx_missing_conftime.keys()
}

pub fn satisfy(
mut self,
confirmation_times: Vec<Option<ConfirmationTime>>,
) -> Result<Request<'a, D>, Error> {
let n = confirmation_times.len();
let conftime_needed = self.state.conftime_needed.iter();
for (confirmation_time, txid) in confirmation_times.into_iter().zip(conftime_needed) {
let conftime_needed = self
.request()
.cloned()
.take(confirmation_times.len())
.collect::<Vec<_>>();
for (confirmation_time, txid) in confirmation_times.into_iter().zip(conftime_needed.iter())
{
debug!("confirmation time for {} was {:?}", txid, confirmation_time);
// this is written awkwardly to avoid lifetime issues with using cleaner .or_else
let mut tx_details = self.state.tx_missing_conftime.remove(txid);
if tx_details.is_none() {
tx_details = self.state.db.get_tx(txid, true)?
}

if let Some(mut tx_details) = tx_details {
if let Some(mut tx_details) = self.state.tx_missing_conftime.remove(txid) {
tx_details.confirmation_time = confirmation_time;
self.state.finished_txs.push(tx_details);
}
}

for _ in 0..n {
self.state.conftime_needed.pop_front();
}

if self.state.conftime_needed.is_empty() {
if self.state.tx_missing_conftime.is_empty() {
Ok(Request::Finish(self.state.into_db_update()?))
} else {
Ok(Request::Conftime(self))
Expand All @@ -286,13 +273,11 @@ struct State<'a, D> {
db: &'a D,
last_active_index: HashMap<KeychainKind, usize>,
/// Transactions where we need to get the full details
tx_needed: VecDeque<Txid>,
/// Transactions where we need to get the confirmation time
conftime_needed: VecDeque<Txid>,
tx_needed: BTreeSet<Txid>,
/// Transacitions that we know everything about
finished_txs: Vec<TransactionDetails>,
/// Transactions that discovered conftimes should be inserted into
tx_missing_conftime: HashMap<Txid, TransactionDetails>,
tx_missing_conftime: BTreeMap<Txid, TransactionDetails>,
/// The start of the sync
start_time: Instant,
}
Expand All @@ -302,19 +287,14 @@ impl<'a, D: BatchDatabase> State<'a, D> {
State {
db,
last_active_index: HashMap::default(),
conftime_needed: VecDeque::default(),
finished_txs: vec![],
tx_needed: VecDeque::default(),
tx_missing_conftime: HashMap::default(),
tx_needed: BTreeSet::default(),
tx_missing_conftime: BTreeMap::default(),
start_time: Instant::new(),
}
}
fn into_db_update(self) -> Result<D::Batch, Error> {
debug_assert!(
self.tx_needed.is_empty()
&& self.tx_missing_conftime.is_empty()
&& self.conftime_needed.is_empty()
);
debug_assert!(self.tx_needed.is_empty() && self.tx_missing_conftime.is_empty());
let existing_txs = self.db.iter_txs(false)?;
let existing_txids: HashSet<Txid> = existing_txs.iter().map(|tx| tx.txid).collect();
let finished_txs = make_txs_consistent(&self.finished_txs);
Expand Down

0 comments on commit d394011

Please sign in to comment.