Add BlockNumberProvider to salary pallet config

cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "collectives-westend-runtime"
-version = "3.0.0"
+version = "3.1.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"

cumulus/parachains/runtimes/collectives/collectives-westend/src/ambassador/mod.rs

@@ -270,4 +270,6 @@ impl pallet_salary::Config<AmbassadorSalaryInstance> for Runtime {
 	type PayoutPeriod = ConstU32<{ 15 * DAYS }>;
 	// Total monthly salary budget.
 	type Budget = ConstU128<{ 10_000 * DOLLARS }>;
+
+	type BlockNumberProvider = cumulus_pallet_parachain_system::RelaychainDataProvider<Runtime>;
 }

cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs

@@ -257,6 +257,8 @@ impl pallet_salary::Config<FellowshipSalaryInstance> for Runtime {
 	type PayoutPeriod = ConstU32<{ 15 * DAYS }>;
 	// Total monthly salary budget.
 	type Budget = ConstU128<{ 100_000 * USDT_UNITS }>;
+
+	type BlockNumberProvider = cumulus_pallet_parachain_system::RelaychainDataProvider<Runtime>;
 }
 
 parameter_types! {

cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs

@@ -49,9 +49,11 @@ extern crate alloc;
 pub use ambassador::pallet_ambassador_origins;
 
 use alloc::{vec, vec::Vec};
-use ambassador::AmbassadorCoreInstance;
+use ambassador::{AmbassadorCoreInstance, AmbassadorSalaryInstance};
 use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
-use fellowship::{pallet_fellowship_origins, Fellows, FellowshipCoreInstance};
+use fellowship::{
+	pallet_fellowship_origins, Fellows, FellowshipCoreInstance, FellowshipSalaryInstance,
+};
 use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp};
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
@@ -126,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("collectives-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("collectives-westend"),
 	authoring_version: 1,
-	spec_version: 1_017_001,
+	spec_version: 1_018_000,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
@@ -762,8 +764,52 @@ type Migrations = (
 	pallet_core_fellowship::migration::MigrateV0ToV1<Runtime, FellowshipCoreInstance>,
 	// unreleased
 	pallet_core_fellowship::migration::MigrateV0ToV1<Runtime, AmbassadorCoreInstance>,
+	// unreleased
+	pallet_salary::migration::MigrateV0ToV1<
+		Runtime,
+		SalaryBlockNumberConverter,
+		FellowshipSalaryInstance,
+	>,
+	pallet_salary::migration::MigrateV0ToV1<
+		Runtime,
+		SalaryBlockNumberConverter,
+		AmbassadorSalaryInstance,
+	>,
 );
 
+// Helpers for the salary pallet v0->v1 storage migration.
+use sp_runtime::traits::BlockNumberProvider;
+type SalaryLocalBlockNumber = <System as BlockNumberProvider>::BlockNumber;
+type SalaryNewBlockNumber = <cumulus_pallet_parachain_system::RelaychainDataProvider<Runtime>
+	as BlockNumberProvider>::BlockNumber;
+pub struct SalaryBlockNumberConverter;
+impl pallet_salary::migration::v1::ConvertBlockNumber<SalaryLocalBlockNumber, SalaryNewBlockNumber>
+	for SalaryBlockNumberConverter
+{
+	/// Simply convert the types. Cycle index storage item uses block number but is agnostic to the
+	/// time that denotes for instance
+	fn convert(local: SalaryLocalBlockNumber) -> SalaryNewBlockNumber {
+		local
+	}
+
+	/// The equivalent moment in time from the perspective of the relay chain, starting from a
+	/// local moment in time (system block number)
+	fn equivalent_moment_in_time(local: SalaryLocalBlockNumber) -> SalaryNewBlockNumber {
+		let block_number = System::block_number();
+		let local_duration = block_number.saturating_sub(local);
+		let relay_duration = Self::equivalent_block_duration(local_duration); //6s to 6s
+		let relay_block_number = ParachainSystem::last_relay_block_number();
+		relay_block_number.saturating_sub(relay_duration)
+	}
+
+	/// The equivalent duration from the perspective of the relay chain, starting from
+	/// a local duration (number of block). Identity function for Westend, since both
+	/// relay and collectives chain run 6s block times
+	fn equivalent_block_duration(local: SalaryLocalBlockNumber) -> SalaryNewBlockNumber {
+		local
+	}
+}
+
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,

prdoc/pr_7000.prdoc

@@ -0,0 +1,15 @@
+title: 'Adds BlockNumberProvider to pallet-core-fellowship'
+doc:
+- audience: Runtime Dev
+  description: |-
+    This PR adds a parameter 'BlockNumberProvider' to the pallet-salary 
+    config such that a block provider can be set for use in the pallet. This would 
+    usually be the frame system pallet or the appropriate relay chain. Previously 
+    it defaulted to the frame system pallet.
+crates:
+- name: pallet-salary
+  bump: major
+- name: collectives-westend-runtime
+  bump: minor
+- name: kitchensink-runtime
+  bump: patch

substrate/bin/node/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kitchensink-runtime"
-version = "3.0.0-dev"
+version = "3.0.1-dev"
 authors.workspace = true
 description = "Substrate node kitchensink runtime."
 edition.workspace = true

substrate/bin/node/runtime/src/lib.rs

@@ -177,7 +177,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
 	spec_version: 268,
-	impl_version: 0,
+	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 2,
 	system_version: 1,
@@ -1976,6 +1976,7 @@ impl pallet_salary::Config for Runtime {
 	type RegistrationPeriod = ConstU32<200>;
 	type PayoutPeriod = ConstU32<200>;
 	type Budget = Budget;
+	type BlockNumberProvider = System;
 }
 
 impl pallet_core_fellowship::Config for Runtime {

substrate/frame/salary/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-salary"
-version = "13.0.0"
+version = "14.0.0"
 authors.workspace = true
 edition.workspace = true
 license = "Apache-2.0"

substrate/frame/salary/src/benchmarking.rs

@@ -20,11 +20,12 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use crate::Pallet as Salary;
+use crate::{BlockNumberFor as SalaryBlockNumberFor, Pallet as Salary};
 
 use frame_benchmarking::v2::*;
-use frame_system::{Pallet as System, RawOrigin};
+use frame_system::RawOrigin;
 use sp_core::Get;
+use sp_runtime::traits::BlockNumberProvider;
 
 const SEED: u32 = 0;
 
@@ -47,6 +48,14 @@ fn ensure_member_with_salary<T: Config<I>, I: 'static>(who: &T::AccountId) {
 mod benchmarks {
 	use super::*;
 
+	fn get_block_number<T: Config<I>, I: 'static>() -> SalaryBlockNumberFor<T, I> {
+		T::BlockNumberProvider::current_block_number()
+	}
+
+	fn set_block_number<T: Config<I>, I: 'static>(n: SalaryBlockNumberFor<T, I>) {
+		T::BlockNumberProvider::set_block_number(n);
+	}
+
 	#[benchmark]
 	fn init() {
 		let caller: T::AccountId = whitelisted_caller();
@@ -61,7 +70,7 @@ mod benchmarks {
 	fn bump() {
 		let caller: T::AccountId = whitelisted_caller();
 		Salary::<T, I>::init(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + Salary::<T, I>::cycle_period());
+		set_block_number::<T, I>(get_block_number::<T, I>() + Salary::<T, I>::cycle_period());
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller.clone()));
@@ -87,7 +96,7 @@ mod benchmarks {
 		ensure_member_with_salary::<T, I>(&caller);
 		Salary::<T, I>::init(RawOrigin::Signed(caller.clone()).into()).unwrap();
 		Salary::<T, I>::induct(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + Salary::<T, I>::cycle_period());
+		set_block_number::<T, I>(get_block_number::<T, I>() + Salary::<T, I>::cycle_period());
 		Salary::<T, I>::bump(RawOrigin::Signed(caller.clone()).into()).unwrap();
 
 		#[extrinsic_call]
@@ -102,9 +111,9 @@ mod benchmarks {
 		ensure_member_with_salary::<T, I>(&caller);
 		Salary::<T, I>::init(RawOrigin::Signed(caller.clone()).into()).unwrap();
 		Salary::<T, I>::induct(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + Salary::<T, I>::cycle_period());
+		set_block_number::<T, I>(get_block_number::<T, I>() + Salary::<T, I>::cycle_period());
 		Salary::<T, I>::bump(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + T::RegistrationPeriod::get());
+		set_block_number::<T, I>(get_block_number::<T, I>() + T::RegistrationPeriod::get());
 
 		let salary = T::Salary::get_salary(T::Members::rank_of(&caller).unwrap(), &caller);
 		T::Paymaster::ensure_successful(&caller, (), salary);
@@ -128,9 +137,9 @@ mod benchmarks {
 		ensure_member_with_salary::<T, I>(&caller);
 		Salary::<T, I>::init(RawOrigin::Signed(caller.clone()).into()).unwrap();
 		Salary::<T, I>::induct(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + Salary::<T, I>::cycle_period());
+		set_block_number::<T, I>(get_block_number::<T, I>() + Salary::<T, I>::cycle_period());
 		Salary::<T, I>::bump(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + T::RegistrationPeriod::get());
+		set_block_number::<T, I>(get_block_number::<T, I>() + T::RegistrationPeriod::get());
 
 		let salary = T::Salary::get_salary(T::Members::rank_of(&caller).unwrap(), &caller);
 		let recipient: T::AccountId = account("recipient", 0, SEED);
@@ -155,9 +164,9 @@ mod benchmarks {
 		ensure_member_with_salary::<T, I>(&caller);
 		Salary::<T, I>::init(RawOrigin::Signed(caller.clone()).into()).unwrap();
 		Salary::<T, I>::induct(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + Salary::<T, I>::cycle_period());
+		set_block_number::<T, I>(get_block_number::<T, I>() + Salary::<T, I>::cycle_period());
 		Salary::<T, I>::bump(RawOrigin::Signed(caller.clone()).into()).unwrap();
-		System::<T>::set_block_number(System::<T>::block_number() + T::RegistrationPeriod::get());
+		set_block_number::<T, I>(get_block_number::<T, I>() + T::RegistrationPeriod::get());
 
 		let salary = T::Salary::get_salary(T::Members::rank_of(&caller).unwrap(), &caller);
 		let recipient: T::AccountId = account("recipient", 0, SEED);