Skip to content
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

Don't notify the same parahead twice #2106

Merged
merged 2 commits into from
Mar 1, 2022
+24 −15
Merged

Don't notify the same parahead twice #2106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814b0de
Don't notify the same parahead twice
tomaka Feb 25, 2022
eeb3354
Merge branch 'main' into dont-report-duplicate-paraheads
mergify[bot] Mar 1, 2022
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
39 changes: 24 additions & 15 deletions bin/light-base/src/sync_service/parachain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,16 @@ pub(super) async fn start_parachain<TPlat: Platform>(
block.async_op_user_data.clone().unwrap();
let block_index = block.index;

let parent_header: &Vec<u8> = async_tree
.parent(block_index)
.map(|idx| {
async_tree
.block_async_user_data(idx)
.unwrap()
.as_ref()
.unwrap()
})
.or_else(|| async_tree.finalized_async_user_data().as_ref())
.unwrap_or(&finalized_parahead);

// Do not report the new block if it is the same as its parent.
if *parent_header == scale_encoded_header {
// Do not report the new block if it has already been reported in the
// past. This covers situations where the parahead is identical to the
// relay chain's parent's parahead, but also situations where multiple
// sibling relay chain blocks have the same parahead.
if async_tree
.input_iter_unordered()
.filter(|item| item.id != block_index)
.filter_map(|item| item.async_op_user_data)
.any(|item| item.as_ref() == Some(&scale_encoded_header))
{
continue;
}

Expand All @@ -270,9 +266,22 @@ pub(super) async fn start_parachain<TPlat: Platform>(
))
);

let parent_hash = header::hash_from_scale_encoded_header(
&async_tree
.parent(block_index)
.map(|idx| {
async_tree
.block_async_user_data(idx)
.unwrap()
.as_ref()
.unwrap()
})
.or_else(|| async_tree.finalized_async_user_data().as_ref())
.unwrap_or(&finalized_parahead),
);

// Elements in `all_subscriptions` are removed one by one and
// inserted back if the channel is still open.
let parent_hash = header::hash_from_scale_encoded_header(&parent_header);
for index in (0..all_subscriptions.len()).rev() {
let mut sender = all_subscriptions.swap_remove(index);
let notif = super::Notification::Block(super::BlockNotification {
Expand Down