From cf9d1f8d963efabf6441bf3d0c1115c0183ff069 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Wed, 29 Sep 2021 07:36:43 +0800
Subject: [PATCH 1/7] fix democracy on-initialize weight

---
 frame/democracy/src/lib.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 8bc6921c4f8ad..12a81adb66d32 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1726,7 +1726,8 @@ impl<T: Config> Pallet<T> {
 	///
 	///
 	/// # <weight>
-	/// If a referendum is launched or maturing, this will take full block weight. Otherwise:
+	/// If a referendum is launched or maturing, this will take full block weight if queue is not
+	/// empty. Otherwise:
 	/// - Complexity: `O(R)` where `R` is the number of unbaked referenda.
 	/// - Db reads: `LastTabledWasExternal`, `NextExternal`, `PublicProps`, `account`,
 	///   `ReferendumCount`, `LowestUnbaked`
@@ -1739,10 +1740,11 @@ impl<T: Config> Pallet<T> {
 
 		// pick out another public referendum if it's time.
 		if (now % T::LaunchPeriod::get()).is_zero() {
-			// Errors come from the queue being empty. we don't really care about that, and even if
-			// we did, there is nothing we can do here.
-			let _ = Self::launch_next(now);
-			weight = max_block_weight;
+			// Errors come from the queue being empty. If the queue is not empty, it will take
+			// full block weight.
+			Self::launch_next(now).is_ok() {
+				weight = max_block_weight;
+			}
 		}
 
 		let next = Self::lowest_unbaked();

From 7373c170ed1d92fdf3982fc0d05688da257cb493 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Wed, 29 Sep 2021 07:42:22 +0800
Subject: [PATCH 2/7] fix tests

---
 frame/democracy/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 12a81adb66d32..2261953d7169f 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1742,7 +1742,7 @@ impl<T: Config> Pallet<T> {
 		if (now % T::LaunchPeriod::get()).is_zero() {
 			// Errors come from the queue being empty. If the queue is not empty, it will take
 			// full block weight.
-			Self::launch_next(now).is_ok() {
+			if Self::launch_next(now).is_ok() {
 				weight = max_block_weight;
 			}
 		}

From d1849d6af4ccf0d51c9ec3ccb7985b604ea7a67e Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Wed, 29 Sep 2021 15:43:26 +0800
Subject: [PATCH 3/7] add base weight on LaunchPeriod

---
 frame/democracy/src/benchmarking.rs |  32 ++++
 frame/democracy/src/lib.rs          |  12 +-
 frame/democracy/src/weights.rs      | 221 ++++++++++++++++------------
 3 files changed, 164 insertions(+), 101 deletions(-)

diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index a00e6f4686fd3..9fca652071412 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -435,6 +435,38 @@ benchmarks! {
 		}
 	}
 
+	on_initialize_base_with_launch_period {
+		let r in 1 .. MAX_REFERENDUMS;
+
+		for i in 0..r {
+			add_referendum::<T>(i)?;
+		}
+
+		for (key, mut info) in ReferendumInfoOf::<T>::iter() {
+			if let ReferendumInfo::Ongoing(ref mut status) = info {
+				status.end += 100u32.into();
+			}
+			ReferendumInfoOf::<T>::insert(key, info);
+		}
+
+		assert_eq!(Democracy::<T>::referendum_count(), r, "referenda not created");
+		assert_eq!(Democracy::<T>::lowest_unbaked(), 0, "invalid referenda init");
+
+		let block_number = T::LaunchPeriod::get();
+
+	}: { Democracy::<T>::on_initialize(block_number) }
+	verify {
+		// All should be on going
+		for i in 0 .. r {
+			if let Some(value) = ReferendumInfoOf::<T>::get(i) {
+				match value {
+					ReferendumInfo::Finished { .. } => return Err("Referendum has been finished".into()),
+					ReferendumInfo::Ongoing(_) => (),
+				}
+			}
+		}
+	}
+
 	delegate {
 		let r in 1 .. MAX_REFERENDUMS;
 
diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index 2261953d7169f..d2cde7fd133d2 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1738,19 +1738,23 @@ impl<T: Config> Pallet<T> {
 		let max_block_weight = T::BlockWeights::get().max_block;
 		let mut weight = 0;
 
+		let next = Self::lowest_unbaked();
+		let last = Self::referendum_count();
+		let r = last.saturating_sub(next);
+
 		// pick out another public referendum if it's time.
 		if (now % T::LaunchPeriod::get()).is_zero() {
 			// Errors come from the queue being empty. If the queue is not empty, it will take
 			// full block weight.
 			if Self::launch_next(now).is_ok() {
 				weight = max_block_weight;
+			} else {
+				weight = weight.saturating_add(T::WeightInfo::on_initialize_base_with_launch_period(r));
 			}
+		} else {
+			weight = weight.saturating_add(T::WeightInfo::on_initialize_base(r));
 		}
 
-		let next = Self::lowest_unbaked();
-		let last = Self::referendum_count();
-		let r = last.saturating_sub(next);
-		weight = weight.saturating_add(T::WeightInfo::on_initialize_base(r));
 		// tally up votes for any expiring referenda.
 		for (index, info) in Self::maturing_referenda_at_inner(now, next..last).into_iter() {
 			let approved = Self::bake_referendum(now, index, info)?;
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index e3f22f4fc0ab3..eac2bf1925594 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_democracy
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-29, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -60,6 +60,7 @@ pub trait WeightInfo {
 	fn cancel_referendum() -> Weight;
 	fn cancel_queued(r: u32, ) -> Weight;
 	fn on_initialize_base(r: u32, ) -> Weight;
+	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight;
 	fn delegate(r: u32, ) -> Weight;
 	fn undelegate(r: u32, ) -> Weight;
 	fn clear_public_proposals() -> Weight;
@@ -80,15 +81,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy Blacklist (r:1 w:0)
 	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(65_665_000 as Weight)
+		(68_197_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 {
-		(40_003_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
+		(41_875_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((159_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))
 	}
@@ -96,9 +97,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(45_465_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((220_000 as Weight).saturating_mul(r as Weight))
+		(46_909_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((184_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))
 	}
@@ -106,16 +107,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(45_112_000 as Weight)
+		(46_593_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((184_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 {
-		(26_651_000 as Weight)
+		(27_759_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -126,45 +127,45 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(77_737_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((512_000 as Weight).saturating_mul(p as Weight))
+		(85_356_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_126_000 as Weight)
+		(13_798_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((89_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((78_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 {
-		(2_923_000 as Weight)
+		(3_010_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(2_889_000 as Weight)
+		(3_020_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 {
-		(27_598_000 as Weight)
+		(29_399_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 {
-		(28_416_000 as Weight)
+		(30_198_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((105_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))
 	}
@@ -172,23 +173,23 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(52_836_000 as Weight)
-			// Standard Error: 2_000
+		(55_931_000 as Weight)
+			// Standard Error: 1_000
 			.saturating_add((478_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))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(16_891_000 as Weight)
+		(17_280_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 {
-		(30_504_000 as Weight)
+		(30_071_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_480_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_234_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))
 	}
@@ -199,9 +200,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(6_259_000 as Weight)
+		(10_159_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((5_708_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)))
+	}
+	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
+	// Storage: Democracy NextExternal (r:1 w:0)
+	// Storage: Democracy PublicProps (r:1 w:0)
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
+	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
+		(8_550_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_032_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_753_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)))
 	}
@@ -209,9 +223,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(51_719_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((7_210_000 as Weight).saturating_mul(r as Weight))
+		(58_078_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((7_816_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))
@@ -220,9 +234,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:2 w:2)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(23_203_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((7_206_000 as Weight).saturating_mul(r as Weight))
+		(25_918_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((7_888_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))
@@ -230,31 +244,31 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(3_127_000 as Weight)
+		(2_610_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 {
-		(44_130_000 as Weight)
+		(46_954_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(28_756_000 as Weight)
+		(29_794_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(39_922_000 as Weight)
+		(41_526_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -262,9 +276,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(38_621_000 as Weight)
+		(41_163_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((110_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((52_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))
 	}
@@ -272,27 +286,27 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(36_631_000 as Weight)
+		(37_796_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((165_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 {
-		(21_025_000 as Weight)
+		(19_958_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((195_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((175_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 {
-		(20_628_000 as Weight)
+		(20_311_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((162_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))
 	}
@@ -305,15 +319,15 @@ impl WeightInfo for () {
 	// Storage: Democracy Blacklist (r:1 w:0)
 	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(65_665_000 as Weight)
+		(68_197_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy DepositOf (r:1 w:1)
 	fn second(s: u32, ) -> Weight {
-		(40_003_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((180_000 as Weight).saturating_mul(s as Weight))
+		(41_875_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((159_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -321,9 +335,9 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(45_465_000 as Weight)
-			// Standard Error: 1_000
-			.saturating_add((220_000 as Weight).saturating_mul(r as Weight))
+		(46_909_000 as Weight)
+			// Standard Error: 0
+			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -331,16 +345,16 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(45_112_000 as Weight)
+		(46_593_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((222_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Democracy Cancellations (r:1 w:1)
 	fn emergency_cancel() -> Weight {
-		(26_651_000 as Weight)
+		(27_759_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -351,45 +365,45 @@ impl WeightInfo for () {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(77_737_000 as Weight)
-			// Standard Error: 4_000
-			.saturating_add((512_000 as Weight).saturating_mul(p as Weight))
+		(85_356_000 as Weight)
+			// Standard Error: 5_000
+			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_126_000 as Weight)
+		(13_798_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((89_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((78_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_majority() -> Weight {
-		(2_923_000 as Weight)
+		(3_010_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(2_889_000 as Weight)
+		(3_020_000 as Weight)
 			.saturating_add(RocksDbWeight::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 {
-		(27_598_000 as Weight)
+		(29_399_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(28_416_000 as Weight)
+		(30_198_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((132_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((105_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -397,23 +411,23 @@ impl WeightInfo for () {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(52_836_000 as Weight)
-			// Standard Error: 2_000
+		(55_931_000 as Weight)
+			// Standard Error: 1_000
 			.saturating_add((478_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(16_891_000 as Weight)
+		(17_280_000 as Weight)
 			.saturating_add(RocksDbWeight::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 {
-		(30_504_000 as Weight)
+		(30_071_000 as Weight)
 			// Standard Error: 2_000
-			.saturating_add((1_480_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((1_234_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -424,9 +438,22 @@ impl WeightInfo for () {
 	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(6_259_000 as Weight)
+		(10_159_000 as Weight)
+			// Standard Error: 3_000
+			.saturating_add((5_708_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
+	}
+	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
+	// Storage: Democracy NextExternal (r:1 w:0)
+	// Storage: Democracy PublicProps (r:1 w:0)
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
+	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
+	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
+		(8_550_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_032_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_753_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
@@ -434,9 +461,9 @@ impl WeightInfo for () {
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(51_719_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((7_210_000 as Weight).saturating_mul(r as Weight))
+		(58_078_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((7_816_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -445,9 +472,9 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:2 w:2)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(23_203_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((7_206_000 as Weight).saturating_mul(r as Weight))
+		(25_918_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((7_888_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -455,31 +482,31 @@ impl WeightInfo for () {
 	}
 	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(3_127_000 as Weight)
+		(2_610_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_preimage(b: u32, ) -> Weight {
-		(44_130_000 as Weight)
+		(46_954_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(28_756_000 as Weight)
+		(29_794_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((3_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(39_922_000 as Weight)
+		(41_526_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
+			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -487,9 +514,9 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(38_621_000 as Weight)
+		(41_163_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((110_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((52_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -497,27 +524,27 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(36_631_000 as Weight)
+		(37_796_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((165_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(21_025_000 as Weight)
+		(19_958_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((195_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((175_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(20_628_000 as Weight)
+		(20_311_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((214_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((162_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}

From 9fcb33ac6439cd4ca73c65127668a1c86c8e8483 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Wed, 29 Sep 2021 17:36:10 +0800
Subject: [PATCH 4/7] fix fmt check

---
 frame/democracy/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs
index d2cde7fd133d2..24f823a17e10d 100644
--- a/frame/democracy/src/lib.rs
+++ b/frame/democracy/src/lib.rs
@@ -1749,7 +1749,8 @@ impl<T: Config> Pallet<T> {
 			if Self::launch_next(now).is_ok() {
 				weight = max_block_weight;
 			} else {
-				weight = weight.saturating_add(T::WeightInfo::on_initialize_base_with_launch_period(r));
+				weight =
+					weight.saturating_add(T::WeightInfo::on_initialize_base_with_launch_period(r));
 			}
 		} else {
 			weight = weight.saturating_add(T::WeightInfo::on_initialize_base(r));

From 779cbeaf73cb1046c5e1a2f56f4f3e1ae6852fd2 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Thu, 30 Sep 2021 07:46:35 +0800
Subject: [PATCH 5/7] trigger GitHub actions


From c091bdb05e63198deb6bb2373444e593850ceb6c Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Thu, 30 Sep 2021 12:22:55 +0800
Subject: [PATCH 6/7] trigger GitHub actions


From 39459d8dcd71009f214e6afdfc04b577d545a521 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Thu, 30 Sep 2021 20:35:53 +0800
Subject: [PATCH 7/7] update weights

---
 frame/democracy/src/benchmarking.rs |   2 +-
 frame/democracy/src/weights.rs      | 200 ++++++++++++++--------------
 2 files changed, 98 insertions(+), 104 deletions(-)

diff --git a/frame/democracy/src/benchmarking.rs b/frame/democracy/src/benchmarking.rs
index 9fca652071412..63d409dac25a7 100644
--- a/frame/democracy/src/benchmarking.rs
+++ b/frame/democracy/src/benchmarking.rs
@@ -422,7 +422,7 @@ benchmarks! {
 		assert_eq!(Democracy::<T>::referendum_count(), r, "referenda not created");
 		assert_eq!(Democracy::<T>::lowest_unbaked(), 0, "invalid referenda init");
 
-	}: { Democracy::<T>::on_initialize(0u32.into()) }
+	}: { Democracy::<T>::on_initialize(1u32.into()) }
 	verify {
 		// All should be on going
 		for i in 0 .. r {
diff --git a/frame/democracy/src/weights.rs b/frame/democracy/src/weights.rs
index eac2bf1925594..638852d3c7e19 100644
--- a/frame/democracy/src/weights.rs
+++ b/frame/democracy/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_democracy
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-09-29, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2021-09-30, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:
@@ -81,15 +81,15 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy Blacklist (r:1 w:0)
 	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(68_197_000 as Weight)
+		(67_388_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 {
-		(41_875_000 as Weight)
+		(41_157_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((159_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((157_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))
 	}
@@ -97,9 +97,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(46_909_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
+		(46_406_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_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))
 	}
@@ -107,16 +107,16 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(46_593_000 as Weight)
+		(46_071_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((166_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 {
-		(27_759_000 as Weight)
+		(27_699_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -127,45 +127,45 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(85_356_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
+		(82_703_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((500_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(6 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_798_000 as Weight)
+		(13_747_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((78_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((76_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_010_000 as Weight)
+		(3_070_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_020_000 as Weight)
+		(3_080_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 {
-		(29_399_000 as Weight)
+		(29_129_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 {
-		(30_198_000 as Weight)
+		(30_105_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((105_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((104_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))
 	}
@@ -173,49 +173,46 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(55_931_000 as Weight)
+		(55_228_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((478_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((457_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))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(17_280_000 as Weight)
+		(17_319_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 {
-		(30_071_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_234_000 as Weight).saturating_mul(r as Weight))
+		(29_738_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_153_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 LastTabledWasExternal (r:1 w:0)
-	// Storage: Democracy NextExternal (r:1 w:0)
-	// Storage: Democracy PublicProps (r:1 w:0)
 	// Storage: Democracy LowestUnbaked (r:1 w:0)
 	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(10_159_000 as Weight)
+		(2_165_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((5_708_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(T::DbWeight::get().reads(5 as Weight))
+			.saturating_add((5_577_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)))
 	}
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
 	// Storage: Democracy NextExternal (r:1 w:0)
 	// Storage: Democracy PublicProps (r:1 w:0)
-	// Storage: Democracy LowestUnbaked (r:1 w:0)
-	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		(8_550_000 as Weight)
+		(9_396_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_753_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_604_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)))
 	}
@@ -223,9 +220,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(58_078_000 as Weight)
+		(57_783_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((7_816_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_623_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))
@@ -234,9 +231,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy VotingOf (r:2 w:2)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(25_918_000 as Weight)
+		(26_027_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((7_888_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_593_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))
@@ -244,12 +241,12 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(2_610_000 as Weight)
+		(2_780_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_954_000 as Weight)
+		(46_416_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -257,7 +254,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(29_794_000 as Weight)
+		(29_735_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -266,7 +263,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Democracy Preimages (r:1 w:1)
 	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(41_526_000 as Weight)
+		(41_276_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
@@ -276,9 +273,9 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(41_163_000 as Weight)
+		(40_348_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((52_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((60_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))
 	}
@@ -286,27 +283,27 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(37_796_000 as Weight)
+		(37_475_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((165_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((151_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 {
-		(19_958_000 as Weight)
+		(19_970_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((175_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((153_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 {
-		(20_311_000 as Weight)
+		(20_094_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((162_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((157_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))
 	}
@@ -319,15 +316,15 @@ impl WeightInfo for () {
 	// Storage: Democracy Blacklist (r:1 w:0)
 	// Storage: Democracy DepositOf (r:0 w:1)
 	fn propose() -> Weight {
-		(68_197_000 as Weight)
+		(67_388_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy DepositOf (r:1 w:1)
 	fn second(s: u32, ) -> Weight {
-		(41_875_000 as Weight)
+		(41_157_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((159_000 as Weight).saturating_mul(s as Weight))
+			.saturating_add((157_000 as Weight).saturating_mul(s as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
@@ -335,9 +332,9 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_new(r: u32, ) -> Weight {
-		(46_909_000 as Weight)
-			// Standard Error: 0
-			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
+		(46_406_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((170_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -345,16 +342,16 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn vote_existing(r: u32, ) -> Weight {
-		(46_593_000 as Weight)
+		(46_071_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((184_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((166_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Democracy Cancellations (r:1 w:1)
 	fn emergency_cancel() -> Weight {
-		(27_759_000 as Weight)
+		(27_699_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -365,45 +362,45 @@ impl WeightInfo for () {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn blacklist(p: u32, ) -> Weight {
-		(85_356_000 as Weight)
-			// Standard Error: 5_000
-			.saturating_add((494_000 as Weight).saturating_mul(p as Weight))
+		(82_703_000 as Weight)
+			// Standard Error: 4_000
+			.saturating_add((500_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(6 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:1 w:1)
 	// Storage: Democracy Blacklist (r:1 w:0)
 	fn external_propose(v: u32, ) -> Weight {
-		(13_798_000 as Weight)
+		(13_747_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((78_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((76_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_majority() -> Weight {
-		(3_010_000 as Weight)
+		(3_070_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy NextExternal (r:0 w:1)
 	fn external_propose_default() -> Weight {
-		(3_020_000 as Weight)
+		(3_080_000 as Weight)
 			.saturating_add(RocksDbWeight::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 {
-		(29_399_000 as Weight)
+		(29_129_000 as Weight)
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(30_198_000 as Weight)
+		(30_105_000 as Weight)
 			// Standard Error: 0
-			.saturating_add((105_000 as Weight).saturating_mul(v as Weight))
+			.saturating_add((104_000 as Weight).saturating_mul(v as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
@@ -411,49 +408,46 @@ impl WeightInfo for () {
 	// Storage: Democracy DepositOf (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn cancel_proposal(p: u32, ) -> Weight {
-		(55_931_000 as Weight)
+		(55_228_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((478_000 as Weight).saturating_mul(p as Weight))
+			.saturating_add((457_000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
 	// Storage: Democracy ReferendumInfoOf (r:0 w:1)
 	fn cancel_referendum() -> Weight {
-		(17_280_000 as Weight)
+		(17_319_000 as Weight)
 			.saturating_add(RocksDbWeight::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 {
-		(30_071_000 as Weight)
-			// Standard Error: 2_000
-			.saturating_add((1_234_000 as Weight).saturating_mul(r as Weight))
+		(29_738_000 as Weight)
+			// Standard Error: 1_000
+			.saturating_add((1_153_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}
-	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
-	// Storage: Democracy NextExternal (r:1 w:0)
-	// Storage: Democracy PublicProps (r:1 w:0)
 	// Storage: Democracy LowestUnbaked (r:1 w:0)
 	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base(r: u32, ) -> Weight {
-		(10_159_000 as Weight)
+		(2_165_000 as Weight)
 			// Standard Error: 3_000
-			.saturating_add((5_708_000 as Weight).saturating_mul(r as Weight))
-			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
+			.saturating_add((5_577_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
+	// Storage: Democracy LowestUnbaked (r:1 w:0)
+	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy LastTabledWasExternal (r:1 w:0)
 	// Storage: Democracy NextExternal (r:1 w:0)
 	// Storage: Democracy PublicProps (r:1 w:0)
-	// Storage: Democracy LowestUnbaked (r:1 w:0)
-	// Storage: Democracy ReferendumCount (r:1 w:0)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:0)
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		(8_550_000 as Weight)
+		(9_396_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((5_753_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((5_604_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(5 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 	}
@@ -461,9 +455,9 @@ impl WeightInfo for () {
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn delegate(r: u32, ) -> Weight {
-		(58_078_000 as Weight)
+		(57_783_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((7_816_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_623_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(4 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -472,9 +466,9 @@ impl WeightInfo for () {
 	// Storage: Democracy VotingOf (r:2 w:2)
 	// Storage: Democracy ReferendumInfoOf (r:1 w:1)
 	fn undelegate(r: u32, ) -> Weight {
-		(25_918_000 as Weight)
+		(26_027_000 as Weight)
 			// Standard Error: 4_000
-			.saturating_add((7_888_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((7_593_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(r as Weight)))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -482,12 +476,12 @@ impl WeightInfo for () {
 	}
 	// Storage: Democracy PublicProps (r:0 w:1)
 	fn clear_public_proposals() -> Weight {
-		(2_610_000 as Weight)
+		(2_780_000 as Weight)
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_preimage(b: u32, ) -> Weight {
-		(46_954_000 as Weight)
+		(46_416_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
@@ -495,7 +489,7 @@ impl WeightInfo for () {
 	}
 	// Storage: Democracy Preimages (r:1 w:1)
 	fn note_imminent_preimage(b: u32, ) -> Weight {
-		(29_794_000 as Weight)
+		(29_735_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
@@ -504,7 +498,7 @@ impl WeightInfo for () {
 	// Storage: Democracy Preimages (r:1 w:1)
 	// Storage: System Account (r:1 w:0)
 	fn reap_preimage(b: u32, ) -> Weight {
-		(41_526_000 as Weight)
+		(41_276_000 as Weight)
 			// Standard Error: 0
 			.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
@@ -514,9 +508,9 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_remove(r: u32, ) -> Weight {
-		(41_163_000 as Weight)
+		(40_348_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((52_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((60_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(3 as Weight))
 	}
@@ -524,27 +518,27 @@ impl WeightInfo for () {
 	// Storage: Balances Locks (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
 	fn unlock_set(r: u32, ) -> Weight {
-		(37_796_000 as Weight)
+		(37_475_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((165_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((151_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(3 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(19_958_000 as Weight)
+		(19_970_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((175_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((153_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::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 {
-		(20_311_000 as Weight)
+		(20_094_000 as Weight)
 			// Standard Error: 1_000
-			.saturating_add((162_000 as Weight).saturating_mul(r as Weight))
+			.saturating_add((157_000 as Weight).saturating_mul(r as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
 	}