git.delta.rocks / unique-network / refs/commits / 700b0c8abd12

difftreelog

fix enable throttling

Yaroslav Bolyukin2023-10-16parent: #8c199c3.patch.diff
in: master

6 files changed

modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -396,6 +396,8 @@
 			}
 		}
 		#[cfg(feature = "try-runtime")]
+		// embedded try-runtime cli will be removed soon.
+		#[allow(deprecated)]
 		Some(Subcommand::TryRuntime(cmd)) => {
 			use std::{future::Future, pin::Pin};
modifiedpallets/inflation/src/lib.rsdiffbeforeafterboth
--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -71,7 +71,9 @@
 		type TreasuryAccountId: Get<Self::AccountId>;
 
 		// The block number provider, which should be callable from `on_initialize` hook.
-		type OnInitializeBlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
+		type OnInitializeBlockNumberProvider: BlockNumberProvider<
+			BlockNumber = BlockNumberFor<Self>,
+		>;
 
 		/// Number of blocks that pass between treasury balance updates due to inflation
 		#[pallet::constant]
modifiedprimitives/common/src/constants.rsdiffbeforeafterboth
before · primitives/common/src/constants.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;18use frame_support::{19	parameter_types,20	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},21};22use sp_runtime::Perbill;2324use crate::types::{Balance, BlockNumber};2526pub const MILLISECS_PER_BLOCK: u64 = 12000;27pub const MILLISECS_PER_RELAY_BLOCK: u64 = 6000;2829pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;3031// These time units are defined in number of blocks.32pub const MINUTES: u32 = 60_000 / (MILLISECS_PER_BLOCK as u32);33pub const HOURS: u32 = MINUTES * 60;34pub const DAYS: u32 = HOURS * 24;3536// These time units are defined in number of relay blocks.37pub const RELAY_MINUTES: u32 = 60_000 / (MILLISECS_PER_RELAY_BLOCK as u32);38pub const RELAY_HOURS: u32 = RELAY_MINUTES * 60;39pub const RELAY_DAYS: u32 = RELAY_HOURS * 24;4041pub const MICROUNIQUE: Balance = 1_000_000_000_000;42pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;43pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;44pub const UNIQUE: Balance = 100 * CENTIUNIQUE;4546/// Minimum balance required to create or keep an account open.47pub const EXISTENTIAL_DEPOSIT: u128 = 0;4849/// Amount of Balance reserved for candidate registration.50pub const GENESIS_LICENSE_BOND: u128 = 1_000_000_000_000 * UNIQUE;51/// Amount of maximum collators for Collator Selection.52pub const MAX_COLLATORS: u32 = 10;53/// How long a periodic session lasts in blocks.54pub const SESSION_LENGTH: BlockNumber = HOURS;5556// Targeting 0.1 UNQ per transfer57pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/77_334_604_063_436_322/*</weight2fee>*/;5859// Targeting 0.15 UNQ per transfer via ETH60pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_920_639_188_722/*</mingasprice>*/;6162/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.63/// This is used to limit the maximal weight of a single extrinsic.64pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);65/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used66/// by  Operational  extrinsics.67pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);68/// We allow for 2 seconds of compute with a 6 second average block time.69pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(70	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),71	MAX_POV_SIZE as u64,72);7374parameter_types! {75	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE / 2;76}
after · primitives/common/src/constants.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;18use frame_support::{19	parameter_types,20	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight},21};22use sp_runtime::Perbill;2324use crate::types::{Balance, BlockNumber};2526#[cfg(not(feature = "lookahead"))]27pub const MILLISECS_PER_BLOCK: u64 = 12000;28#[cfg(feature = "lookahead")]29pub const MILLISECS_PER_BLOCK: u64 = 3000;30pub const MILLISECS_PER_RELAY_BLOCK: u64 = 6000;3132pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;3334// These time units are defined in number of blocks.35pub const MINUTES: u32 = 60_000 / (MILLISECS_PER_BLOCK as u32);36pub const HOURS: u32 = MINUTES * 60;37pub const DAYS: u32 = HOURS * 24;3839// These time units are defined in number of relay blocks.40pub const RELAY_MINUTES: u32 = 60_000 / (MILLISECS_PER_RELAY_BLOCK as u32);41pub const RELAY_HOURS: u32 = RELAY_MINUTES * 60;42pub const RELAY_DAYS: u32 = RELAY_HOURS * 24;4344pub const MICROUNIQUE: Balance = 1_000_000_000_000;45pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;46pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;47pub const UNIQUE: Balance = 100 * CENTIUNIQUE;4849/// Minimum balance required to create or keep an account open.50pub const EXISTENTIAL_DEPOSIT: u128 = 0;5152/// Amount of Balance reserved for candidate registration.53pub const GENESIS_LICENSE_BOND: u128 = 1_000_000_000_000 * UNIQUE;54/// Amount of maximum collators for Collator Selection.55pub const MAX_COLLATORS: u32 = 10;56/// How long a periodic session lasts in blocks.57pub const SESSION_LENGTH: BlockNumber = HOURS;5859// Targeting 0.1 UNQ per transfer60pub const WEIGHT_TO_FEE_COEFF: u64 = /*<weight2fee>*/77_334_604_063_436_322/*</weight2fee>*/;6162// Targeting 0.15 UNQ per transfer via ETH63pub const MIN_GAS_PRICE: u64 = /*<mingasprice>*/1_920_639_188_722/*</mingasprice>*/;6465/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.66/// This is used to limit the maximal weight of a single extrinsic.67pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);68/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used69/// by  Operational  extrinsics.70pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);71/// We allow for 2 seconds of compute with a 6 second average block time.72pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(73	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),74	MAX_POV_SIZE as u64,75);7677parameter_types! {78	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE / 2;79}
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -21,7 +21,7 @@
 	traits::{ConstU32, ConstU64, Currency},
 };
 use sp_arithmetic::Perbill;
