kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-06-12 15:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add helper to check to see if a reorg occured between a current and previous block snapshot. This is a common occurence in the test framework, where PoX reorgs can happen

Browse Source
This commit is contained in:
Jude Nelson
2024-03-15 17:30:56 -04:00
parent f0005e13fa
commit eaeb4d8795
1 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
stackslib/src/net/p2p.rs
View File

@@ -5431,11 +5431,14 @@ impl PeerNetwork {
let stacks_tip =
SortitionDB::get_canonical_stacks_chain_tip_hash_and_height(sortdb.conn())?;
let burnchain_tip_changed = sn.block_height != self.chain_view.burn_block_height || self.num_state_machine_passes == 0;
let burnchain_tip_changed = sn.block_height != self.chain_view.burn_block_height
|| self.num_state_machine_passes == 0;
let stacks_tip_changed = self.stacks_tip != stacks_tip;
let new_stacks_tip_block_id = StacksBlockId::new(&stacks_tip.0, &stacks_tip.1);
let need_stackerdb_refresh = sn.canonical_stacks_tip_consensus_hash
!= self.burnchain_tip.canonical_stacks_tip_consensus_hash || burnchain_tip_changed || stacks_tip_changed;
!= self.burnchain_tip.canonical_stacks_tip_consensus_hash
|| burnchain_tip_changed
|| stacks_tip_changed;
let mut ret: HashMap<NeighborKey, Vec<StacksMessage>> = HashMap::new();
let aggregate_public_keys =
@@ -5719,8 +5722,7 @@ impl PeerNetwork {
warn!("Failed to run Stacker DB sync: {:?}", &e);
}
}
}
else {
} else {
debug!("{}: skip StackerDB sync in IBD", self.get_local_peer());
}
@@ -5907,6 +5909,55 @@ impl PeerNetwork {
Ok(())
}
/// Static helper to check to see if there has been a reorg
pub fn is_reorg(
last_sort_tip: Option<&BlockSnapshot>,
sort_tip: &BlockSnapshot,
sortdb: &SortitionDB,
) -> bool {
let reorg = if let Some(last_sort_tip) = last_sort_tip {
if last_sort_tip.block_height == sort_tip.block_height
&& last_sort_tip.consensus_hash != sort_tip.consensus_hash
{
debug!(
"Reorg detected at burn height {}: {} != {}",
sort_tip.block_height, &last_sort_tip.consensus_hash, &sort_tip.consensus_hash
);
true
} else if last_sort_tip.block_height != sort_tip.block_height {
// last_sort_tip must be an ancestor
let ih = sortdb.index_handle(&sort_tip.sortition_id);
if let Ok(Some(ancestor_sn)) =
ih.get_block_snapshot_by_height(last_sort_tip.block_height)
{
if ancestor_sn.consensus_hash != last_sort_tip.consensus_hash {
info!(
"Reorg detected at burn block {}: ancestor tip at {}: {} != {}",
sort_tip.block_height,
last_sort_tip.block_height,
&ancestor_sn.consensus_hash,
&last_sort_tip.consensus_hash
);
true
} else {
false
}
} else {
info!(
"Reorg detected: no ancestor of burn block {} ({}) found",
sort_tip.block_height, &sort_tip.consensus_hash
);
true
}
} else {
false
}
} else {
false
};
reorg
}
/// Top-level main-loop circuit to take.
/// -- polls the peer network and http network server sockets to get new sockets and detect ready sockets
/// -- carries out network conversations