feat: benchmarks

crates/kilt-dip-support/Cargo.toml

@@ -24,8 +24,8 @@ pallet-relay-store.workspace = true
 pallet-web3-names.workspace = true
 
 # Parity dependencies
-parity-scale-codec = { workspace = true, features = ["derive"] }
-scale-info = { workspace = true, features = ["derive"] }
+parity-scale-codec = {workspace = true, features = ["derive"]}
+scale-info = {workspace = true, features = ["derive"]}
 
 # Substrate dependencies
 frame-system.workspace = true
@@ -81,6 +81,6 @@ std = [
 ]
 runtime-benchmarks = [
   "pallet-dip-consumer/runtime-benchmarks",
-  "rococo-runtime/runtime-benchmarks",
   "pallet-dip-provider/runtime-benchmarks",
+  "rococo-runtime/runtime-benchmarks"
 ]

crates/kilt-dip-support/src/export/child.rs

@@ -629,7 +629,6 @@ mod v0 {
 			// 1.2 If so, extract the state root from the header
 			let state_root_at_height = proof.relay_header.state_root;
 
-			// FIXME: Compilation error
 			// 2. Verify relay chain proof
 			let provider_parachain_header =
 				ParachainHeadProofVerifier::<RelayChainInfo>::verify_proof_for_parachain_with_root(

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

@@ -124,4 +124,5 @@ impl DipCallOriginFilter<RuntimeCall> for DipCallFilter {
 
 impl pallet_relay_store::Config for Runtime {
 	type MaxRelayBlocksStored = ConstU32<100>;
+	type WeightInfo = ();
 }

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

@@ -35,8 +35,7 @@ impl EnsureOrigin<RuntimeOrigin> for EnsureDipOriginAdapter {
 
 	#[cfg(feature = "runtime-benchmarks")]
 	fn try_successful_origin() -> Result<RuntimeOrigin, ()> {
-		// TODO: Replace with actual DIP origin upon benchmarking
-		Ok(RuntimeOrigin::root())
+		EnsureDipOrigin::<DidIdentifier, AccountId, MerkleProofVerifierOutput>::try_successful_origin()
 	}
 }
 

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

@@ -66,6 +66,9 @@ cumulus-primitives-utility.workspace = true
 pallet-collator-selection.workspace = true
 parachain-info.workspace = true
 
+# Benchmarks
+frame-benchmarking = {workspace = true, optional = true}
+
 [features]
 default = [
 	"std",
@@ -115,7 +118,8 @@ std = [
 	"cumulus-primitives-timestamp/std",
 	"cumulus-primitives-utility/std",
   "pallet-collator-selection/std",
-  "parachain-info/std"
+  "parachain-info/std",
+  "frame-benchmarking?/std",
 ]
 runtime-benchmarks = [
   "did/runtime-benchmarks",
@@ -126,5 +130,6 @@ runtime-benchmarks = [
   "runtime-common/runtime-benchmarks",
   "frame-system/runtime-benchmarks",
   "frame-support/runtime-benchmarks",
-  "pallet-utility/runtime-benchmarks"
+  "pallet-utility/runtime-benchmarks",
+  "frame-benchmarking/runtime-benchmarks",
 ]

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

@@ -434,6 +434,30 @@ impl pallet_web3_names::Config for Runtime {
 	type WeightInfo = ();
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+mod benches {
+	frame_benchmarking::define_benchmarks!(
+		[frame_system, SystemBench::<Runtime>]
+		[cumulus_pallet_parachain_system, ParachainSystem]
+		[pallet_timestamp, Timestamp]
+		[pallet_sudo, Sudo]
+		[pallet_utility, Utility]
+		[pallet_balances, Balances]
+		[pallet_transaction_payment, TransactionPayment]
+		[pallet_authorship, Authorship]
+		[pallet_collator_selection, CollatorSelection]
+		[pallet_session, Session]
+		[pallet_aura, Aura]
+		[cumulus_pallet_aura_ext, AuraExt]
+		[did, Did]
+		[pallet_did_lookup, DidLookup]
+		[pallet_web3_names, Web3Names]
+		[pallet_deposit_storage, DepositStorage]
+		[pallet_dip_provider, DipProvider]
+		[frame_benchmarking::baseline, Baseline::<Runtime>]
+	);
+}
+
 impl_runtime_apis! {
 	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
 		fn slot_duration() -> SlotDuration {

pallets/pallet-deposit-storage/Cargo.toml

@@ -35,19 +35,29 @@ frame-benchmarking = {workspace = true, optional = true}
 pallet-balances = {workspace = true, optional = true}
 
 [features]
-default = [ "std" ]
+default = ["std"]
 std = [
-	"frame-support/std",
-	"frame-system/std",
-	"kilt-support/std",
-	"log/std",
-	"pallet-dip-provider/std",
-	"parity-scale-codec/std",
-	"scale-info/std",
-	"sp-runtime/std",
-	"sp-std/std",
+  "frame-support/std",
+  "frame-system/std",
+  "kilt-support/std",
+  "log/std",
+  "pallet-dip-provider/std",
+  "parity-scale-codec/std",
+  "scale-info/std",
+  "sp-runtime/std",
+  "sp-std/std",
+  "frame-benchmarking?/std",
+  "pallet-balances?/std",
 ]
 
-runtime-benchmarks = [ "frame-benchmarking", "pallet-balances" ]
+runtime-benchmarks = [
+  "frame-support/runtime-benchmarks",
+  "frame-system/runtime-benchmarks",
+  "kilt-support/runtime-benchmarks",
+  "pallet-dip-provider/runtime-benchmarks",
+  "sp-runtime/runtime-benchmarks",
+  "frame-benchmarking/runtime-benchmarks",
+  "pallet-balances/runtime-benchmarks",
+]
 
 try-runtime = [ "kilt-support/try-runtime" ]

pallets/pallet-deposit-storage/src/benchmarking.rs

@@ -28,7 +28,7 @@ use sp_runtime::SaturatedConversion;
 		T::AccountId: Instanciate,
         T: Config + pallet_balances::Config,
         T::Namespace: Default
-) ]
+)]
 mod benchmarks {
 
 	use sp_runtime::BoundedVec;

pallets/pallet-deposit-storage/src/lib.rs

@@ -19,7 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![recursion_limit = "256"]
 
-pub mod default_weights;
+mod default_weights;
 mod deposit;
 pub mod traits;
 

pallets/pallet-did-lookup/src/try_state.rs

@@ -41,7 +41,6 @@ pub(crate) fn do_try_state<T: Config>() -> Result<(), TryRuntimeError> {
 					linked_account_id, did_identifier
 				))
 			);
-
 			Ok(())
 		},
 	)

pallets/pallet-dip-consumer/Cargo.toml

@@ -14,9 +14,9 @@ version.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-kilt-support = {workspace = true, features = ["mock", "try-runtime"]}
 sp-io = {workspace = true, features = ["std"]}
 sp-keystore = {workspace = true, features = ["std"]}
+sp-runtime = {workspace = true, features = ["std"]}
 
 [dependencies]
 frame-support.workspace = true
@@ -29,27 +29,28 @@ sp-std.workspace = true
 
 # Benchmarks
 frame-benchmarking = {workspace = true, optional = true}
-sp-runtime.workspace = true
+sp-runtime = {workspace = true, optional = true}
 
 [features]
 default = [ "std" ]
 
 runtime-benchmarks = [
-	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"kilt-support/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+	"frame-benchmarking",
+  "sp-runtime/runtime-benchmarks",
 ]
 std = [
-	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"kilt-support/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
+  "frame-benchmarking?/std",
+  "sp-runtime?/std",
 ]
 
 try-runtime = [ "kilt-support/try-runtime" ]

pallets/pallet-dip-consumer/src/benchmarking.rs

@@ -30,7 +30,7 @@ use kilt_support::{
 		T::Identifier: Instanciate,
         <<T as Config>::ProofVerifier as IdentityProofVerifier<T>>::Proof: GetWorstCase<IdentityContext<T::Identifier, T::AccountId>>,
         <T as Config>::RuntimeCall: From<frame_system::Call<T>>,
-) ]
+)]
 mod benchmarks {
 
 	use super::*;

pallets/pallet-dip-consumer/src/lib.rs

@@ -20,7 +20,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-pub mod default_weights;
+mod default_weights;
 pub mod identity;
 pub mod traits;
 
@@ -104,7 +104,6 @@ pub mod pallet {
 	pub type Origin<T> =
 		DipOrigin<<T as Config>::Identifier, <T as frame_system::Config>::AccountId, VerificationResultOf<T>>;
 
-	// TODO: Benchmarking
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		// TODO: Replace with a SignedExtra.
@@ -138,6 +137,9 @@ pub mod pallet {
 				details: proof_verification_result,
 			};
 
+			// TODO: Maybe find a nicer way to exclude the call dispatched from the
+			// benchmarks while making sure the call is actually dispatched and passes any
+			// filters the consumer proof verifier has set.
 			#[cfg(not(feature = "runtime-benchmark"))]
 			let _ = call.dispatch(did_origin.into()).map_err(|e| e.error)?;
 			Ok(())

pallets/pallet-dip-provider/Cargo.toml

@@ -14,9 +14,10 @@ version.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-kilt-support = {workspace = true, features = ["mock", "try-runtime"]}
+kilt-support = {workspace = true, features = ["std", "mock", "try-runtime"]}
 sp-io = {workspace = true, features = ["std"]}
 sp-keystore = {workspace = true, features = ["std"]}
+sp-runtime = {workspace = true, features = ["std"]}
 
 [dependencies]
 did.workspace = true
@@ -30,30 +31,30 @@ sp-std.workspace = true
 
 # Benchmarks
 frame-benchmarking = {workspace = true, optional = true}
-sp-io = {workspace = true, optional = true}
-sp-runtime.workspace = true
+sp-runtime = {workspace = true, optional = true}
 
 [features]
 default = [ "std" ]
 
 runtime-benchmarks = [
 	"did/runtime-benchmarks",
-	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"kilt-support/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
+  "frame-benchmarking",
+  "sp-runtime/runtime-benchmarks",
 ]
 std = [
 	"did/std",
-	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
 	"kilt-support/std",
 	"parity-scale-codec/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-std/std",
+  "frame-benchmarking?/std",
+  "sp-runtime?/std",
 ]
 
 try-runtime = [ "did/try-runtime", "kilt-support/try-runtime" ]

pallets/pallet-migration/src/mock.rs

@@ -375,9 +375,9 @@ pub mod runtime {
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	impl kilt_support::traits::GetWorstCase for TestSubjectId {
+	impl<Context> kilt_support::traits::GetWorstCase<Context> for TestSubjectId {
 		// Only used for benchmark testing, not really relevant.
-		fn worst_case(_context: ()) -> Self {
+		fn worst_case(_context: Context) -> Self {
 			crate::mock::TestSubjectId::default()
 		}
 	}

pallets/pallet-relay-store/Cargo.toml

@@ -16,6 +16,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dev-dependencies]
 cumulus-primitives-core = { workspace = true, features = ["std"] }
 sp-io = {workspace = true, features = ["std"]}
+sp-keystore = {workspace = true, features = ["std"]}
+sp-runtime = {workspace = true, features = ["std"]}
 
 [dependencies]
 cumulus-pallet-parachain-system.workspace = true
@@ -25,12 +27,11 @@ log.workspace = true
 parity-scale-codec = {workspace = true, features = ["derive"]}
 scale-info = {workspace = true, features = ["derive"]}
 sp-core.workspace = true
-sp-keystore = {workspace = true, optional = true}
-sp-runtime.workspace = true
 sp-std.workspace = true
 
 # Benchmarks
 frame-benchmarking = {workspace = true, optional = true}
+sp-runtime = {workspace = true, optional = true}
 
 [features]
 default = ["std"]
@@ -41,14 +42,14 @@ std = [
   "parity-scale-codec/std",
   "scale-info/std",
   "sp-core/std",
-  "sp-runtime/std",
   "sp-std/std",
   "frame-benchmarking?/std",
+  "sp-runtime?/std",
 ]
 runtime-benchmarks = [
   "cumulus-pallet-parachain-system/runtime-benchmarks",
   "frame-support/runtime-benchmarks",
   "frame-system/runtime-benchmarks",
   "frame-benchmarking",
-  "sp-keystore"
+  "sp-runtime/runtime-benchmarks",
 ]