Make on demand modules compatible with lower versions

Cargo.toml

@@ -61,8 +61,8 @@ schnellru = "0.2.1"
 serde = { version = "1.0.188", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0.105"
 smallvec = "1.11.0"
-subxt = {version = "0.33.0"}
-subxt-signer = {version = "0.33.0"}
+subxt = {version = "0.37.0"}
+subxt-signer = {version = "0.37.0"}
 tracing = "0.1.37"
 url = "2.4.0"
 termcolor = "1.1.3"
@@ -118,7 +118,7 @@ sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "rel
 sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
 pallet-broker = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
 sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0"}
 
 # Substrate FRAME
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }

client/coretime/bulk/src/lib.rs

@@ -29,12 +29,12 @@ use futures::{lock::Mutex, select, FutureExt};
 use mc_coretime_common::is_parathread;
 use mp_coretime_bulk::{
 	self, well_known_keys::broker_regions, BulkMemRecord, BulkMemRecordItem, BulkRuntimeApi,
-	BulkStatus,
+	BulkStatus, RegionRecord, RegionRecordV0,
 };
 use mp_coretime_common::{
 	chain_state_snapshot::GenericStateProof, well_known_keys::SYSTEM_BLOCKHASH_GENESIS,
 };
-use pallet_broker::{CoreMask, RegionId, RegionRecord};
+use pallet_broker::{CoreMask, RegionId};
 use polkadot_primitives::{AccountId, Balance};
 use sc_client_api::UsageProvider;
 use sc_service::TaskManager;
@@ -80,7 +80,7 @@ where
 
 	let api = OnlineClient::<PolkadotConfig>::from_url(rpc_url).await?;
 
-	let mut blocks_sub = api.blocks().subscribe_best().await?;
+	let mut blocks_sub = api.blocks().subscribe_finalized().await?;
 
 	// For each block, print a bunch of information about it:
 	while let Some(block) = blocks_sub.next().await {
@@ -93,6 +93,7 @@ where
 			continue;
 		}
 		let block_number = block.header().number;
+		let block_hash = block.hash();
 
 		let mut bulk_record_local = bulk_record.lock().await;
 		bulk_record_local.coretime_para_height = block_number;
@@ -136,10 +137,8 @@ where
 						relevant_keys.push(region_key.as_slice());
 						relevant_keys.push(block_hash_key);
 
-						let proof = rpc
-							.state_get_read_proof(relevant_keys, Some(events.block_hash()))
-							.await
-							.unwrap();
+						let proof =
+							rpc.state_get_read_proof(relevant_keys, Some(block_hash)).await?;
 						let storage_proof =
 							StorageProof::new(proof.proof.into_iter().map(|bytes| bytes.to_vec()));
 
@@ -155,8 +154,23 @@ where
 								None,
 							)
 							.ok();
+						let mut proof_gen = false;
 						// Check proof is ok.
 						if head_data.is_some() {
+							proof_gen = true;
+						} else {
+							// decode to lower version
+							let head_data = relay_storage_rooted_proof
+								.read_entry::<RegionRecordV0<AccountId, Balance>>(
+									region_key.as_slice(),
+									None,
+								)
+								.ok();
+							if head_data.is_some() {
+								proof_gen = true;
+							}
+						}
+						if proof_gen {
 							// Record some data.
 							let record_item = BulkMemRecordItem {
 								storage_proof,
@@ -176,7 +190,6 @@ where
 
 			// Query CoreAssigned event.
 			let ev_core_assigned = event.as_event::<metadata::CoreAssigned>();
-
 			if let Ok(core_assigned_event) = ev_core_assigned {
 				if let Some(ev) = core_assigned_event {
 					log::info!(
@@ -198,12 +211,13 @@ where
 										let constant_query =
 											subxt::dynamic::constant("Broker", "TimeslicePeriod");
 
-										let time_slice =
-											api.constants()
-												.at(&constant_query)?
-												.to_value()?
-												.as_u128()
-												.expect("coretime parachain time slice none") as u32;
+										let time_slice = api
+											.constants()
+											.at(&constant_query)?
+											.to_value()?
+											.as_u128()
+											.expect("coretime parachain time slice none")
+											as u32;
 
 										item.end_relaychain_height =
 											ev.when + item.duration * time_slice;
@@ -219,7 +233,6 @@ where
 			}
 		}
 	}
-
 	Ok(())
 }
 pub async fn run_coretime_bulk_task<P, R, Block>(

client/coretime/bulk/src/metadata.rs

@@ -19,15 +19,15 @@
 //! The data type here is generated by the subxt tool and represents the event-related data of the coretime parachain.
 //!
 #[derive(
-	:: subxt :: ext :: codec :: Decode,
-	:: subxt :: ext :: codec :: Encode,
-	:: subxt :: ext :: scale_decode :: DecodeAsType,
-	:: subxt :: ext :: scale_encode :: EncodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Decode,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Encode,
+	:: subxt :: ext :: subxt_core :: ext :: scale_decode :: DecodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: scale_encode :: EncodeAsType,
 	Debug,
 )]
-# [codec (crate = :: subxt :: ext :: codec)]
-#[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-#[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
+# [codec (crate = :: subxt :: ext :: subxt_core :: ext :: codec)]
+#[decode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_decode")]
+#[encode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_encode")]
 pub enum CoreAssignment {
 	#[codec(index = 0)]
 	Idle,
@@ -38,71 +38,71 @@ pub enum CoreAssignment {
 }
 
 #[derive(
-	:: subxt :: ext :: codec :: Decode,
-	:: subxt :: ext :: codec :: Encode,
-	:: subxt :: ext :: scale_decode :: DecodeAsType,
-	:: subxt :: ext :: scale_encode :: EncodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Decode,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Encode,
+	:: subxt :: ext :: subxt_core :: ext :: scale_decode :: DecodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: scale_encode :: EncodeAsType,
 	Debug,
 )]
-# [codec (crate = :: subxt :: ext :: codec)]
-#[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-#[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
+# [codec (crate = :: subxt :: ext :: subxt_core :: ext :: codec)]
+#[decode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_decode")]
+#[encode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_encode")]
 pub struct CoreAssigned {
 	pub core: u16,
 	pub when: u32,
 	pub assignment: Vec<(CoreAssignment, u16)>,
 }
 
-impl subxt::events::StaticEvent for CoreAssigned {
+impl ::subxt::ext::subxt_core::events::StaticEvent for CoreAssigned {
 	const PALLET: &'static str = "Broker";
 	const EVENT: &'static str = "CoreAssigned";
 }
 
 #[derive(
-	:: subxt :: ext :: codec :: Decode,
-	:: subxt :: ext :: codec :: Encode,
-	:: subxt :: ext :: scale_decode :: DecodeAsType,
-	:: subxt :: ext :: scale_encode :: EncodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Decode,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Encode,
+	:: subxt :: ext :: subxt_core :: ext :: scale_decode :: DecodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: scale_encode :: EncodeAsType,
 	Debug,
 )]
-# [codec (crate = :: subxt :: ext :: codec)]
-#[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-#[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
+# [codec (crate = :: subxt :: ext :: subxt_core :: ext :: codec)]
+#[decode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_decode")]
+#[encode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_encode")]
 pub struct CoreMask(pub [u8; 10usize]);
 
 #[derive(
-	:: subxt :: ext :: codec :: Decode,
-	:: subxt :: ext :: codec :: Encode,
-	:: subxt :: ext :: scale_decode :: DecodeAsType,
-	:: subxt :: ext :: scale_encode :: EncodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Decode,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Encode,
+	:: subxt :: ext :: subxt_core :: ext :: scale_decode :: DecodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: scale_encode :: EncodeAsType,
 	Debug,
 )]
-# [codec (crate = :: subxt :: ext :: codec)]
-#[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-#[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
+# [codec (crate = :: subxt :: ext :: subxt_core :: ext :: codec)]
+#[decode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_decode")]
+#[encode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_encode")]
 pub struct RegionId {
 	pub begin: u32,
 	pub core: u16,
 	pub mask: CoreMask,
 }
 
 #[derive(
-	:: subxt :: ext :: codec :: Decode,
-	:: subxt :: ext :: codec :: Encode,
-	:: subxt :: ext :: scale_decode :: DecodeAsType,
-	:: subxt :: ext :: scale_encode :: EncodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Decode,
+	:: subxt :: ext :: subxt_core :: ext :: codec :: Encode,
+	:: subxt :: ext :: subxt_core :: ext :: scale_decode :: DecodeAsType,
+	:: subxt :: ext :: subxt_core :: ext :: scale_encode :: EncodeAsType,
 	Debug,
 )]
-# [codec (crate = :: subxt :: ext :: codec)]
-#[decode_as_type(crate_path = ":: subxt :: ext :: scale_decode")]
-#[encode_as_type(crate_path = ":: subxt :: ext :: scale_encode")]
+# [codec (crate = :: subxt :: ext :: subxt_core :: ext :: codec)]
+#[decode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_decode")]
+#[encode_as_type(crate_path = ":: subxt :: ext :: subxt_core :: ext :: scale_encode")]
 pub struct Assigned {
 	pub region_id: RegionId,
 	pub duration: u32,
 	pub task: u32,
 }
 
-impl ::subxt::events::StaticEvent for Assigned {
+impl ::subxt::ext::subxt_core::events::StaticEvent for Assigned {
 	const PALLET: &'static str = "Broker";
 	const EVENT: &'static str = "Assigned";
 }

client/coretime/common/Cargo.toml

@@ -16,6 +16,7 @@ tracing = { workspace = true }
 schnellru = { workspace = true }
 log = { workspace = true }
 subxt = { workspace = true, features = ["substrate-compat"]}
+scale-info = { workspace = true, features = ["derive", "serde"] }
 
 mp-coretime-common = { path = "../../../primitives/coretime/common"}
 
@@ -42,6 +43,7 @@ substrate-prometheus-endpoint = {  workspace = true }
 sc-service = { workspace = true }
 pallet-broker = { workspace = true}
 sp-storage = {  workspace = true }
+frame-support = {  workspace = true }
 
 # Cumulus
 cumulus-client-consensus-common = {  workspace = true }