Incentive vesting for validators

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -231,6 +231,7 @@ impl frame_system::Config for Runtime {
 	type SingleBlockMigrations = Migrations;
 	type OnNewAccount = pallet_revive::AutoMapper<Runtime>;
 	type OnKilledAccount = pallet_revive::AutoMapper<Runtime>;
+	type BaseCallFilter = ValidatorVestingCallFilter;
 }
 
 impl cumulus_pallet_weight_reclaim::Config for Runtime {
@@ -540,6 +541,8 @@ parameter_types! {
 	pub const MinVestedTransfer: Balance = 100 * CENTS;
 	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
 		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
+	pub const VestingLockId: frame_support::traits::LockIdentifier =
+		pallet_vesting::DEFAULT_VESTING_LOCK_ID;
 }
 
 impl pallet_vesting::Config for Runtime {
@@ -551,6 +554,33 @@ impl pallet_vesting::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
 	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
+	type LockId = VestingLockId;
+}
+
+parameter_types! {
+	pub const ValidatorVestingLockId: frame_support::traits::LockIdentifier = *b"stkinctv";
+}
+
+/// Blocks direct user access to `vested_transfer` on the validator-incentive vesting instance. We
+/// don't include `force_vested_transfer` because it requires root origin, which bypasses all
+/// filters.
+pub struct ValidatorVestingCallFilter;
+impl frame_support::traits::Contains<RuntimeCall> for ValidatorVestingCallFilter {
+	fn contains(call: &RuntimeCall) -> bool {
+		!matches!(call, RuntimeCall::ValidatorVesting(pallet_vesting::Call::vested_transfer { .. }))
+	}
+}
+
+impl pallet_vesting::Config<pallet_vesting::Instance1> for Runtime {
+	const MAX_VESTING_SCHEDULES: u32 = 100;
+	type BlockNumberProvider = RelaychainDataProvider<Runtime>;
+	type BlockNumberToBalance = ConvertInto;
+	type Currency = Balances;
+	type MinVestedTransfer = MinVestedTransfer;
+	type RuntimeEvent = RuntimeEvent;
+	type WeightInfo = weights::pallet_vesting::WeightInfo<Runtime>;
+	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
+	type LockId = ValidatorVestingLockId;
 }
 
 parameter_types! {
@@ -1766,6 +1796,7 @@ construct_runtime!(
 		AssetTxPayment: pallet_asset_conversion_tx_payment = 13,
 		Vesting: pallet_vesting = 14,
 		PgasAllowance: pallet_pgas_allowance = 15,
+		ValidatorVesting: pallet_vesting::<Instance1> = 16,
 
 		// Collator support. the order of these 5 are important and shall not change.
 		Authorship: pallet_authorship = 20,
@@ -2259,6 +2290,7 @@ mod benches {
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		[pallet_treasury, Treasury]
 		[pallet_vesting, Vesting]
+		[pallet_vesting, ValidatorVesting]
 		[pallet_vesting_precompiles, VestingPrecompiles]
 		[pallet_whitelist, Whitelist]
 		[pallet_xcm_bridge_hub_router, ToRococo]

cumulus/parachains/runtimes/assets/asset-hub-westend/src/staking.rs

@@ -274,6 +274,7 @@ parameter_types! {
 	pub const MaxNominations: u32 = <NposCompactSolution16 as frame_election_provider_support::NposSolution>::LIMIT as u32;
 	pub const MaxEraDuration: u64 = RelaySessionDuration::get() as u64 * RELAY_CHAIN_SLOT_DURATION_MILLIS as u64 * SessionsPerEra::get() as u64;
 	pub MaxPruningItems: u32 = 100;
+	pub const ValidatorIncentiveVestingDuration: BlockNumber = 365 * RC_DAYS;
 }
 
 impl pallet_staking_async::Config for Runtime {
@@ -312,6 +313,12 @@ impl pallet_staking_async::Config for Runtime {
 		pallet_staking_async::reward::DefaultStakerRewardCalculator<Runtime>;
 	type MaxPruningItems = MaxPruningItems;
 	type WeightInfo = weights::pallet_staking_async::WeightInfo<Runtime>;
+	type VestingDuration = ValidatorIncentiveVestingDuration;
+	type VestingBlockNumberProvider = RelaychainDataProvider<Runtime>;
+	type ValidatorIncentivePayout = pallet_staking_async::VestedIncentivePayout<
+		Balances,
+		pallet_vesting::Pallet<Runtime, pallet_vesting::Instance1>,
+	>;
 }
 
 // Relay Chain session keys type for validating session keys on AssetHub.
@@ -645,6 +652,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use frame_support::traits::Contains;
 
 	#[test]
 	fn all_epmb_weights_sane() {
@@ -657,4 +665,87 @@ mod tests {
 			);
 		})
 	}
+
+	#[test]
+	fn validator_vesting_call_filter_blocks_vested_transfer() {
+		// Permisionless `vested_transfer` is not allowed on the ValidatorVesting instance.
+		let call = RuntimeCall::ValidatorVesting(pallet_vesting::Call::vested_transfer {
+			target: AccountId::from([42u8; 32]).into(),
+			schedule: pallet_vesting::VestingInfo::new(MinVestedTransfer::get(), 1, 0),
+		});
+		assert!(!ValidatorVestingCallFilter::contains(&call));
+	}
+
+	#[test]
+	fn validator_vesting_call_filter_allows_force_vested_transfer() {
+		// Since `force_vested_transfer` is root-only, it should always be accessible since
+		// it bypasses all filters.
+		let call = RuntimeCall::ValidatorVesting(pallet_vesting::Call::force_vested_transfer {
+			source: AccountId::from([1u8; 32]).into(),
+			target: AccountId::from([2u8; 32]).into(),
+			schedule: pallet_vesting::VestingInfo::new(MinVestedTransfer::get(), 1, 0),
+		});
+		assert!(ValidatorVestingCallFilter::contains(&call));
+	}
+
+	#[test]
+	fn validator_vesting_call_filter_allows_user_facing_calls() {
+		// We must keep `vest` and `vest_other` open so holders can unlock their funds.
+		assert!(ValidatorVestingCallFilter::contains(&RuntimeCall::ValidatorVesting(
+			pallet_vesting::Call::vest {}
+		)));
+		assert!(ValidatorVestingCallFilter::contains(&RuntimeCall::ValidatorVesting(
+			pallet_vesting::Call::vest_other { target: AccountId::from([1u8; 32]).into() }
+		)));
+		assert!(ValidatorVestingCallFilter::contains(&RuntimeCall::ValidatorVesting(
+			pallet_vesting::Call::merge_schedules { schedule1_index: 0, schedule2_index: 1 }
+		)));
+		// An unrelated pallet must also pass through.
+		assert!(ValidatorVestingCallFilter::contains(&RuntimeCall::Timestamp(
+			pallet_timestamp::Call::set { now: 0 }
+		)));
+	}
+
+	#[test]
+	fn add_to_vesting_works_bypassing_call_filter() {
+		// Since `add_to_vesting` is a plain internal Rust call (and not a dispatchable) it is
+		// always allowed as it does not go through filtering.
+		use frame_support::traits::tokens::VestedPayout;
+		sp_io::TestExternalities::default().execute_with(|| {
+			let source = AccountId::from([1u8; 32]);
+			let dest = AccountId::from([2u8; 32]);
+			let amount = MinVestedTransfer::get();
+
+			frame_support::assert_ok!(Balances::force_set_balance(
+				RuntimeOrigin::root(),
+				source.clone().into(),
+				amount + ExistentialDeposit::get(),
+			));
+
+			frame_support::assert_ok!(
+				<pallet_vesting::Pallet<Runtime, pallet_vesting::Instance1> as VestedPayout<
+					AccountId,
+					Balance,
+				>>::add_to_vesting(&source, &dest, amount, 20u32, 1u32,)
+			);
+
+			assert!(
+				pallet_vesting::Vesting::<Runtime, pallet_vesting::Instance1>::get(&dest).is_some()
+			);
+		});
+	}
+
+	#[test]
+	fn validator_vesting_call_filter_is_the_base_call_filter() {
+		// Verify that the runtime's BaseCallFilter is our filter, not `Everything`. This
+		// ensures the dispatchable-blocking is actually wired into the extrinsic pipeline.
+		let blocked = RuntimeCall::ValidatorVesting(pallet_vesting::Call::vested_transfer {
+			target: AccountId::from([0u8; 32]).into(),
+			schedule: pallet_vesting::VestingInfo::new(MinVestedTransfer::get(), 1, 0),
+		});
+		assert!(
+			!<Runtime as frame_system::Config>::BaseCallFilter::contains(&blocked),
+			"BaseCallFilter must block ValidatorVesting::vested_transfer"
+		);
+	}
 }

cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_vesting.rs

@@ -262,4 +262,12 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
+	/// NOTE: placeholder — re-run benchmarks after merging.
+	fn add_to_vesting_create(_l: u32, _s: u32) -> Weight {
+		Weight::zero()
+	}
+	/// NOTE: placeholder — re-run benchmarks after merging.
+	fn add_to_vesting_merge(_l: u32, _s: u32) -> Weight {
+		Weight::zero()
+	}
 }