-use sp_runtime::traits::{BlockNumberProvider, AccountIdConversion};
+use sp_runtime::traits::{AccountIdConversion, BlockNumberProvider};
 use up_common::{
 	constants::*,
 	types::{AccountId, Balance, BlockNumber},
@@ -111,8 +111,8 @@
 	type BlockNumber = BlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
+		use hex_literal::hex;
 		use parity_scale_codec::Decode;
-		use hex_literal::hex;
 		use sp_io::storage;
 		// TODO: Replace with the following code after https://github.com/paritytech/polkadot-sdk/commit/3ea497b5a0fdda252f9c5a3c257cfaf8685f02fd lands
 		// <cumulus_pallet_parachain_system::Pallet<Runtime>>::last_relay_block_number()
@@ -122,7 +122,8 @@
 			// First parachain block
 			return Default::default()
 		};
-		BlockNumber::decode(&mut encoded.as_ref()).expect("typeof(RelayBlockNumber) == typeof(BlockNumber) == u32; qed")
+		BlockNumber::decode(&mut encoded.as_ref())
+			.expect("typeof(RelayBlockNumber) == typeof(BlockNumber) == u32; qed")
 	}
 }
modifiedruntime/common/config/parachain.rsdiffbeforeafterboth
--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -38,9 +38,29 @@
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
+	#[cfg(not(feature = "lookahead"))]
 	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	#[cfg(feature = "lookahead")]
+	type CheckAssociatedRelayNumber =
+		cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 }
 
 impl parachain_info::Config for Runtime {}
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}
+
+/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
+/// into the relay chain.
+#[cfg(feature = "lookahead")]
+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.
+#[cfg(feature = "lookahead")]
+const BLOCK_PROCESSING_VELOCITY: u32 = 2;
+#[cfg(feature = "lookahead")]
+pub type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	{ MILLISECS_PER_RELAY_BLOCK as u32 },
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -682,11 +682,10 @@
 			#[cfg(feature = "lookahead")]
 			impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
 				fn can_build_upon(
-					_included_hash: <Block as BlockT>::Hash,
-					_slot: cumulus_primitives_aura::Slot,
+					included_hash: <Block as BlockT>::Hash,
+					slot: cumulus_primitives_aura::Slot,
 				) -> bool {
-					// FIXME: Limit velocity
-					true
+					$crate::config::parachain::ConsensusHook::can_build_upon(included_hash, slot)
 				}
 			}