Merge branch 'main' into bear-add-precompile-interface

.github/note-template/runtime.md

@@ -1,6 +1,6 @@
 ## {{ .Env.CHAIN | strings.Title }}
 <h3 align="right">Upgrade Priority HIGH :red_circle:</h3>
-<h4 align="center">!!All nodes need to be updated to this(`v6.6.4`) version prior to the upcoming `v6.6.5` release because of the new asynchronous backing feature!!</h4>
+<h4 align="center">!!All nodes must be upgraded to a minimum of `v6.6.4` version because of the new asynchronous backing feature!!</h4>
 
 #### Whitelist Hash
 ```

Cargo.toml

@@ -18,7 +18,7 @@ edition    = "2021"
 homepage   = "https://darwinia.network"
 license    = "GPL-3.0"
 repository = "https://github.com/darwinia-network/darwinia"
-version    = "6.6.4"
+version    = "6.6.5"
 
 [workspace.dependencies]
 # crates.io

core/primitives/src/lib.rs

@@ -61,15 +61,15 @@ pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>
 
 /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
 /// into the relay chain.
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
 /// How many parachain blocks are processed by the relay chain per parent. Limits the
 /// number of blocks authored per slot.
 pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
 /// Relay chain slot duration, in milliseconds.
 pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6_000;
 
 /// Slot duration.
-pub const SLOT_DURATION: u64 = 12_000;
+pub const SLOT_DURATION: u64 = 6_000;
 
 // Time is measured by number of blocks.
 /// 10 blocks.

node/src/cli.rs

@@ -24,7 +24,7 @@
 ///
 /// The worker binaries associated to the node binary should ensure that they are using the same
 /// version as the main node that started them.
-pub const NODE_VERSION: &str = "6.6.4";
+pub const NODE_VERSION: &str = "6.6.5";
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, clap::Subcommand)]

pallet/account-migration/src/mock.rs

@@ -53,7 +53,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Darwinia2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_6_4_0,
+	spec_version: 6_6_5_0,
 	impl_version: 0,
 	apis: sp_version::create_apis_vec!([]),
 	transaction_version: 0,
@@ -162,9 +162,9 @@ frame_support::construct_runtime! {
 		Timestamp: pallet_timestamp,
 		Balances: pallet_balances,
 		Assets: pallet_assets,
-		AccountMigration: crate,
 		Deposit: darwinia_deposit,
 		Staking: darwinia_staking,
+		AccountMigration: crate,
 	}
 }
 

pallet/staking/src/lib.rs

@@ -31,8 +31,7 @@
 #![allow(clippy::needless_borrows_for_generic_args)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-
-pub mod migration;
+#![allow(clippy::needless_borrows_for_generic_args)]
 
 #[cfg(test)]
 mod mock;

runtime/common/Cargo.toml

@@ -80,8 +80,6 @@ std = [
 	"pallet-treasury?/std",
 ]
 
-non-async = []
-
 test = []
 
 runtime-benchmarks = [

runtime/common/src/lib.rs

@@ -175,9 +175,9 @@ impl frame_support::weights::WeightToFeePolynomial for RefTimeToFee {
 	type Balance = Balance;
 
 	fn polynomial() -> frame_support::weights::WeightToFeeCoefficients<Self::Balance> {
-		// Map base extrinsic weight to 1/200 UNIT.
+		// Map base extrinsic weight to 1/800 UNIT.
 		let p = UNIT;
-		let q = 200
+		let q = 800
 			* Balance::from(
 				frame_support::weights::constants::ExtrinsicBaseWeight::get().ref_time(),
 			);

runtime/common/src/pallet_config.rs

@@ -11,10 +11,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::fr
 /// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
 /// `Operational` extrinsics.
 pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
-const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
+const WEIGHT_MILLISECS_PER_BLOCK: u64 = 2_000;
 pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
 	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
+		frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
 		cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
 	);