Release v6.6.0 (#1387)

* Bump versions * Disable tx-pause Signed-off-by: Xavier Lau <[email protected]> * Benchmark * Fix * Improve migration * Set storage version --------- Signed-off-by: Xavier Lau <[email protected]>
darwinia-network · Jan 18, 2024 · 08b08ad · 08b08ad
1 parent 6599a1b
commit 08b08ad
Show file tree

Hide file tree

Showing 134 changed files with 4,921 additions and 3,643 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ edition    = "2021"
 homepage   = "https://darwinia.network"
 license    = "GPL-3.0"
 repository = "https://github.com/darwinia-network/darwinia"
-version    = "6.5.1"
+version    = "6.6.0"
 
 [workspace.dependencies]
 # crates.io

diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
@@ -226,7 +226,7 @@ pub fn genesis_config() -> ChainSpec {
 				treasury: Default::default(),
 
 				// Utility stuff.
-				tx_pause: Default::default(),
+				// tx_pause: Default::default(),
 
 				// XCM stuff.
 				polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() },
@@ -336,7 +336,7 @@ fn testnet_genesis(
 		treasury: Default::default(),
 
 		// Utility stuff.
-		tx_pause: Default::default(),
+		// tx_pause: Default::default(),
 
 		// XCM stuff.
 		polkadot_xcm: PolkadotXcmConfig {

diff --git a/pallet/account-migration/src/weights.rs b/pallet/account-migration/src/weights.rs
@@ -21,7 +21,6 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-11-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `inv.cafe`, CPU: `Intel(R) Core(TM) i9-14900KF`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-dev"), DB CACHE: 1024
 
 // Executed Command:

diff --git a/pallet/deposit/src/weights.rs b/pallet/deposit/src/weights.rs
@@ -21,7 +21,6 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-11-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `inv.cafe`, CPU: `Intel(R) Core(TM) i9-14900KF`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-dev"), DB CACHE: 1024
 
 // Executed Command:

diff --git a/pallet/ecdsa-authority/src/weights.rs b/pallet/ecdsa-authority/src/weights.rs
@@ -21,7 +21,6 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-11-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `inv.cafe`, CPU: `Intel(R) Core(TM) i9-14900KF`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-dev"), DB CACHE: 1024
 
 // Executed Command:

diff --git a/pallet/staking/src/weights.rs b/pallet/staking/src/weights.rs
@@ -21,7 +21,6 @@
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2023-11-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `inv.cafe`, CPU: `Intel(R) Core(TM) i9-14900KF`
 //! EXECUTION: , WASM-EXECUTION: Compiled, CHAIN: Some("pangolin-dev"), DB CACHE: 1024
 
 // Executed Command:

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
@@ -79,7 +79,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Crab2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_5_1_0,
+	spec_version: 6_6_0_0,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,

diff --git a/runtime/crab/src/migration.rs b/runtime/crab/src/migration.rs
@@ -41,41 +41,47 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 }
 
 fn migrate() -> frame_support::weights::Weight {
-	let _ =
-		migration::clear_storage_prefix(b"MessageGadget", b"CommitmentContract", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"EcdsaAuthority", b"Authorities", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"EcdsaAuthority", b"NextAuthorities", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"EcdsaAuthority", b"Nonce", &[], None, None);
-	let _ = migration::clear_storage_prefix(
-		b"EcdsaAuthority",
-		b"AuthoritiesChangeToSign",
-		&[],
-		None,
-		None,
-	);
-	let _ =
-		migration::clear_storage_prefix(b"EcdsaAuthority", b"MessageRootToSign", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"Proposals", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"ProposalOf", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"Voting", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"ProposalCount", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"Members", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Council", b"Prime", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"PublicPropCount", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"PublicProps", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"DepositOf", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"ReferendumCount", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"LowestUnbaked", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"ReferendumInfoOf", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"VotingOf", &[], None, None);
-	let _ =
-		migration::clear_storage_prefix(b"Democracy", b"LastTabledWasExternal", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"NextExternal", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"Blacklist", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"Cancellations", &[], None, None);
-	let _ = migration::clear_storage_prefix(b"Democracy", b"MetadataOf", &[], None, None);
+	let items: &[(&[u8], &[&[u8]])] = &[
+		(b"MessageGadget", &[b"CommitmentContract"]),
+		(
+			b"EcdsaAuthority",
+			&[
+				b"Authorities",
+				b"NextAuthorities",
+				b"Nonce",
+				b"AuthoritiesChangeToSign",
+				b"MessageRootToSign",
+			],
+		),
+		(
+			b"Council",
+			&[b"Proposals", b"ProposalOf", b"Voting", b"ProposalCount", b"Members", b"Prime"],
+		),
+		(
+			b"Democracy",
+			&[
+				b"PublicPropCount",
+				b"PublicProps",
+				b"DepositOf",
+				b"ReferendumCount",
+				b"LowestUnbaked",
+				b"ReferendumInfoOf",
+				b"VotingOf",
+				b"LastTabledWasExternal",
+				b"NextExternal",
+				b"Blacklist",
+				b"Cancellations",
+				b"MetadataOf",
+			],
+		),
+	];
+
+	let w = items.iter().fold(0, |w, (p, is)| {
+		w + is.iter().fold(0, |w, i| {
+			w + migration::clear_storage_prefix(p, i, &[], None, None).backend as u64
+		})
+	});
 
 	// frame_support::weights::Weight::zero()
-	RuntimeBlockWeights::get().max_block
-	// <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, 2)
+	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, w)
 }
diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
@@ -48,7 +48,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Self>;
+	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
 }
 
 impl pallet_conviction_voting::Config for Runtime {

diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
@@ -20,6 +20,15 @@
 use crate::*;
 
 pub struct TxPauseWhitelistedCalls;
+// #[cfg(feature = "runtime-benchmarks")]
+// impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
+// 	for TxPauseWhitelistedCalls
+// {
+// 	fn contains(_: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
+// 		false
+// 	}
+// }
+// #[cfg(not(feature = "runtime-benchmarks"))]
 impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
 	for TxPauseWhitelistedCalls
 {
@@ -50,7 +59,6 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	// TODO: Update the benchmark weight info
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }