[AHM] Final Staking Configs for Kusama

.github/scripts/cmd/cmd.py

@@ -29,27 +29,27 @@
 subparsers = parser.add_subparsers(help='a command to run', dest='command')
 
 """
-BENCH 
+BENCH
 """
 
 bench_example = '''**Examples**:
 
  > runs all benchmarks
- 
+
  %(prog)s
- 
+
  > runs benchmarks for pallet_balances and pallet_multisig for all runtimes which have these pallets
  > --quiet makes it to output nothing to PR but reactions
- 
+
  %(prog)s --pallet pallet_balances pallet_xcm_benchmarks::generic --quiet
- 
+
  > runs bench for all pallets for polkadot runtime and continues even if some benchmarks fail
- 
- %(prog)s --runtime polkadot --continue-on-fail 
- 
- > does not output anything and cleans up the previous bot's & author command triggering comments in PR 
- 
- %(prog)s --runtime polkadot kusama --pallet pallet_balances pallet_multisig --quiet --clean 
+
+ %(prog)s --runtime polkadot --continue-on-fail
+
+ > does not output anything and cleans up the previous bot's & author command triggering comments in PR
+
+ %(prog)s --runtime polkadot kusama --pallet pallet_balances pallet_multisig --quiet --clean
 
  '''
 
@@ -62,7 +62,7 @@
 parser_bench.add_argument('--pallet', help='Pallet(s) space separated', nargs='*', default=[])
 
 """
-FMT 
+FMT
 """
 parser_fmt = subparsers.add_parser('fmt', help='Formats code')
 for arg, config in common_args.items():

relay/kusama/src/lib.rs

