Skip to content

Do not set the "best header" to a header that has a lower number than before #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2019
Merged

Do not set the "best header" to a header that has a lower number than before #1518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8b307
Do not set the "best header" to a header that has a lower number than…
majecty May 8, 2019
3dabc79
Merge branch 'master' into f/best_header
majecty May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion core/src/blockchain/headerchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,16 @@ impl HeaderChain {
///
/// Used in BlockChain::update_best_as_committed().
pub fn update_best_as_committed(&self, batch: &mut DBTransaction, block_hash: H256) {
ctrace!(HEADERCHAIN, "Update the best block to {}", block_hash);
assert!(self.pending_best_header_hash.read().is_none());

let prev_best_header_number = self.best_header().number();
let committed_header_number =
self.block_header_data(&block_hash).expect("The given hash should exist").number();
if prev_best_header_number > committed_header_number {
return
}

ctrace!(HEADERCHAIN, "Update the best block to {}", block_hash);
let block_detail = self.block_details(&block_hash).expect("The given hash should exist");
let mut new_hashes = HashMap::new();
new_hashes.insert(block_detail.number, block_hash);
Expand Down