Skip to content

fix(testnet): correct GRANDPA warp checkpoint transition #3082

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
UnArbosFive merged 4 commits into from
Aug 20, 2026
+36 −6
Merged

fix(testnet): correct GRANDPA warp checkpoint transition #3082

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
add2b31
fix(testnet): correct GRANDPA checkpoint transition
UnArbosFive Aug 14, 2026
c1605e4
fix(testnet): use historical checkpoint signing set id
UnArbosFive Aug 14, 2026
0876234
fix(testnet): use historical GRANDPA signing sets
UnArbosFive Aug 14, 2026
fa661f6
test(grandpa): satisfy strict clippy lints
UnArbosFive Aug 14, 2026
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
42 changes: 36 additions & 6 deletions node/src/service/grandpa_warp_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,14 @@ where
}

#[allow(clippy::expect_used)]
fn testnet_authorities() -> AuthorityList {
fn testnet_checkpoint_authorities() -> AuthorityList {
[
hex_literal::hex!("dc832c3b7bdfc721e90e5ee9e532c06b62a0def3c79dab5324460d938db6600a"),
hex_literal::hex!("c8a00ef71912b3868b101cb70ebd029999d1c9b6a1390122a98f60d72b9a0fc4"),
hex_literal::hex!("ee70f7b52998c2b4f3d42e509e8360cda92b0cd4ca100cd4d32be5a1ac297909"),
hex_literal::hex!("b57a038c9139a060358f3b654df74a1cb6d15bcdb8438bcebd64ce67ec4301eb"),
hex_literal::hex!("755f75dfc66aaa3b1e761a8845249509b8bd2fdf0d94cb74e1e12e1e0f4d3519"),
hex_literal::hex!("d97a64267f177505b0565a18677c9f5d4284d7f2eb96d515556e7e52217f82e9"),
]
.into_iter()
.map(|bytes| {
Expand All @@ -136,7 +137,7 @@ fn testnet_authorities() -> AuthorityList {
}

fn testnet_checkpoints() -> Vec<AuthoritySetHardFork<Block>> {
let authorities = testnet_authorities();
let authorities = testnet_checkpoint_authorities();

[
(
Expand All @@ -145,7 +146,7 @@ fn testnet_checkpoints() -> Vec<AuthoritySetHardFork<Block>> {
hex_literal::hex!("2b001bfdec34d007ab2ac07f712e64d0cb1a6fb4b51f7d47bfb3c7d7336a689b"),
),
(
2,
3,

@github-actions github-actions Bot Aug 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[HIGH] Restore the checkpoint’s distinct resulting set ID

This value correctly identifies set 3 as the historical signing set, but AuthoritySetHardFork provides no separate resulting-set override here. The final commit removed resulting_set_id: Some(2) and both assertions that protected it, despite the PR description requiring the second checkpoint to leave warp sync at set ID 2. Consequently, successful verification can resume from the wrong GRANDPA set and break testnet finality synchronization. Restore an SDK/API capable of representing signing set 3 with resulting set 2, and retain an integration-level assertion for the returned VerificationResult.

5_534_451,
hex_literal::hex!("4d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4"),
),
Expand Down Expand Up @@ -222,7 +223,7 @@ mod tests {
}

#[test]
fn testnet_checkpoints_are_ordered_and_share_authorities() {
fn testnet_checkpoints_use_historical_signing_sets() {
let checkpoints = testnet_checkpoints();
let [first, second] = checkpoints.as_slice() else {
panic!("expected exactly two testnet warp checkpoints");
Expand All @@ -235,14 +236,14 @@ mod tests {
"2b001bfdec34d007ab2ac07f712e64d0cb1a6fb4b51f7d47bfb3c7d7336a689b"
))
);
assert_eq!((second.set_id, second.block.1), (2, 5_534_451));
assert_eq!((second.set_id, second.block.1), (3, 5_534_451));
assert_eq!(
second.block.0,
H256::from(hex_literal::hex!(
"4d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4"
))
);
assert_eq!(first.authorities.len(), 5);
assert_eq!(first.authorities.len(), 6);
assert_eq!(first.authorities, second.authorities);
let authority_ids: Vec<&[u8]> = first
.authorities
Expand All @@ -255,6 +256,7 @@ mod tests {
hex_literal::hex!("ee70f7b52998c2b4f3d42e509e8360cda92b0cd4ca100cd4d32be5a1ac297909"),
hex_literal::hex!("b57a038c9139a060358f3b654df74a1cb6d15bcdb8438bcebd64ce67ec4301eb"),
hex_literal::hex!("755f75dfc66aaa3b1e761a8845249509b8bd2fdf0d94cb74e1e12e1e0f4d3519"),
hex_literal::hex!("d97a64267f177505b0565a18677c9f5d4284d7f2eb96d515556e7e52217f82e9"),
];
let expected_authority_ids = expected_authority_ids
.iter()
Expand All @@ -263,6 +265,34 @@ mod tests {
assert_eq!(authority_ids, expected_authority_ids);
}

#[test]
fn second_testnet_checkpoint_verifies_with_historical_signing_set_id() {
use sc_consensus_grandpa::GrandpaJustification;
use sp_runtime::codec::DecodeAll;

// Stored GRANDPA justification for testnet block 5,534,451. Keeping this historical
// boundary in the test prevents runtime state at the current tip from being mistaken for
// the set ID that actually signed the checkpoint.
let encoded = hex_literal::hex!(
"2c320c00000000004d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f3725400144d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f3725400072a8a1a2567ca0633ac6497e47c95067ea208eb125b43664129aed09ec7e5c055a4bf320d879b4c0ed644c539a10ffa9c61eb2a464d78fd04950081f0aa7501755f75dfc66aaa3b1e761a8845249509b8bd2fdf0d94cb74e1e12e1e0f4d35194d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f37254000a97aafb8a64e0bb41f82cb83badfa6c882433b3acfe03d070f8ffc8d4164dc94611045932a1396ec3a893275b561dba13f9ff1968574d0b93d08ce56b069807b57a038c9139a060358f3b654df74a1cb6d15bcdb8438bcebd64ce67ec4301eb4d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f3725400971a2c21924c9723121767be46be8e7bac1099aadd6e19401a85e8fc5238364823fb92235535716426f13ef469c1c07808d5125cfb79f65400f1c407bb39e80bc8a00ef71912b3868b101cb70ebd029999d1c9b6a1390122a98f60d72b9a0fc44d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f37254009469bd1c254becf32318bb5bc96c98d0dfa4fe652613e129f2edb9ed4a8904c9b5f26ef22b09ac25339680578ef9116f0b79d6a6d7701292b57b8572869a3702dc832c3b7bdfc721e90e5ee9e532c06b62a0def3c79dab5324460d938db6600a4d643da5fd7cd2b9ceb795091643e7223819e2a01f942ac049c5b928f7e30dc4f37254002e2bd65267a52080e7635e82dd5dbf891b42549598e244b7ff0e01b88a5187796133bc48bd7713b1025d625f56811a134fbbae38e85b01082b7557755c085602ee70f7b52998c2b4f3d42e509e8360cda92b0cd4ca100cd4d32be5a1ac29790900"
);
let Ok(justification) = GrandpaJustification::<Block>::decode_all(&mut encoded.as_slice())
else {
panic!("stored testnet checkpoint justification must decode");
};
let checkpoints = testnet_checkpoints();
let [_, checkpoint] = checkpoints.as_slice() else {
panic!("expected exactly two testnet warp checkpoints");
};

assert!(
justification
.verify(checkpoint.set_id, &checkpoint.authorities)
.is_ok()
);
assert!(justification.verify(2, &checkpoint.authorities).is_err());
}

#[test]
fn finney_initial_set_id_is_applied_only_at_warp_sync_start() {
let provider = InitialSetIdProvider::new(RecordingProvider::default(), 3);
Expand Down
Loading