moonbeam-foundation · librelois · Feb 14, 2024 · Nov 24, 2023 · Nov 27, 2023 · Nov 27, 2023
diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs
@@ -232,11 +232,6 @@ pub struct RunCmd {
 	/// Removes moonbeam prefix from Prometheus metrics
 	#[clap(long)]
 	pub no_prometheus_prefix: bool,
-
-	/// Enable asynchronous backing (for collators only)
-	/// This feature is still experimental, please don't use it in production.
-	#[clap(hide = true, long = "experimental-async-backing")]
-	pub async_backing: bool,
 }
 
 impl RunCmd {

diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs
@@ -791,7 +791,7 @@ pub fn run() -> Result<()> {
 						collator_options,
 						id,
 						rpc_config,
-						cli.run.async_backing,
+						false,
 						hwbench,
 					)
 					.await
@@ -807,7 +807,7 @@ pub fn run() -> Result<()> {
 						collator_options,
 						id,
 						rpc_config,
-						cli.run.async_backing,
+						false,
 						hwbench,
 					)
 					.await
@@ -823,7 +823,7 @@ pub fn run() -> Result<()> {
 						collator_options,
 						id,
 						rpc_config,
-						cli.run.async_backing,
+						true,
 						hwbench,
 					)
 					.await

diff --git a/node/service/src/chain_spec/moonbase.rs b/node/service/src/chain_spec/moonbase.rs
@@ -205,12 +205,11 @@ pub fn get_chain_spec(para_id: ParaId) -> ChainSpec {
 const COLLATOR_COMMISSION: Perbill = Perbill::from_percent(20);
 const PARACHAIN_BOND_RESERVE_PERCENT: Percent = Percent::from_percent(30);
 const BLOCKS_PER_ROUND: u32 = 2 * HOURS;
+const BLOCKS_PER_YEAR: u32 = 31_557_600 / 6;
 const NUM_SELECTED_CANDIDATES: u32 = 8;
 pub fn moonbase_inflation_config() -> InflationInfo<Balance> {
 	fn to_round_inflation(annual: Range<Perbill>) -> Range<Perbill> {
-		use pallet_parachain_staking::inflation::{
-			perbill_annual_to_perbill_round, BLOCKS_PER_YEAR,
-		};
+		use pallet_parachain_staking::inflation::perbill_annual_to_perbill_round;
 		perbill_annual_to_perbill_round(
 			annual,
 			// rounds per year

diff --git a/node/service/src/chain_spec/moonbeam.rs b/node/service/src/chain_spec/moonbeam.rs
@@ -195,12 +195,11 @@ pub fn get_chain_spec(para_id: ParaId) -> ChainSpec {
 const COLLATOR_COMMISSION: Perbill = Perbill::from_percent(20);
 const PARACHAIN_BOND_RESERVE_PERCENT: Percent = Percent::from_percent(30);
 const BLOCKS_PER_ROUND: u32 = 6 * HOURS;
+const BLOCKS_PER_YEAR: u32 = 31_557_600 / 12;
 const NUM_SELECTED_CANDIDATES: u32 = 8;
 pub fn moonbeam_inflation_config() -> InflationInfo<Balance> {
 	fn to_round_inflation(annual: Range<Perbill>) -> Range<Perbill> {
-		use pallet_parachain_staking::inflation::{
-			perbill_annual_to_perbill_round, BLOCKS_PER_YEAR,
-		};
+		use pallet_parachain_staking::inflation::perbill_annual_to_perbill_round;
 		perbill_annual_to_perbill_round(
 			annual,
 			// rounds per year

diff --git a/node/service/src/chain_spec/moonriver.rs b/node/service/src/chain_spec/moonriver.rs
@@ -195,12 +195,11 @@ pub fn get_chain_spec(para_id: ParaId) -> ChainSpec {
 const COLLATOR_COMMISSION: Perbill = Perbill::from_percent(20);
 const PARACHAIN_BOND_RESERVE_PERCENT: Percent = Percent::from_percent(30);
 const BLOCKS_PER_ROUND: u32 = 2 * HOURS;
+const BLOCKS_PER_YEAR: u32 = 31_557_600 / 12;
 const NUM_SELECTED_CANDIDATES: u32 = 8;
 pub fn moonriver_inflation_config() -> InflationInfo<Balance> {
 	fn to_round_inflation(annual: Range<Perbill>) -> Range<Perbill> {
-		use pallet_parachain_staking::inflation::{
-			perbill_annual_to_perbill_round, BLOCKS_PER_YEAR,
-		};
+		use pallet_parachain_staking::inflation::perbill_annual_to_perbill_round;
 		perbill_annual_to_perbill_round(
 			annual,
 			// rounds per year

diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
@@ -1045,6 +1045,7 @@ where
 		};
 
 	if async_backing {
+		log::info!("Collator started with asynchronous backing.");
 		let client_clone = client.clone();
 		let code_hash_provider = move |block_hash| {
 			client_clone
@@ -1093,6 +1094,7 @@ where
 			}),
 		);
 	} else {
+		log::info!("Collator started without asynchronous backing.");
 		task_manager.spawn_essential_handle().spawn(
 			"nimbus",
 			None,

diff --git a/pallets/parachain-staking/src/inflation.rs b/pallets/parachain-staking/src/inflation.rs
@@ -16,7 +16,7 @@
 
 //! Helper methods for computing issuance based on inflation
 use crate::pallet::{BalanceOf, Config, Pallet};
-use frame_support::traits::Currency;
+use frame_support::traits::{Currency, Get};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
@@ -25,13 +25,9 @@ use sp_runtime::{Perbill, RuntimeDebug};
 use substrate_fixed::transcendental::pow as floatpow;
 use substrate_fixed::types::I64F64;
 
-const SECONDS_PER_YEAR: u32 = 31557600;
-const SECONDS_PER_BLOCK: u32 = 12;
-pub const BLOCKS_PER_YEAR: u32 = SECONDS_PER_YEAR / SECONDS_PER_BLOCK;
-
 fn rounds_per_year<T: Config>() -> u32 {
 	let blocks_per_round = <Pallet<T>>::round().length;
-	BLOCKS_PER_YEAR / blocks_per_round
+	T::SlotsPerYear::get() / blocks_per_round
 }
 
 #[derive(
@@ -136,8 +132,8 @@ impl<Balance> InflationInfo<Balance> {
 		self.round = annual_to_round::<T>(new);
 	}
 	/// Reset round inflation rate based on changes to round length
-	pub fn reset_round(&mut self, new_length: u32) {
-		let periods = BLOCKS_PER_YEAR / new_length;
+	pub fn reset_round<T: Config>(&mut self, new_length: u32) {
+		let periods = T::SlotsPerYear::get() / new_length;
 		self.round = perbill_annual_to_perbill_round(self.annual, periods);
 	}
 	/// Set staking expectations

diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs
@@ -189,6 +189,9 @@ pub mod pallet {
 		/// Maximum candidates
 		#[pallet::constant]
 		type MaxCandidates: Get<u32>;
+		/// Average number of slots per year
+		/// A slot here is the unit of time for staking rounds (provided by SlotProvider)
+		type SlotsPerYear: Get<u32>;
 	}
 
 	#[pallet::error]
@@ -973,7 +976,7 @@ pub mod pallet {
 			round.length = new;
 			// update per-round inflation given new rounds per year
 			let mut inflation_config = <InflationConfig<T>>::get();
-			inflation_config.reset_round(new);
+			inflation_config.reset_round::<T>(new);
 			<Round<T>>::put(round);
 			Self::deposit_event(Event::BlocksPerRoundSet {
 				current_round: now,

diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs
@@ -161,6 +161,7 @@ impl Config for Test {
 	type SlotProvider = StakingRoundSlotProvider;
 	type WeightInfo = ();
 	type MaxCandidates = MaxCandidates;
+	type SlotsPerYear = frame_support::traits::ConstU32<{ 31_557_600 / 6 }>;
 }
 
 pub(crate) struct ExtBuilder {

diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs
@@ -277,9 +277,9 @@ fn set_blocks_per_round_event_emits_correctly() {
 			first_block: 0,
 			old: 5,
 			new: 6,
-			new_per_round_inflation_min: Perbill::from_parts(926),
-			new_per_round_inflation_ideal: Perbill::from_parts(926),
-			new_per_round_inflation_max: Perbill::from_parts(926),
+			new_per_round_inflation_min: Perbill::from_parts(463),
+			new_per_round_inflation_ideal: Perbill::from_parts(463),
+			new_per_round_inflation_max: Perbill::from_parts(463),
 		});
 	});
 }
@@ -518,9 +518,9 @@ fn set_inflation_event_emits_correctly() {
 			annual_min: min,
 			annual_ideal: ideal,
 			annual_max: max,
-			round_min: Perbill::from_parts(57),
-			round_ideal: Perbill::from_parts(75),
-			round_max: Perbill::from_parts(93),
+			round_min: Perbill::from_parts(29),
+			round_ideal: Perbill::from_parts(38),
+			round_max: Perbill::from_parts(47),
 		});
 	});
 }
@@ -560,9 +560,9 @@ fn set_inflation_storage_updates_correctly() {
 		assert_eq!(
 			ParachainStaking::inflation_config().round,
 			Range {
-				min: Perbill::from_parts(57),
-				ideal: Perbill::from_parts(75),
-				max: Perbill::from_parts(93)
+				min: Perbill::from_parts(29),
+				ideal: Perbill::from_parts(38),
+				max: Perbill::from_parts(47)
 			}
 		);
 	});

diff --git a/precompiles/parachain-staking/src/mock.rs b/precompiles/parachain-staking/src/mock.rs
@@ -221,6 +221,7 @@ impl pallet_parachain_staking::Config for Runtime {
 	type SlotProvider = StakingRoundSlotProvider;
 	type WeightInfo = ();
 	type MaxCandidates = MaxCandidates;
+	type SlotsPerYear = frame_support::traits::ConstU32<{ 31_557_600 / 6 }>;
 }
 
 pub(crate) struct ExtBuilder {

diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs
@@ -158,8 +158,7 @@ pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_
 	.saturating_div(2)
 	.set_proof_size(cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64);
 
-// TODO: Set MILLISECS_PER_BLOCK to 6000 when async backing will be definitly enabled
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 6_000;
 pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
 pub const HOURS: BlockNumber = MINUTES * 60;
 pub const DAYS: BlockNumber = HOURS * 24;
@@ -825,6 +824,7 @@ impl pallet_parachain_staking::Config for Runtime {
 	type SlotProvider = RelayChainSlotProvider;
 	type WeightInfo = moonbeam_weights::pallet_parachain_staking::WeightInfo<Runtime>;
 	type MaxCandidates = ConstU32<200>;
+	type SlotsPerYear = ConstU32<{ 31_557_600 / 6 }>;
 }
 
 impl pallet_author_inherent::Config for Runtime {

diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs
@@ -668,7 +668,7 @@ fn reward_block_authors() {
 		.build()
 		.execute_with(|| {
 			increase_last_relay_slot_number(2);
-			for x in 2..599 {
+			for x in 2..1199 {
 				run_to_block(x, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
 			}
 			// no rewards doled out yet
@@ -677,7 +677,7 @@ fn reward_block_authors() {
 				1_100 * UNIT,
 			);
 			assert_eq!(Balances::usable_balance(AccountId::from(BOB)), 500 * UNIT,);
-			run_to_block(601, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
+			run_to_block(1201, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
 			// rewards minted and distributed
 			assert_eq!(
 				Balances::usable_balance(AccountId::from(ALICE)),
@@ -717,7 +717,7 @@ fn reward_block_authors_with_parachain_bond_reserved() {
 				AccountId::from(CHARLIE),
 			),);
 
-			for x in 2..599 {
+			for x in 2..1199 {
 				run_to_block(x, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
 			}
 
@@ -728,7 +728,7 @@ fn reward_block_authors_with_parachain_bond_reserved() {
 			);
 			assert_eq!(Balances::usable_balance(AccountId::from(BOB)), 500 * UNIT,);
 			assert_eq!(Balances::usable_balance(AccountId::from(CHARLIE)), UNIT,);
-			run_to_block(601, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
+			run_to_block(1201, Some(NimbusId::from_slice(&ALICE_NIMBUS).unwrap()));
 			// rewards minted and distributed
 			assert_eq!(
 				Balances::usable_balance(AccountId::from(ALICE)),

diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs
@@ -803,6 +803,7 @@ impl pallet_parachain_staking::Config for Runtime {
 	type SlotProvider = StakingRoundSlotProvider;
 	type WeightInfo = moonbeam_weights::pallet_parachain_staking::WeightInfo<Runtime>;
 	type MaxCandidates = ConstU32<200>;
+	type SlotsPerYear = ConstU32<{ 31_557_600 / 12 }>;
 }
 
 impl pallet_author_inherent::Config for Runtime {

diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs
@@ -805,6 +805,7 @@ impl pallet_parachain_staking::Config for Runtime {
 	type SlotProvider = StakingRoundSlotProvider;
 	type WeightInfo = moonbeam_weights::pallet_parachain_staking::WeightInfo<Runtime>;
 	type MaxCandidates = ConstU32<200>;
+	type SlotsPerYear = ConstU32<{ 31_557_600 / 12 }>;
 }
 
 impl pallet_author_inherent::Config for Runtime {