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

fix: runtime upgrades in unstable backend #1348

Merged
merged 2 commits into from
Jan 16, 2024
Merged

fix: runtime upgrades in unstable backend #1348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
493d703
fix: runtime upgrades in unstable backend
niklasad1 Jan 9, 2024
c9fb062
Merge branch 'master' into na-unstable-backend-refactor-runtime-upgrades
jsdw Jan 16, 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
33 changes: 27 additions & 6 deletions subxt/src/backend/unstable/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ impl<T: Config + Send + Sync + 'static> Backend<T> for UnstableBackend<T> {
.filter_map(move |ev| {
let output = match ev {
FollowEvent::Initialized(ev) => {
runtimes.clear();
runtimes.remove(&ev.finalized_block_hash.hash());
ev.finalized_block_runtime
}
FollowEvent::NewBlock(ev) => {
Expand All @@ -363,14 +363,35 @@ impl<T: Config + Send + Sync + 'static> Backend<T> for UnstableBackend<T> {
None
}
FollowEvent::Finalized(ev) => {
let next_runtime = ev
let next_runtime = {
let mut it = ev
.finalized_block_hashes
.iter()
.rev()
.filter_map(|h| runtimes.get(&h.hash()).cloned())
.peekable();

let next = it.next();

if it.peek().is_some() {
tracing::warn!(
target: "subxt",
"Several runtime upgrades in the finalized blocks but only the latest runtime upgrade is returned"
);
}

next
};

// Remove finalized and pruned blocks as valid runtime upgrades.
for block in ev
.finalized_block_hashes
.iter()
.rev()
.filter_map(|h| runtimes.get(&h.hash()).cloned())
.next();
.chain(ev.pruned_block_hashes.iter())
{
runtimes.remove(&block.hash());
}

runtimes.clear();
next_runtime
}
_ => None,
Expand Down
Loading