@@ -121,8 +121,8 @@ pub use sp_runtime::BuildStorage;
 use sp_runtime::{
 	generic, impl_opaque_keys,
 	traits::{
-		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Get,
-		IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Saturating, Verify,
+		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Convert, ConvertInto,
+		Get, IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Saturating, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedU128, KeyTypeId, OpaqueValue, Perbill, Percent, Permill,
@@ -485,6 +485,7 @@ impl pallet_timestamp::Config for Runtime {
 
 impl pallet_authorship::Config for Runtime {
 	type FindAuthor = pallet_session::FindAccountFromAuthorIndex<Self, Babe>;
+	// Era points are now reported to ah-client, to be sent to AH on next session.
 	type EventHandler = StakingAhClient;
 }
 
@@ -510,6 +511,8 @@ impl pallet_session::Config for Runtime {
 	type ValidatorIdOf = ConvertInto;
 	type ShouldEndSession = Babe;
 	type NextSessionRotation = Babe;
+	// Sessions are now managed by the staking-ah client, giving us validator sets, and sending
+	// session report.
 	type SessionManager = session_historical::NoteHistoricalRoot<Self, StakingAhClient>;
 	type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
 	type Keys = SessionKeys;
@@ -522,6 +525,10 @@ impl pallet_session::Config for Runtime {
 
 impl pallet_session::historical::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
+	// Note: while the identification of each validators for historical reasons is still an
+	// exposure, we actually don't need this data, and `DefaultExposureOf` always uses
+	// `Default::default`. Retaining this type + keeping a default value is only for historical
+	// reasons and backwards compatibility.
 	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
 	type FullIdentificationOf = pallet_staking::DefaultExposureOf<Runtime>;
 }
@@ -803,7 +810,7 @@ impl pallet_staking::EraPayout<Balance> for EraPayout {
 
 		let params = relay_common::EraPayoutParams {
 			total_staked,
-			total_stakable: 0, // TODO: double check
+			total_stakable: Balances::total_issuance(),
 			ideal_stake: dynamic_params::inflation::IdealStake::get(),
 			max_annual_inflation: dynamic_params::inflation::MaxInflation::get(),
 			min_annual_inflation: dynamic_params::inflation::MinInflation::get(),
@@ -1030,6 +1037,8 @@ impl pallet_child_bounties::Config for Runtime {
 impl pallet_offences::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type IdentificationTuple = pallet_session::historical::IdentificationTuple<Self>;
+	// Offences are now reported to ah-client, to be forwarded to AH, after potentially disabling
+	// validators.
 	type OnOffenceHandler = StakingAhClient;
 }
 
@@ -1340,8 +1349,7 @@ impl InstanceFilter<RuntimeCall> for TransparentProxyType {
 				matches!(
 					c,
 					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) |
-						RuntimeCall::Utility(..) |
+						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
 						RuntimeCall::FastUnstake(..) |
 						RuntimeCall::VoterList(..) |
 						RuntimeCall::NominationPools(..)
@@ -1426,6 +1434,7 @@ impl parachains_session_info::Config for Runtime {
 impl parachains_inclusion::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type DisputesHandler = ParasDisputes;
+	// parachain consensus points are now reported to ah-client, to be sent to AH on next session.
 	type RewardValidators =
 		parachains_reward_points::RewardValidatorsWithEraPoints<Runtime, StakingAhClient>;
 	type MessageQueue = MessageQueue;
@@ -1712,6 +1721,8 @@ impl pallet_nomination_pools::Config for Runtime {
 parameter_types! {
 	pub const DelegatedStakingPalletId: PalletId = PalletId(*b"py/dlstk");
 	pub const SlashRewardFraction: Perbill = Perbill::from_percent(1);
+	// Kusama always wants 1000 validators, we reject anything smaller than that.
+	pub storage MinimumValidatorSetSize: u32 = 1000;
 }
 
 impl pallet_delegated_staking::Config for Runtime {
@@ -1732,9 +1743,10 @@ impl pallet_staking_async_ah_client::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type SessionInterface = Self;
 	type SendToAssetHub = StakingXcmToAssetHub;
-	type MinimumValidatorSetSize = ConstU32<400>;
+	type MinimumValidatorSetSize = MinimumValidatorSetSize;
 	type UnixTime = Timestamp;
 	type PointsPerBlock = ConstU32<20>;
+	// TODO @kianenigma
 	type MaxOffenceBatchSize = ConstU32<50>;
 	type Fallback = Staking;
 	type WeightInfo = pallet_staking_async_ah_client::weights::SubstrateWeight<Runtime>;
@@ -1762,6 +1774,7 @@ impl frame_support::traits::EnsureOrigin<RuntimeOrigin> for EnsureAssetHub {
 
 #[derive(Encode, Decode)]
 enum AssetHubRuntimePallets<AccountId> {
+	// index of the rc-client pallet in ksm-ah.
 	#[codec(index = 84)]
 	RcClient(RcClientCalls<AccountId>),
 }
@@ -1802,12 +1815,12 @@ impl pallet_staking_async_ah_client::SendToAssetHub for StakingXcmToAssetHub {
 	fn relay_session_report(
 		session_report: pallet_staking_async_rc_client::SessionReport<Self::AccountId>,
 	) {
-		pallet_staking_async_rc_client::XCMSender::<
-			xcm_config::XcmRouter,
-			AssetHubLocation,
-			pallet_staking_async_rc_client::SessionReport<AccountId>,
-			SessionReportToXcm,
-		>::split_then_send(session_report, Some(8));
+		// TODO: after https://github.com/paritytech/polkadot-sdk/pull/9619, use `XCMSender::send` and handle error
+		let message = SessionReportToXcm::convert(session_report);
+		let dest = AssetHubLocation::get();
+		let _ = xcm::prelude::send_xcm::<xcm_config::XcmRouter>(dest, message).inspect_err(|err| {
+			log::error!(target: "runtime::ah-client", "Failed to send relay session report: {:?}", err);
+		});
 	}
 
 	fn relay_new_offence(
@@ -1830,9 +1843,12 @@ impl pallet_staking_async_ah_client::SendToAssetHub for StakingXcmToAssetHub {
 				.into(),
 			},
 		]);
-		if let Err(err) = send_xcm::<xcm_config::XcmRouter>(AssetHubLocation::get(), message) {
-			log::error!(target: "runtime::ah-client", "Failed to send relay offence message: {:?}", err);
-		}
+		// TODO: after https://github.com/paritytech/polkadot-sdk/pull/9619, use `XCMSender::send` and handle error
+		let _ = send_xcm::<xcm_config::XcmRouter>(AssetHubLocation::get(), message).inspect_err(
+			|err| {
+				log::error!(target: "runtime::ah-client", "Failed to send relay offence message: {:?}", err);
+			},
+		);
 	}
 }
 
@@ -2005,6 +2021,7 @@ construct_runtime! {
 		// Staking extension for delegation
 		DelegatedStaking: pallet_delegated_staking = 47,
 
+		// staking client to communicate with AH.
 		StakingAhClient: pallet_staking_async_ah_client = 48,
 
 		// Parachains pallets. Start indices at 50 to leave room.

system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml

@@ -138,6 +138,7 @@ snowbridge-inbound-queue-primitives = { workspace = true }
 asset-test-utils = { workspace = true }
 parachains-runtimes-test-utils = { workspace = true }
 sp-io = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true }

system-parachains/asset-hubs/asset-hub-kusama/src/genesis_config_presets.rs

@@ -69,7 +69,7 @@ fn asset_hub_kusama_genesis(
 		},
 		"staking": {
 			"validatorCount": 1000,
-			"devStakers": Some((2_000, 25_000)),
+			"devStakers": Some((4_000, 15_000)),
 		},
 		"foreignAssets": ForeignAssetsConfig {
 			assets: foreign_assets

system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs

@@ -92,10 +92,10 @@ use sp_runtime::{
 	generic, impl_opaque_keys,
 	traits::{
 		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, Convert, ConvertInto,
-		Verify,
+		Get, Verify,
 	},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, Perbill, Permill, RuntimeDebug,
+	ApplyExtrinsicResult, Perbill, Permill, Perquintill, RuntimeDebug,
 };
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
@@ -661,8 +661,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 						RuntimeCall::Utility { .. } |
 						RuntimeCall::Multisig { .. } |
 						RuntimeCall::NftFractionalization { .. } |
-						RuntimeCall::Nfts { .. } |
-						RuntimeCall::Uniques { .. }
+						RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. }
 				)
 			},
 			ProxyType::AssetOwner => matches!(
@@ -750,8 +749,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				matches!(
 					c,
 					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) |
-						RuntimeCall::Utility(..) |
+						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
 						RuntimeCall::NominationPools(..) |
 						RuntimeCall::VoterList(..)
 				)
@@ -1345,6 +1343,8 @@ impl EnsureOriginWithArg<RuntimeOrigin, RuntimeParametersKey> for DynamicParamet
 		use crate::RuntimeParametersKey::*;
 
 		match key {
+			// TODO: @kianenigma/!bkontur - do we want to allow StakingAdmin here?
+			Inflation(_) => frame_system::ensure_root(origin.clone()),
 			Treasury(_) => {
 				EitherOf::<EnsureRoot<AccountId>, GeneralAdmin>::ensure_origin(origin.clone())
 			},
@@ -1371,6 +1371,27 @@ impl pallet_parameters::Config for Runtime {
 pub mod dynamic_params {
 	use super::*;
 
+	/// Parameters used to calculate staking era payouts.
+	#[dynamic_pallet_params]
+	#[codec(index = 0)]
+	pub mod inflation {
+		/// Minimum inflation rate used to calculate era payouts.
+		#[codec(index = 0)]
+		pub static MinInflation: Perquintill = Perquintill::from_rational(25u64, 1000);
+
+		/// Maximum inflation rate used to calculate era payouts.
+		#[codec(index = 1)]
+		pub static MaxInflation: Perquintill = Perquintill::from_percent(10);
+
+		/// Ideal stake ratio used to calculate era payouts.
+		#[codec(index = 2)]
+		pub static IdealStake: Perquintill = Perquintill::from_percent(75);
+
+		/// Falloff used to calculate era payouts.
+		#[codec(index = 3)]
+		pub static Falloff: Perquintill = Perquintill::from_percent(5);
+	}
+
 	/// Parameters used by `pallet-treasury` to handle the burn process.
 	#[dynamic_pallet_params]
 	#[codec(index = 1)]
@@ -1386,9 +1407,10 @@ pub mod dynamic_params {
 #[cfg(feature = "runtime-benchmarks")]
 impl Default for RuntimeParameters {
 	fn default() -> Self {
-		RuntimeParameters::Treasury(dynamic_params::treasury::Parameters::BurnPortion(
-			dynamic_params::treasury::BurnPortion,
-			Some(Permill::from_percent(0)),
+		// TODO: @kianenigma/!bkontur - is this ok?
+		RuntimeParameters::Inflation(dynamic_params::inflation::Parameters::MinInflation(
+			dynamic_params::inflation::MinInflation,
+			Some(Perquintill::from_rational(25u64, 1000u64)),
 		))
 	}
 }
@@ -1571,6 +1593,9 @@ pub type Migrations = (
 		pallet_session::migrations::v1::InitOffenceSeverity<Runtime>,
 	>,
 	cumulus_pallet_aura_ext::migration::MigrateV0ToV1<Runtime>,
+	// TODO: maybe rewrite this to execute if the storage items are not set, relying on the spec
+	// version might be flaky.
+	staking::InitiateStakingAsync<1_008_000>,
 	// permanent
 	pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 );