Skip to content

Detect bootstrap header in tendermint worker #1883

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 1 commit into from
Nov 25, 2019
Merged

Detect bootstrap header in tendermint worker #1883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions core/src/consensus/tendermint/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ use crate::encoded;
use crate::error::{BlockError, Error};
use crate::snapshot_notify::NotifySender as SnapshotNotifySender;
use crate::transaction::{SignedTransaction, UnverifiedTransaction};
use crate::types::BlockStatus;
use crate::views::BlockView;
use crate::BlockId;
use std::cell::Cell;
Expand Down Expand Up @@ -958,7 +959,8 @@ impl Worker {
}

pub fn on_imported_proposal(&mut self, proposal: &Header) {
if proposal.number() < 1 {
// NOTE: Only the genesis block and the snapshot target don't have the parent in the blockchain
if self.client().block_status(&BlockId::Hash(*proposal.parent_hash())) == BlockStatus::Unknown {
return
}

Expand Down Expand Up @@ -1660,11 +1662,11 @@ impl Worker {
let mut last_term_end = None;
for block_hash in &enacted {
let header = c.block_header(&BlockId::Hash(*block_hash)).expect("Block is enacted").decode();
if header.number() == 0 {
continue
}
let parent_header =
c.block_header(&BlockId::Hash(*header.parent_hash())).expect("Parent block should be enacted").decode();
let parent_header = match c.block_header(&BlockId::Hash(*header.parent_hash())) {
Some(h) => h.decode(),
// NOTE: Only the genesis block and the snapshot target don't have the parent in the blockchain
None => continue,
};
let term_common_params = if let Some(p) = c.term_common_params(parent_header.hash().into()) {
p
} else {
Expand Down