backport cumulus changes to bridges-master (#2172)

* backport cumulus changes to bridges-master * bump substrate, polkadot & cumulus * backport cumulus changes * make it build * fix runtimes: only numeric literals are supported by sp_version::runtime_version macro --------- Signed-off-by: acatangiu <[email protected]>
paritytech · May 10, 2024 · 92e5056 · 92e5056
1 parent 13eb998
commit 92e5056
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bridges/modules/grandpa/src/lib.rs b/bridges/modules/grandpa/src/lib.rs
@@ -44,7 +44,6 @@ use bp_header_chain::{
 };
 use bp_runtime::{BlockNumberOf, HashOf, HasherOf, HeaderId, HeaderOf, OwnedBridgeModule};
 use frame_support::{dispatch::PostDispatchInfo, ensure, DefaultNoBound};
-use sp_consensus_grandpa::SetId;
 use sp_runtime::{
 	traits::{Header as HeaderT, Zero},
 	SaturatedConversion,
@@ -527,7 +526,7 @@ pub mod pallet {
 	fn may_refund_call_fee<T: Config<I>, I: 'static>(
 		finality_target: &BridgedHeader<T, I>,
 		justification: &GrandpaJustification<BridgedHeader<T, I>>,
-		current_set_id: SetId,
+		current_set_id: sp_consensus_grandpa::SetId,
 		improved_by: BridgedBlockNumber<T, I>,
 	) -> bool {
 		// if we have refunded too much at this block => not refunding