From c1a67c3b1f20d21edfd0edbd3fa34564f413bb63 Mon Sep 17 00:00:00 2001
From: Kai <7630809+Kailai-Wang@users.noreply.github.com>
Date: Thu, 10 Feb 2022 18:50:30 +0100
Subject: [PATCH] Update benchmark and weights for litmus (#339)

* fix handling of * pallets

* fix typo

* do not benchmark pallet_scheduler

* [benchmarking bot] Auto commit generated weights files (#338)

Co-authored-by: Kailai-Wang <Kailai-Wang@users.noreply.github.com>

* enable frame_system weights

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kailai-Wang <Kailai-Wang@users.noreply.github.com>
---
 Cargo.lock                                    |  17 ++-
 runtime/litentry/src/lib.rs                   |   8 +-
 runtime/litentry/src/weights/mod.rs           |   2 +-
 runtime/litmus/src/lib.rs                     |  22 ++--
 runtime/litmus/src/weights/frame_system.rs    |  18 +--
 runtime/litmus/src/weights/mod.rs             |   4 +-
 runtime/litmus/src/weights/pallet_balances.rs |  20 ++--
 .../src/weights/pallet_collator_selection.rs  |  34 +++---
 .../litmus/src/weights/pallet_collective.rs   |  92 +++++++--------
 .../litmus/src/weights/pallet_democracy.rs    | 110 +++++++++---------
 runtime/litmus/src/weights/pallet_drop3.rs    |  26 +++--
 .../src/weights/pallet_extrinsic_filter.rs    |  18 +--
 .../litmus/src/weights/pallet_membership.rs   |  38 +++---
 runtime/litmus/src/weights/pallet_multisig.rs |  58 ++++-----
 runtime/litmus/src/weights/pallet_proxy.rs    |  74 ++++++------
 .../litmus/src/weights/pallet_timestamp.rs    |  10 +-
 runtime/litmus/src/weights/pallet_treasury.rs |  22 ++--
 runtime/litmus/src/weights/pallet_utility.rs  |  22 ++--
 scripts/benchmark-weight-remote.sh            |  14 ++-
 19 files changed, 307 insertions(+), 302 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4a5f11838..3966ce52e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1270,9 +1270,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
+checksum = "a4600d695eb3f6ce1cd44e6e291adceb2cc3ab12f20a33777ecd0bf6eba34e06"
 dependencies = [
  "generic-array 0.14.5",
 ]
@@ -1859,13 +1859,12 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
+checksum = "8cb780dce4f9a8f5c087362b3a4595936b2019e7c8b30f2c3e9a7e94e6ae9837"
 dependencies = [
  "block-buffer 0.10.2",
  "crypto-common",
- "generic-array 0.14.5",
 ]
 
 [[package]]
@@ -4476,9 +4475,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe3179b85e1fd8b14447cbebadb75e45a1002f541b925f0bfec366d56a81c56d"
+checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f"
 dependencies = [
  "libc",
 ]
@@ -8217,7 +8216,7 @@ version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#4aeb95f7f38fcd519e2628f32f79044a8fef99d5"
 dependencies = [
  "impl-trait-for-tuples",
- "memmap2 0.5.2",
+ "memmap2 0.5.3",
  "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-network",
@@ -9315,7 +9314,7 @@ checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures 0.2.1",
- "digest 0.10.1",
+ "digest 0.10.2",
 ]
 
 [[package]]
diff --git a/runtime/litentry/src/lib.rs b/runtime/litentry/src/lib.rs
index 139a9d879e..cd617c2825 100644
--- a/runtime/litentry/src/lib.rs
+++ b/runtime/litentry/src/lib.rs
@@ -421,9 +421,11 @@ impl pallet_scheduler::Config for Runtime {
 	type MaximumWeight = MaximumSchedulerWeight;
 	type ScheduleOrigin = EnsureRoot<AccountId>;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = (); // TODO: to be rerun - weights::pallet_scheduler::WeightInfo<Runtime>;
+	// TODO: we might need non-empty PreimageProvider (see below) to run the benchmark,
+	// otherwise I get: panicked at 'called `Result::unwrap()` on an `Err` value: ()'
+	type WeightInfo = ();
 	type OriginPrivilegeCmp = frame_support::traits::EqualPrivilegeOnly;
-	type PreimageProvider = (); // TODO: maybe use pallet_preimage
+	type PreimageProvider = ();
 	type NoPreimagePostponement = ();
 }
 
@@ -1022,13 +1024,13 @@ extern crate frame_benchmarking;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
+	// TODO: pallet_scheduler
 	define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
 		[pallet_utility, Utility]
-		[pallet_scheduler, Scheduler]
 		[pallet_treasury, Treasury]
 		[pallet_democracy, Democracy]
 		[pallet_collective, Council]
diff --git a/runtime/litentry/src/weights/mod.rs b/runtime/litentry/src/weights/mod.rs
index b9e29323d1..05ee5ccf62 100644
--- a/runtime/litentry/src/weights/mod.rs
+++ b/runtime/litentry/src/weights/mod.rs
@@ -24,7 +24,7 @@ pub mod pallet_democracy;
 pub mod pallet_membership;
 pub mod pallet_multisig;
 pub mod pallet_proxy;
-// pub mod pallet_scheduler; // TODO: to be rerun
+// pub mod pallet_scheduler; // TODO: see comment in code
 pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_utility;
diff --git a/runtime/litmus/src/lib.rs b/runtime/litmus/src/lib.rs
index d18681f378..72163ca0c2 100644
--- a/runtime/litmus/src/lib.rs
+++ b/runtime/litmus/src/lib.rs
@@ -251,17 +251,7 @@ impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = ExtrinsicFilter;
 	/// Weight information for the extrinsics of this pallet.
-	///
-	/// TODO:
-	/// use () for polkadot-v0.9.13 version as the generated frame_system weigts
-	/// breaks compilation: missing trait implementation `set_changes_trie_config`.
-	/// It looks like an upstream issue.
-	///
-	/// our runtime/src/weights/frame_system.rs is intentionally not updated.
-	///
-	/// Also note the statemine code:
-	/// https://github.com/paritytech/cumulus/blob/master/polkadot-parachains/statemine/src/lib.rs#L152
-	type SystemWeightInfo = ();
+	type SystemWeightInfo = weights::frame_system::WeightInfo<Runtime>;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
 	/// The maximum length of a block (in bytes).
@@ -393,7 +383,7 @@ impl pallet_timestamp::Config for Runtime {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -421,9 +411,11 @@ impl pallet_scheduler::Config for Runtime {
 	type MaximumWeight = MaximumSchedulerWeight;
 	type ScheduleOrigin = EnsureRoot<AccountId>;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = (); // TODO: to be rerun - weights::pallet_scheduler::WeightInfo<Runtime>;
+	// TODO: we might need non-empty PreimageProvider (see below) to run the benchmark,
+	// otherwise I get: panicked at 'called `Result::unwrap()` on an `Err` value: ()'
+	type WeightInfo = ();
 	type OriginPrivilegeCmp = frame_support::traits::EqualPrivilegeOnly;
-	type PreimageProvider = (); // TODO: maybe use pallet_preimage
+	type PreimageProvider = ();
 	type NoPreimagePostponement = ();
 }
 
@@ -1022,13 +1014,13 @@ extern crate frame_benchmarking;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
+	// TODO: pallet_scheduler
 	define_benchmarks!(
 		[frame_system, SystemBench::<Runtime>]
 		[pallet_balances, Balances]
 		[pallet_timestamp, Timestamp]
 		[pallet_collator_selection, CollatorSelection]
 		[pallet_utility, Utility]
-		[pallet_scheduler, Scheduler]
 		[pallet_treasury, Treasury]
 		[pallet_democracy, Democracy]
 		[pallet_collective, Council]
diff --git a/runtime/litmus/src/weights/frame_system.rs b/runtime/litmus/src/weights/frame_system.rs
index f0ca33d07f..417415b235 100644
--- a/runtime/litmus/src/weights/frame_system.rs
+++ b/runtime/litmus/src/weights/frame_system.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `frame_system`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -58,29 +58,29 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	// Storage: System Digest (r:1 w:1)
 	// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
 	fn set_heap_pages() -> Weight {
-		(5_553_000 as Weight)
+		(4_475_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn set_storage(i: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 14_000
-			.saturating_add((1_079_000 as Weight).saturating_mul(i as Weight))
+			// Standard Error: 0
+			.saturating_add((774_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_storage(i: u32, ) -> Weight {
-		(2_204_000 as Weight)
+		(0 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((667_000 as Weight).saturating_mul(i as Weight))
+			.saturating_add((545_000 as Weight).saturating_mul(i as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
 	}
 	// Storage: Skipped Metadata (r:0 w:0)
 	fn kill_prefix(p: u32, ) -> Weight {
 		(0 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((1_147_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((1_209_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
 	}
 }
diff --git a/runtime/litmus/src/weights/mod.rs b/runtime/litmus/src/weights/mod.rs
index 36a2639c55..6fabaf7bc8 100644
--- a/runtime/litmus/src/weights/mod.rs
+++ b/runtime/litmus/src/weights/mod.rs
@@ -16,7 +16,7 @@
 
 #![allow(clippy::unnecessary_cast)]
 
-// pub mod frame_system; // commented out, see lib.rs where `SystemWeightInfo = ()`
+pub mod frame_system;
 pub mod pallet_balances;
 pub mod pallet_collator_selection;
 pub mod pallet_collective;
@@ -26,7 +26,7 @@ pub mod pallet_extrinsic_filter;
 pub mod pallet_membership;
 pub mod pallet_multisig;
 pub mod pallet_proxy;
-// pub mod pallet_scheduler; // to be rerun
+// pub mod pallet_scheduler; // TODO: see comment in code
 pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_utility;
diff --git a/runtime/litmus/src/weights/pallet_balances.rs b/runtime/litmus/src/weights/pallet_balances.rs
index e347219890..11a77470d1 100644
--- a/runtime/litmus/src/weights/pallet_balances.rs
+++ b/runtime/litmus/src/weights/pallet_balances.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_balances`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -47,43 +47,43 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 	// Storage: System Account (r:1 w:1)
 	fn transfer() -> Weight {
-		(81_411_000 as Weight)
+		(66_436_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_keep_alive() -> Weight {
-		(60_220_000 as Weight)
+		(48_796_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_creating() -> Weight {
-		(33_668_000 as Weight)
+		(29_722_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn set_balance_killing() -> Weight {
-		(40_566_000 as Weight)
+		(35_120_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:2 w:2)
 	fn force_transfer() -> Weight {
-		(82_634_000 as Weight)
+		(66_224_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn transfer_all() -> Weight {
-		(74_036_000 as Weight)
+		(58_549_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: System Account (r:1 w:1)
 	fn force_unreserve() -> Weight {
-		(30_514_000 as Weight)
+		(25_994_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_collator_selection.rs b/runtime/litmus/src/weights/pallet_collator_selection.rs
index 921b9650c4..ed19302662 100644
--- a/runtime/litmus/src/weights/pallet_collator_selection.rs
+++ b/runtime/litmus/src/weights/pallet_collator_selection.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_collator_selection`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -47,19 +47,19 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightInfo<T> {
 	// Storage: CollatorSelection Invulnerables (r:0 w:1)
 	fn set_invulnerables(b: u32, ) -> Weight {
-		(17_807_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((58_000 as Weight).saturating_mul(b as Weight))
+		(15_534_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((40_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: CollatorSelection DesiredCandidates (r:0 w:1)
 	fn set_desired_candidates() -> Weight {
-		(20_417_000 as Weight)
+		(17_168_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: CollatorSelection CandidacyBond (r:0 w:1)
 	fn set_candidacy_bond() -> Weight {
-		(16_976_000 as Weight)
+		(14_503_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: CollatorSelection Candidates (r:1 w:1)
@@ -69,18 +69,18 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	// Storage: CollatorSelection CandidacyBond (r:1 w:0)
 	// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
 	fn register_as_candidate(c: u32, ) -> Weight {
-		(78_609_000 as Weight)
+		(67_209_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((384_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((356_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: CollatorSelection Candidates (r:1 w:1)
 	// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
 	fn leave_intent(c: u32, ) -> Weight {
-		(57_674_000 as Weight)
+		(48_300_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((466_000 as Weight).saturating_mul(c as Weight))
+			.saturating_add((461_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -88,7 +88,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	// Storage: System BlockWeight (r:1 w:1)
 	// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1)
 	fn note_author() -> Weight {
-		(72_296_000 as Weight)
+		(58_231_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -99,10 +99,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 	// Storage: System BlockWeight (r:1 w:1)
 	fn new_session(r: u32, c: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 1_344_000
-			.saturating_add((11_063_000 as Weight).saturating_mul(r as Weight))
-			// Standard Error: 1_344_000
-			.saturating_add((44_150_000 as Weight).saturating_mul(c as Weight))
+			// Standard Error: 1_128_000
+			.saturating_add((8_978_000 as Weight).saturating_mul(r as Weight))
+			// Standard Error: 1_128_000
+			.saturating_add((37_284_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
diff --git a/runtime/litmus/src/weights/pallet_collective.rs b/runtime/litmus/src/weights/pallet_collective.rs
index f6ebc759a6..d56aa684e6 100644
--- a/runtime/litmus/src/weights/pallet_collective.rs
+++ b/runtime/litmus/src/weights/pallet_collective.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_collective`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -51,12 +51,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: Council Prime (r:0 w:1)
 	fn set_members(m: u32, n: u32, p: u32, ) -> Weight {
 		(0 as Weight)
-			// Standard Error: 18_000
-			.saturating_add((22_060_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 18_000
-			.saturating_add((154_000 as Weight).saturating_mul(n as Weight))
-			// Standard Error: 18_000
-			.saturating_add((28_229_000 as Weight).saturating_mul(p as Weight))
+			// Standard Error: 13_000
+			.saturating_add((20_800_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 13_000
+			.saturating_add((87_000 as Weight).saturating_mul(n as Weight))
+			// Standard Error: 13_000
+			.saturating_add((26_713_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -66,11 +66,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn execute(b: u32, m: u32, ) -> Weight {
-		(34_541_000 as Weight)
+		(29_989_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 3_000
-			.saturating_add((116_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((115_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	// Storage: Council Members (r:1 w:0)
@@ -78,11 +78,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
-		(39_616_000 as Weight)
+		(34_591_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((4_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 2_000
-			.saturating_add((221_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 0
+			.saturating_add((209_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 	}
 	// Storage: Council Members (r:1 w:0)
@@ -91,22 +91,22 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: Council ProposalCount (r:1 w:1)
 	// Storage: Council Voting (r:0 w:1)
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
-		(41_729_000 as Weight)
+		(30_902_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((12_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 2_000
-			.saturating_add((118_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((120_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 2_000
-			.saturating_add((526_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((410_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	// Storage: Council Members (r:1 w:0)
 	// Storage: Council Voting (r:1 w:1)
 	fn vote(m: u32, ) -> Weight {
-		(49_987_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((311_000 as Weight).saturating_mul(m as Weight))
+		(44_021_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((270_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -115,11 +115,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: Council Proposals (r:1 w:1)
 	// Storage: Council ProposalOf (r:0 w:1)
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
-		(49_915_000 as Weight)
+		(42_561_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((229_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((435_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((219_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 3_000
+			.saturating_add((336_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -130,13 +130,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	// Storage: Council Proposals (r:1 w:1)
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(59_617_000 as Weight)
+		(48_893_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((16_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((10_000 as Weight).saturating_mul(b as Weight))
 			// Standard Error: 3_000
-			.saturating_add((287_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((302_000 as Weight).saturating_mul(m as Weight))
 			// Standard Error: 3_000
-			.saturating_add((612_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((479_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(7 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -146,11 +146,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: Council Proposals (r:1 w:1)
 	// Storage: Council ProposalOf (r:0 w:1)
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
-		(55_122_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((230_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 2_000
-			.saturating_add((432_000 as Weight).saturating_mul(p as Weight))
+		(42_610_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((265_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 3_000
+			.saturating_add((364_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -162,13 +162,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	// Storage: Council Proposals (r:1 w:1)
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
-		(61_200_000 as Weight)
+		(47_896_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((14_000 as Weight).saturating_mul(b as Weight))
-			// Standard Error: 3_000
-			.saturating_add((312_000 as Weight).saturating_mul(m as Weight))
-			// Standard Error: 3_000
-			.saturating_add((620_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((12_000 as Weight).saturating_mul(b as Weight))
+			// Standard Error: 2_000
+			.saturating_add((319_000 as Weight).saturating_mul(m as Weight))
+			// Standard Error: 2_000
+			.saturating_add((511_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -176,9 +176,9 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	// Storage: Council Voting (r:0 w:1)
 	// Storage: Council ProposalOf (r:0 w:1)
 	fn disapprove_proposal(p: u32, ) -> Weight {
-		(31_398_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((496_000 as Weight).saturating_mul(p as Weight))
+		(24_939_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((392_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_democracy.rs b/runtime/litmus/src/weights/pallet_democracy.rs
index 1d2fe9e2a8..8082036f39 100644
--- a/runtime/litmus/src/weights/pallet_democracy.rs
+++ b/runtime/litmus/src/weights/pallet_democracy.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_democracy`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -50,15 +50,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy Blacklist (r:1 w:0)
 	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(83_031_000 as Weight)
+		(72_558_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy DepositOf (r:1 w:1)
 	fn second(s: u32, ) -> Weight {
-		(44_837_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((257_000 as Weight).saturating_mul(s as Weight))
+		(45_148_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((259_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -66,9 +66,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(51_989_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((221_000 as Weight).saturating_mul(r as Weight))
+		(59_066_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((229_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -76,16 +76,16 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(51_116_000 as Weight)
+		(58_936_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((240_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((225_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Democracy Cancellations (r:1 w:1)
 	fn emergency_cancel() -> Weight {
-		(30_045_000 as Weight)
+		(26_464_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -96,45 +96,45 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn blacklist(p: u32, ) -> Weight {
-		(97_644_000 as Weight)
-			// Standard Error: 16_000
-			.saturating_add((741_000 as Weight).saturating_mul(p as Weight))
+		(82_035_000 as Weight)
+			// Standard Error: 13_000
+			.saturating_add((637_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(7 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(15_125_000 as Weight)
+		(13_566_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((112_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((110_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_majority() -> Weight {
-		(3_258_000 as Weight)
+		(2_426_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(3_409_000 as Weight)
+		(2_557_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy ReferendumCount (r:1 w:1)
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn fast_track() -> Weight {
-		(31_484_000 as Weight)
+		(27_200_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:1)
 	fn veto_external(v: u32, ) -> Weight {
-		(34_316_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((123_000 as Weight).saturating_mul(v as Weight))
+		(29_143_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((137_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -142,23 +142,23 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(78_054_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((590_000 as Weight).saturating_mul(p as Weight))
+		(65_529_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((489_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(18_613_000 as Weight)
+		(16_392_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Scheduler Lookup (r:1 w:1)
 	// Storage: Scheduler Agenda (r:1 w:1)
 	fn cancel_queued(r: u32, ) -> Weight {
-		(35_213_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_552_000 as Weight).saturating_mul(r as Weight))
+		(32_671_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((1_505_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -166,9 +166,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(4_043_000 as Weight)
-			// Standard Error: 33_000
-			.saturating_add((6_553_000 as Weight).saturating_mul(r as Weight))
+		(4_338_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((6_085_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -180,9 +180,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy PublicProps (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		(15_549_000 as Weight)
+		(11_906_000 as Weight)
 			// Standard Error: 6_000
-			.saturating_add((6_325_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((6_113_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -191,9 +191,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(67_918_000 as Weight)
-			// Standard Error: 6_000
-			.saturating_add((8_406_000 as Weight).saturating_mul(r as Weight))
+		(53_483_000 as Weight)
+			// Standard Error: 8_000
+			.saturating_add((7_715_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -202,9 +202,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy VotingOf (r:2 w:2)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(45_842_000 as Weight)
-			// Standard Error: 57_000
-			.saturating_add((8_315_000 as Weight).saturating_mul(r as Weight))
+		(24_615_000 as Weight)
+			// Standard Error: 7_000
+			.saturating_add((7_620_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -212,12 +212,12 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(3_664_000 as Weight)
+		(2_580_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_preimage(b: u32, ) -> Weight {
-		(46_802_000 as Weight)
+		(38_953_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -225,7 +225,7 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(32_452_000 as Weight)
+		(27_160_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -234,7 +234,7 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Democracy Preimages (r:1 w:1)
 	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(44_025_000 as Weight)
+		(40_670_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
@@ -244,9 +244,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(44_746_000 as Weight)
+		(40_424_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((129_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((77_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -254,27 +254,27 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(41_074_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((256_000 as Weight).saturating_mul(r as Weight))
+		(38_311_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((191_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_vote(r: u32, ) -> Weight {
-		(23_460_000 as Weight)
+		(22_919_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((229_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((178_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Democracy VotingOf (r:1 w:1)
 	fn remove_other_vote(r: u32, ) -> Weight {
-		(23_383_000 as Weight)
+		(22_750_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((239_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((206_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_drop3.rs b/runtime/litmus/src/weights/pallet_drop3.rs
index befc3f3f99..e3f90359b3 100644
--- a/runtime/litmus/src/weights/pallet_drop3.rs
+++ b/runtime/litmus/src/weights/pallet_drop3.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_drop3`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -47,14 +47,14 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_drop3::WeightInfo for WeightInfo<T> {
 	// Storage: Drop3 Admin (r:1 w:1)
 	fn set_admin() -> Weight {
-		(19_814_000 as Weight)
+		(17_358_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Drop3 Admin (r:1 w:0)
 	// Storage: Drop3 RewardPools (r:1 w:1)
 	fn approve_reward_pool() -> Weight {
-		(40_457_000 as Weight)
+		(26_497_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -63,21 +63,21 @@ impl<T: frame_system::Config> pallet_drop3::WeightInfo for WeightInfo<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Drop3 RewardPoolOwners (r:0 w:1)
 	fn reject_reward_pool() -> Weight {
-		(96_791_000 as Weight)
+		(77_520_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Drop3 RewardPools (r:1 w:1)
 	// Storage: Drop3 Admin (r:1 w:0)
 	fn start_reward_pool() -> Weight {
-		(30_066_000 as Weight)
+		(26_405_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Drop3 RewardPools (r:1 w:1)
 	// Storage: Drop3 Admin (r:1 w:0)
 	fn stop_reward_pool() -> Weight {
-		(31_609_000 as Weight)
+		(28_282_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -86,7 +86,7 @@ impl<T: frame_system::Config> pallet_drop3::WeightInfo for WeightInfo<T> {
 	// Storage: System Account (r:1 w:1)
 	// Storage: Drop3 RewardPoolOwners (r:0 w:1)
 	fn close_reward_pool() -> Weight {
-		(59_133_000 as Weight)
+		(49_473_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -94,15 +94,17 @@ impl<T: frame_system::Config> pallet_drop3::WeightInfo for WeightInfo<T> {
 	// Storage: Drop3 CurrentMaxPoolId (r:1 w:1)
 	// Storage: Drop3 RewardPoolOwners (r:0 w:1)
 	// Storage: Drop3 RewardPools (r:0 w:1)
-	fn propose_reward_pool(_n: u32, ) -> Weight {
-		(53_078_000 as Weight)
+	fn propose_reward_pool(n: u32, ) -> Weight {
+		(43_791_000 as Weight)
+			// Standard Error: 6_000
+			.saturating_add((19_000 as Weight).saturating_mul(n as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	// Storage: Drop3 RewardPools (r:1 w:1)
 	// Storage: System Account (r:2 w:2)
 	fn send_reward() -> Weight {
-		(61_439_000 as Weight)
+		(53_089_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_extrinsic_filter.rs b/runtime/litmus/src/weights/pallet_extrinsic_filter.rs
index 4741c74d54..47f97d6bc1 100644
--- a/runtime/litmus/src/weights/pallet_extrinsic_filter.rs
+++ b/runtime/litmus/src/weights/pallet_extrinsic_filter.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_extrinsic_filter`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -47,21 +47,21 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_extrinsic_filter::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:1 w:1)
 	fn block_extrinsics(p: u32, f: u32, ) -> Weight {
-		(23_745_000 as Weight)
+		(21_051_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(p as Weight))
 			// Standard Error: 0
-			.saturating_add((5_000 as Weight).saturating_mul(f as Weight))
+			.saturating_add((4_000 as Weight).saturating_mul(f as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:1 w:1)
 	fn unblock_extrinsics(p: u32, f: u32, ) -> Weight {
-		(23_503_000 as Weight)
+		(22_447_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((11_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(p as Weight))
 			// Standard Error: 0
-			.saturating_add((10_000 as Weight).saturating_mul(f as Weight))
+			.saturating_add((8_000 as Weight).saturating_mul(f as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_membership.rs b/runtime/litmus/src/weights/pallet_membership.rs
index 4736abdfb7..15d85bcb0c 100644
--- a/runtime/litmus/src/weights/pallet_membership.rs
+++ b/runtime/litmus/src/weights/pallet_membership.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_membership`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -50,9 +50,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn add_member(m: u32, ) -> Weight {
-		(27_638_000 as Weight)
+		(24_436_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((140_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((132_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -62,9 +62,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn remove_member(m: u32, ) -> Weight {
-		(33_048_000 as Weight)
+		(29_101_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((135_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((130_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -74,9 +74,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn swap_member(m: u32, ) -> Weight {
-		(33_177_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((152_000 as Weight).saturating_mul(m as Weight))
+		(29_178_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((154_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -86,9 +86,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn reset_member(m: u32, ) -> Weight {
-		(32_614_000 as Weight)
-			// Standard Error: 3_000
-			.saturating_add((385_000 as Weight).saturating_mul(m as Weight))
+		(29_135_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((302_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -98,9 +98,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn change_key(m: u32, ) -> Weight {
-		(35_470_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((142_000 as Weight).saturating_mul(m as Weight))
+		(30_523_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((152_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
@@ -108,7 +108,7 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: CouncilMembership Prime (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn set_prime(m: u32, ) -> Weight {
-		(9_091_000 as Weight)
+		(7_829_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((108_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -117,9 +117,9 @@ impl<T: frame_system::Config> pallet_membership::WeightInfo for WeightInfo<T> {
 	// Storage: CouncilMembership Prime (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
 	fn clear_prime(m: u32, ) -> Weight {
-		(3_744_000 as Weight)
+		(2_779_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((6_000 as Weight).saturating_mul(m as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(m as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 }
diff --git a/runtime/litmus/src/weights/pallet_multisig.rs b/runtime/litmus/src/weights/pallet_multisig.rs
index f476c39766..d90232b429 100644
--- a/runtime/litmus/src/weights/pallet_multisig.rs
+++ b/runtime/litmus/src/weights/pallet_multisig.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_multisig`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -48,7 +48,7 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn as_multi_threshold_1(z: u32, ) -> Weight {
-		(39_811_000 as Weight)
+		(36_736_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
@@ -56,11 +56,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: Multisig Multisigs (r:1 w:1)
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create(s: u32, z: u32, ) -> Weight {
-		(67_350_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((198_000 as Weight).saturating_mul(s as Weight))
+		(53_531_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((183_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((1_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -68,9 +68,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: Multisig Calls (r:1 w:1)
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-		(74_110_000 as Weight)
+		(59_343_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((207_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((186_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
@@ -78,9 +78,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	}
 	// Storage: Multisig Multisigs (r:1 w:1)
 	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-		(38_136_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((195_000 as Weight).saturating_mul(s as Weight))
+		(33_780_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((187_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -89,11 +89,11 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: Multisig Multisigs (r:1 w:1)
 	// Storage: Multisig Calls (r:1 w:1)
 	fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-		(68_278_000 as Weight)
+		(56_523_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((188_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((195_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(z as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -103,9 +103,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-		(95_439_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((358_000 as Weight).saturating_mul(s as Weight))
+		(79_131_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((341_000 as Weight).saturating_mul(s as Weight))
 			// Standard Error: 0
 			.saturating_add((4_000 as Weight).saturating_mul(z as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
@@ -114,18 +114,18 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: Multisig Multisigs (r:1 w:1)
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	fn approve_as_multi_create(s: u32, ) -> Weight {
-		(64_030_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((195_000 as Weight).saturating_mul(s as Weight))
+		(48_448_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((243_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Multisig Multisigs (r:1 w:1)
 	// Storage: Multisig Calls (r:1 w:0)
 	fn approve_as_multi_approve(s: u32, ) -> Weight {
-		(36_441_000 as Weight)
+		(30_140_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((202_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((218_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -135,18 +135,18 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn approve_as_multi_complete(s: u32, ) -> Weight {
-		(126_343_000 as Weight)
+		(106_095_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((395_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((407_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Multisig Multisigs (r:1 w:1)
 	// Storage: Multisig Calls (r:1 w:1)
 	fn cancel_as_multi(s: u32, ) -> Weight {
-		(94_572_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((244_000 as Weight).saturating_mul(s as Weight))
+		(77_732_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((236_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_proxy.rs b/runtime/litmus/src/weights/pallet_proxy.rs
index 7089ed5590..9fef344770 100644
--- a/runtime/litmus/src/weights/pallet_proxy.rs
+++ b/runtime/litmus/src/weights/pallet_proxy.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_proxy`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -49,9 +49,9 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn proxy(p: u32, ) -> Weight {
-		(36_538_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((244_000 as Weight).saturating_mul(p as Weight))
+		(32_599_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((184_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 	}
 	// Storage: Proxy Proxies (r:1 w:0)
@@ -60,33 +60,33 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn proxy_announced(a: u32, p: u32, ) -> Weight {
-		(72_110_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((555_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 2_000
-			.saturating_add((198_000 as Weight).saturating_mul(p as Weight))
+		(62_969_000 as Weight)
+			// Standard Error: 12_000
+			.saturating_add((470_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 13_000
+			.saturating_add((174_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Proxy Announcements (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn remove_announcement(a: u32, p: u32, ) -> Weight {
-		(41_429_000 as Weight)
+		(35_937_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((555_000 as Weight).saturating_mul(a as Weight))
+			.saturating_add((462_000 as Weight).saturating_mul(a as Weight))
 			// Standard Error: 1_000
-			.saturating_add((29_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Proxy Announcements (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn reject_announcement(a: u32, p: u32, ) -> Weight {
-		(37_577_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((659_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 5_000
-			.saturating_add((121_000 as Weight).saturating_mul(p as Weight))
+		(35_306_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((464_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 4_000
+			.saturating_add((42_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -94,52 +94,52 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	// Storage: Proxy Announcements (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn announce(a: u32, p: u32, ) -> Weight {
-		(56_612_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((569_000 as Weight).saturating_mul(a as Weight))
-			// Standard Error: 4_000
-			.saturating_add((214_000 as Weight).saturating_mul(p as Weight))
+		(50_457_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((441_000 as Weight).saturating_mul(a as Weight))
+			// Standard Error: 3_000
+			.saturating_add((122_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	fn add_proxy(p: u32, ) -> Weight {
-		(47_915_000 as Weight)
+		(40_826_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((245_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((230_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxy(p: u32, ) -> Weight {
-		(39_041_000 as Weight)
+		(34_262_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((268_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((243_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	fn remove_proxies(p: u32, ) -> Weight {
-		(42_140_000 as Weight)
-			// Standard Error: 25_000
-			.saturating_add((107_000 as Weight).saturating_mul(p as Weight))
+		(33_534_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((197_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
 	// Storage: Proxy Proxies (r:1 w:1)
 	fn anonymous(p: u32, ) -> Weight {
-		(53_893_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((73_000 as Weight).saturating_mul(p as Weight))
+		(46_221_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((40_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Proxy Proxies (r:1 w:1)
 	fn kill_anonymous(p: u32, ) -> Weight {
-		(41_573_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((151_000 as Weight).saturating_mul(p as Weight))
+		(35_668_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((237_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
diff --git a/runtime/litmus/src/weights/pallet_timestamp.rs b/runtime/litmus/src/weights/pallet_timestamp.rs
index 6b8babf7d9..a782f7624c 100644
--- a/runtime/litmus/src/weights/pallet_timestamp.rs
+++ b/runtime/litmus/src/weights/pallet_timestamp.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_timestamp`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -47,11 +47,11 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 	// Storage: Timestamp Now (r:1 w:1)
 	fn set() -> Weight {
-		(8_902_000 as Weight)
+		(7_435_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	fn on_finalize() -> Weight {
-		(5_252_000 as Weight)
+		(4_443_000 as Weight)
 	}
 }
diff --git a/runtime/litmus/src/weights/pallet_treasury.rs b/runtime/litmus/src/weights/pallet_treasury.rs
index 0c58034c45..b73d636e25 100644
--- a/runtime/litmus/src/weights/pallet_treasury.rs
+++ b/runtime/litmus/src/weights/pallet_treasury.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_treasury`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -48,23 +48,23 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	// Storage: Treasury ProposalCount (r:1 w:1)
 	// Storage: Treasury Proposals (r:0 w:1)
 	fn propose_spend() -> Weight {
-		(45_319_000 as Weight)
+		(40_890_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Treasury Proposals (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn reject_proposal() -> Weight {
-		(50_528_000 as Weight)
+		(46_256_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: Treasury Proposals (r:1 w:0)
 	// Storage: Treasury Approvals (r:1 w:1)
 	fn approve_proposal(p: u32, ) -> Weight {
-		(14_561_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((156_000 as Weight).saturating_mul(p as Weight))
+		(14_853_000 as Weight)
+			// Standard Error: 2_000
+			.saturating_add((106_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -72,9 +72,9 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	// Storage: Treasury Approvals (r:1 w:1)
 	// Storage: Treasury Proposals (r:5 w:5)
 	fn on_initialize_proposals(p: u32, ) -> Weight {
-		(43_761_000 as Weight)
-			// Standard Error: 23_000
-			.saturating_add((71_437_000 as Weight).saturating_mul(p as Weight))
+		(33_560_000 as Weight)
+			// Standard Error: 32_000
+			.saturating_add((57_104_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
diff --git a/runtime/litmus/src/weights/pallet_utility.rs b/runtime/litmus/src/weights/pallet_utility.rs
index 2589f9e2ab..944adfc32c 100644
--- a/runtime/litmus/src/weights/pallet_utility.rs
+++ b/runtime/litmus/src/weights/pallet_utility.rs
@@ -17,13 +17,13 @@
 //! Autogenerated weights for `pallet_utility`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-01-18, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("generate-litmus"), DB CACHE: 20
+//! DATE: 2022-02-10, STEPS: `20`, REPEAT: 50, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("litmus-dev"), DB CACHE: 20
 
 // Executed Command:
 // ./litentry-collator
 // benchmark
-// --chain=generate-litmus
+// --chain=litmus-dev
 // --execution=wasm
 // --db-cache=20
 // --wasm-execution=compiled
@@ -48,26 +48,26 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn batch(c: u32, ) -> Weight {
-		(0 as Weight)
-			// Standard Error: 213_000
-			.saturating_add((12_904_000 as Weight).saturating_mul(c as Weight))
+		(37_855_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((8_511_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 	}
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn as_derivative() -> Weight {
-		(14_203_000 as Weight)
+		(12_147_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 	}
 	// Storage: ExtrinsicFilter Mode (r:1 w:0)
 	// Storage: ExtrinsicFilter BlockedExtrinsics (r:2 w:0)
 	fn batch_all(c: u32, ) -> Weight {
-		(77_667_000 as Weight)
-			// Standard Error: 11_000
-			.saturating_add((12_440_000 as Weight).saturating_mul(c as Weight))
+		(68_884_000 as Weight)
+			// Standard Error: 10_000
+			.saturating_add((8_955_000 as Weight).saturating_mul(c as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 	}
 	fn dispatch_as() -> Weight {
-		(17_274_000 as Weight)
+		(14_977_000 as Weight)
 	}
 }
diff --git a/scripts/benchmark-weight-remote.sh b/scripts/benchmark-weight-remote.sh
index d4b8e42c13..53b8f2b0c0 100755
--- a/scripts/benchmark-weight-remote.sh
+++ b/scripts/benchmark-weight-remote.sh
@@ -35,14 +35,24 @@ chmod a+x litentry-collator
 # poopulate PALLETS
 PALLETS=
 case "$3" in
-  '*')  PALLETS=$(grep add_benchmark! runtime/$1/src/lib.rs | tr ',' ' ' | awk '{print $3}' | paste -s -d' ' -) ;;
-  *)    PALLETS=$(echo "$3" | tr ',' ' ') ;;
+  '*')
+    PALLETS=$(grep -F '[pallet_' runtime/$1/src/lib.rs | sed 's/.*\[//;s/,.*//' | paste -s -d' ' -)
+    PALLETS="frame_system $PALLETS"
+    ;;
+  *)
+    PALLETS=$(echo "$3" | tr ',' ' ')
+    ;;
 esac
 PALLETS=${PALLETS//-/_}
 
 echo "Pallets:"
 echo "$PALLETS"
 
+if [ -z "$PALLETS" ]; then
+  echo "no pallets found"
+  exit 1
+fi
+
 for p in $PALLETS; do
   echo "benchmarking $p ..."
   # filter out the flooding warnings from pallet_scheduler: