Release v6.4.0-2 (#1280)

darwinia-network · Sep 20, 2023 · 7b9328d · 7b9328d
1 parent b874775
commit 7b9328d
Show file tree

Hide file tree

Showing 33 changed files with 47 additions and 905 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.4.0-1"
+version    = "6.4.0-2"
 
 [workspace.dependencies]
 # crates.io
@@ -152,7 +152,6 @@ pallet-scheduler                           = { git = "https://github.com/parityt
 pallet-session                             = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 pallet-sudo                                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 pallet-timestamp                           = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-pallet-tips                                = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 pallet-transaction-payment                 = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 pallet-transaction-payment-rpc             = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }

diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
@@ -103,7 +103,6 @@ pallet-proxy                               = { workspace = true }
 pallet-scheduler                           = { workspace = true }
 pallet-session                             = { workspace = true }
 pallet-timestamp                           = { workspace = true }
-pallet-tips                                = { workspace = true }
 pallet-transaction-payment                 = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury                            = { workspace = true }
@@ -228,7 +227,6 @@ std = [
 	"pallet-scheduler/std",
 	"pallet-session/std",
 	"pallet-timestamp/std",
-	"pallet-tips/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-treasury/std",
@@ -322,7 +320,6 @@ runtime-benchmarks = [
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-tips/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
@@ -383,7 +380,6 @@ try-runtime = [
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-timestamp/try-runtime",
-	"pallet-tips/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-treasury/try-runtime",
 	"pallet-utility/try-runtime",

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
@@ -86,7 +86,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_4_0_1,
+	spec_version: 6_4_0_2,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,
@@ -150,7 +150,7 @@ frame_support::construct_runtime! {
 		PhragmenElection: pallet_elections_phragmen = 21,
 		TechnicalMembership: pallet_membership::<Instance1> = 22,
 		Treasury: pallet_treasury = 23,
-		Tips: pallet_tips = 24,
+		// Tips: pallet_tips = 24,
 
 		// Utility stuff.
 		// Sudo: pallet_sudo = 25,
@@ -208,7 +208,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_scheduler, Scheduler]
-	[pallet_tips, Tips]
 	[pallet_treasury, Treasury]
 	[pallet_utility, Utility]
 	[pallet_vesting, Vesting]

diff --git a/runtime/crab/src/migration.rs b/runtime/crab/src/migration.rs
@@ -41,7 +41,10 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 }
 
 fn migrate() -> frame_support::weights::Weight {
-	frame_support::weights::Weight::zero()
-	// RuntimeBlockWeights::get().max_block
+	migration::clear_storage_prefix(b"Tips", b"Tips", &[], None, None);
+	migration::clear_storage_prefix(b"Tips", b"Reasons", &[], None, None);
+
+	// frame_support::weights::Weight::zero()
+	RuntimeBlockWeights::get().max_block
 	// <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, 2)
 }
diff --git a/runtime/crab/src/pallets.rs b/runtime/crab/src/pallets.rs
@@ -78,8 +78,6 @@ mod membership;
 
 mod treasury;
 
-mod tips;
-
 // Utility stuff.
 mod utility;
 

diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
@@ -72,7 +72,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::PhragmenElection(..)
 					| RuntimeCall::Treasury(..)
-					| RuntimeCall::Tips(..)
 			),
 			ProxyType::Staking => {
 				matches!(

diff --git a/runtime/crab/src/pallets/tips.rs b/runtime/crab/src/pallets/tips.rs
diff --git a/runtime/crab/src/weights.rs b/runtime/crab/src/weights.rs
@@ -47,7 +47,6 @@ pub mod pallet_proxy;
 pub mod pallet_scheduler;
 pub mod pallet_session;
 pub mod pallet_timestamp;
-pub mod pallet_tips;
 pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;