Cleaning before kilt-dip-support

Cargo.toml

@@ -62,7 +62,6 @@ parachain-staking = {path = "pallets/parachain-staking", default-features = fals
 public-credentials = {path = "pallets/public-credentials", default-features = false}
 
 # Internal support (with default disabled)
-dip-support = {path = "crates/dip-support", default-features = false}
 kilt-asset-dids = {path = "crates/assets", default-features = false}
 kilt-dip-support = {path = "crates/kilt-dip-support", default-features = false}
 kilt-support = {path = "support", default-features = false}

crates/kilt-dip-support/Cargo.toml

@@ -16,7 +16,6 @@ hash-db.workspace = true
 
 # Internal dependencies
 did.workspace = true
-dip-support.workspace = true
 pallet-dip-consumer.workspace = true
 pallet-dip-provider.workspace = true
 pallet-relay-store.workspace = true
@@ -52,7 +51,6 @@ default = ["std"]
 std = [
   "hash-db/std",
   "did/std",
-  "dip-support/std",
   "pallet-dip-consumer/std",
   "pallet-dip-provider/std",
   "pallet-relay-store/std",

dip-template/runtimes/dip-consumer/Cargo.toml

@@ -19,7 +19,6 @@ scale-info = {workspace = true, features = ["derive"]}
 
 # DIP
 dip-provider-runtime-template.workspace = true
-dip-support.workspace = true
 did.workspace = true
 kilt-dip-support.workspace = true
 pallet-did-lookup.workspace = true
@@ -80,7 +79,6 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
   "dip-provider-runtime-template/std",
-  "dip-support/std",
   "did/std",
   "kilt-dip-support/std",
   "pallet-did-lookup/std",

dip-template/runtimes/dip-consumer/src/dip.rs

@@ -177,5 +177,5 @@ mod dip_call_origin_filter_tests {
 }
 
 impl pallet_relay_store::Config for Runtime {
-	type MaxBlocks = ConstU32<100>;
+	type MaxRelayBlocksStored = ConstU32<100>;
 }

dip-template/runtimes/dip-provider/Cargo.toml

@@ -19,7 +19,6 @@ scale-info = {workspace = true, features = ["derive"]}
 
 # DIP
 did.workspace = true
-dip-support.workspace = true
 kilt-dip-support.workspace = true
 kilt-runtime-api-dip-provider.workspace = true
 pallet-did-lookup.workspace = true
@@ -78,7 +77,6 @@ std = [
 	"parity-scale-codec/std",
 	"scale-info/std",
   "did/std",
-  "dip-support/std",
   "kilt-dip-support/std",
   "kilt-runtime-api-dip-provider/std",
   "pallet-did-lookup/std",

dip-template/runtimes/dip-provider/src/lib.rs

@@ -140,7 +140,7 @@ construct_runtime!(
 		Web3Names: pallet_web3_names = 32,
 
 		// DIP
-		DipProvider: pallet_dip_provider = 50,
+		DipProvider: pallet_dip_provider = 40,
 	}
 );
 

pallets/pallet-relay-store/src/lib.rs

@@ -28,10 +28,7 @@ pub use crate::pallet::*;
 pub mod pallet {
 	use super::*;
 
-	use frame_support::{
-		pallet_prelude::{ValueQuery, *},
-		BoundedVec,
-	};
+	use frame_support::{pallet_prelude::*, BoundedVec};
 	use frame_system::pallet_prelude::*;
 	use sp_core::H256;
 
@@ -43,14 +40,16 @@ pub mod pallet {
 	#[pallet::getter(fn latest_relay_head_for_block)]
 	pub(crate) type LatestRelayHeads<T: Config> = StorageMap<_, Twox64Concat, u32, RelayParentInfo<H256>>;
 
-	// TODO: Use a better data structure for lookups
+	// TODO: Replace this with an array once support for const generics is fully
+	// supported in Substrate.
 	#[pallet::storage]
-	pub(crate) type LatestBlockHeights<T: Config> = StorageValue<_, BoundedVec<u32, T::MaxBlocks>, ValueQuery>;
+	pub(crate) type LatestBlockHeights<T: Config> =
+		StorageValue<_, BoundedVec<u32, T::MaxRelayBlocksStored>, ValueQuery>;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		#[pallet::constant]
-		type MaxBlocks: Get<u32>;
+		type MaxRelayBlocksStored: Get<u32>;
 	}
 
 	#[pallet::pallet]
@@ -65,15 +64,17 @@ pub mod pallet {
 	{
 		fn on_initialize(_n: BlockNumberFor<T>) -> Weight {
 			// Reserve weight to update the last relay state root
+			// TODO: Replace with benchmarked version of `on_finalize(`
 			<T as frame_system::Config>::DbWeight::get().writes(2)
 		}
 
+		// TODO: Benchmarks
 		fn on_finalize(_n: BlockNumberFor<T>) {
 			// Called before the validation data is cleaned in the
 			// parachain_system::on_finalize hook
 			let Some(new_validation_data) = cumulus_pallet_parachain_system::Pallet::<T>::validation_data() else { return; };
-			// Remove old relay block from both storage entries.
 			let mut latest_block_heights = LatestBlockHeights::<T>::get();
+			// Remove old relay block from both storage entries.
 			if latest_block_heights.is_full() {
 				let oldest_block_height = latest_block_heights.remove(0);
 				LatestRelayHeads::<T>::remove(oldest_block_height);
@@ -84,7 +85,6 @@ pub mod pallet {
 			}
 			// Set the new relay block in storage.
 			let relay_block_height = new_validation_data.relay_parent_number;
-			// TODO: Replace hardcoded generics with proper definitions.
 			log::trace!(
 				"Adding new relay block with state root {:#02x?} and number {:?}",
 				new_validation_data.relay_parent_storage_root,
@@ -96,9 +96,13 @@ pub mod pallet {
 					relay_parent_storage_root: new_validation_data.relay_parent_storage_root,
 				},
 			);
-			latest_block_heights
-				.try_push(relay_block_height)
-				.expect("Should never fail to push a new object on the BoundedVec of relay block heights.");
+			let push_res = latest_block_heights.try_push(relay_block_height);
+			if let Err(err) = push_res {
+				log::error!(
+					"Pushing a new relay block to the queue should not fail but it did when adding relay block n. {:?}",
+					err
+				);
+			}
 			LatestBlockHeights::<T>::set(latest_block_heights);
 		}
 	}