Skip to content

grandpa: handle error from SelectChain::finality_target #5153

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
bkchr merged 7 commits into from
Jul 28, 2024
Merged

grandpa: handle error from SelectChain::finality_target #5153

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1447b9
grandpa: handle error from SelectChain::finality_target
andresilva Jul 26, 2024
2d63905
Add `selecting_block_outside_of_best_chain_works` test (#1)
dmitrylavrenov Jul 26, 2024
11efbf6
rustfmt
andresilva Jul 26, 2024
1b4a83c
Merge branch 'master' into andre/fix-grandpa-finality-target
andresilva Jul 26, 2024
d5484fc
nits in test
andresilva Jul 26, 2024
f18e3a2
PRDOC
bkchr Jul 28, 2024
fb59276
Merge branch 'master' into andre/fix-grandpa-finality-target
bkchr Jul 28, 2024
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: 8 additions & 2 deletions substrate/client/consensus/grandpa/src/environment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,14 +1214,20 @@ where
.header(target_hash)?
.expect("Header known to exist after `finality_target` call; qed"),
Err(err) => {
warn!(
debug!(
target: LOG_TARGET,
"Encountered error finding best chain containing {:?}: couldn't find target block: {}",
block,
err,
);

return Ok(None)
// NOTE: in case the given `SelectChain` doesn't provide any block we fallback to using
// the given base block provided by the GRANDPA voter.
//
// For example, `LongestChain` will error if the given block to use as base isn't part
// of the best chain (as defined by `LongestChain`), which could happen if there was a
// re-org.
base_header.clone()
},
};

Expand Down