[stable2506] Backport #9514 (#9522)

Backport #9514 into `stable2506` from bkontur.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

Co-authored-by: Branislav Kontur <[email protected]>
Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 3 people

polkadot/runtime/parachains/src/paras/benchmarking.rs

@@ -288,6 +288,7 @@ mod benchmarks {
 		let code = ValidationCode(vec![0; 32]);
 		let new_code_hash = code.hash();
 		let valid_period = BlockNumberFor::<T>::from(1_000_000_u32);
+		ParaLifecycles::<T>::insert(&para_id, ParaLifecycle::Parachain);
 
 		#[extrinsic_call]
 		_(RawOrigin::Root, para_id, new_code_hash, valid_period);

polkadot/runtime/parachains/src/paras/mod.rs

@@ -1297,11 +1297,13 @@ pub mod pallet {
 			valid_period: BlockNumberFor<T>,
 		) -> DispatchResult {
 			T::AuthorizeCurrentCodeOrigin::ensure_origin(origin, &para)?;
+			// The requested para must be a valid para (neither onboarding nor offboarding).
+			ensure!(Self::is_valid_para(para), Error::<T>::NotRegistered);
 
 			let now = frame_system::Pallet::<T>::block_number();
 			let expire_at = now.saturating_add(valid_period);
 
-			// insert authorized code hash and make sure to overwrite existing one for a para.
+			// Insert the authorized code hash and ensure it overwrites the existing one for a para.
 			AuthorizedCodeHash::<T>::insert(
 				&para,
 				AuthorizedCodeHashAndExpiry::from((new_code_hash, expire_at)),
@@ -1324,7 +1326,7 @@ pub mod pallet {
 			para: ParaId,
 			new_code: ValidationCode,
 		) -> DispatchResultWithPostInfo {
-			// no need to ensure, anybody can do this
+			// no need to ensure anybody can do this
 
 			// Ensure `new_code` is authorized
 			let _ = Self::validate_code_is_authorized(&new_code, &para)?;
@@ -1586,6 +1588,7 @@ impl<T: Config> Pallet<T> {
 					UpgradeGoAheadSignal::<T>::remove(&para);
 					UpgradeRestrictionSignal::<T>::remove(&para);
 					ParaLifecycles::<T>::remove(&para);
+					AuthorizedCodeHash::<T>::remove(&para);
 					let removed_future_code_hash = FutureCodeHash::<T>::take(&para);
 					if let Some(removed_future_code_hash) = removed_future_code_hash {
 						Self::decrease_code_ref(&removed_future_code_hash);

polkadot/runtime/parachains/src/paras/tests.rs

@@ -945,6 +945,11 @@ fn full_parachain_cleanup_storage() {
 		run_to_block(7, None);
 		assert_eq!(frame_system::Pallet::<Test>::block_number(), 7);
 		Paras::note_new_head(para_id, Default::default(), expected_at);
+		AuthorizedCodeHash::<Test>::insert(
+			&para_id,
+			AuthorizedCodeHashAndExpiry::from((ValidationCode(vec![7]).hash(), 1000)),
+		);
+		assert!(AuthorizedCodeHash::<Test>::get(&para_id).is_some());
 
 		assert_ok!(Paras::schedule_para_cleanup(para_id));
 
@@ -968,6 +973,7 @@ fn full_parachain_cleanup_storage() {
 		assert!(FutureCodeUpgrades::<Test>::get(&para_id).is_none());
 		assert!(FutureCodeHash::<Test>::get(&para_id).is_none());
 		assert!(Paras::current_code(&para_id).is_none());
+		assert!(AuthorizedCodeHash::<Test>::get(&para_id).is_none());
 
 		// run to do the final cleanup
 		let cleaned_up_at = 8 + code_retention_period + 1;
@@ -2173,7 +2179,33 @@ fn authorize_force_set_current_code_hash_works() {
 			DispatchError::BadOrigin,
 		);
 
-		// root can authorize
+		// para not registered
+		ParaLifecycles::<Test>::insert(&para_a, ParaLifecycle::Onboarding);
+		assert!(!Paras::is_valid_para(para_a));
+		assert_err!(
+			Paras::authorize_force_set_current_code_hash(
+				RuntimeOrigin::root(),
+				para_a,
+				code_1_hash,
+				valid_period
+			),
+			Error::<Test>::NotRegistered,
+		);
+		ParaLifecycles::<Test>::insert(&para_a, ParaLifecycle::OffboardingParachain);
+		assert!(!Paras::is_valid_para(para_a));
+		assert_err!(
+			Paras::authorize_force_set_current_code_hash(
+				RuntimeOrigin::root(),
+				para_a,
+				code_1_hash,
+				valid_period
+			),
+			Error::<Test>::NotRegistered,
+		);
+
+		// root can authorize for registered para
+		ParaLifecycles::<Test>::insert(&para_a, ParaLifecycle::Parachain);
+		assert!(Paras::is_valid_para(para_a));
 		System::set_block_number(1);
 		assert_ok!(Paras::authorize_force_set_current_code_hash(
 			RuntimeOrigin::root(),
@@ -2185,6 +2217,8 @@ fn authorize_force_set_current_code_hash_works() {
 			AuthorizedCodeHash::<Test>::get(&para_a),
 			Some((code_1_hash, 1 + valid_period).into())
 		);
+		ParaLifecycles::<Test>::insert(&para_b, ParaLifecycle::Parachain);
+		assert!(Paras::is_valid_para(para_b));
 		System::set_block_number(5);
 		assert_ok!(Paras::authorize_force_set_current_code_hash(
 			RuntimeOrigin::root(),

polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras.rs

@@ -17,9 +17,9 @@
 //! Autogenerated weights for `polkadot_runtime_parachains::paras`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2025-03-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2025-08-19, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `299f3957073a`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `1d17579cdeaf`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: 1024
 
 // Executed Command:
@@ -68,11 +68,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `8309`
 		//  Estimated: `11774`
-		// Minimum execution time: 38_137_000 picoseconds.
-		Weight::from_parts(38_981_000, 0)
+		// Minimum execution time: 36_757_000 picoseconds.
+		Weight::from_parts(37_351_000, 0)
 			.saturating_add(Weight::from_parts(0, 11774))
-			// Standard Error: 129
-			.saturating_add(Weight::from_parts(13_542, 0).saturating_mul(c.into()))
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(2_469, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(6))
 	}
@@ -83,11 +83,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_970_000 picoseconds.
-		Weight::from_parts(7_230_000, 0)
+		// Minimum execution time: 7_337_000 picoseconds.
+		Weight::from_parts(21_463_534, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 42
-			.saturating_add(Weight::from_parts(4_548, 0).saturating_mul(s.into()))
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(929, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Paras::MostRecentContext` (r:0 w:1)
@@ -96,8 +96,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_539_000 picoseconds.
-		Weight::from_parts(3_836_000, 0)
+		// Minimum execution time: 3_744_000 picoseconds.
+		Weight::from_parts(3_970_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -124,11 +124,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `8452`
 		//  Estimated: `11917`
-		// Minimum execution time: 52_993_000 picoseconds.
-		Weight::from_parts(53_656_000, 0)
+		// Minimum execution time: 52_945_000 picoseconds.
+		Weight::from_parts(53_953_000, 0)
 			.saturating_add(Weight::from_parts(0, 11917))
-			// Standard Error: 132
-			.saturating_add(Weight::from_parts(13_454, 0).saturating_mul(c.into()))
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(2_449, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(8))
 			.saturating_add(T::DbWeight::get().writes(7))
 	}
@@ -145,11 +145,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `268`
 		//  Estimated: `3733`
-		// Minimum execution time: 14_784_000 picoseconds.
-		Weight::from_parts(15_216_000, 0)
+		// Minimum execution time: 15_247_000 picoseconds.
+		Weight::from_parts(35_253_573, 0)
 			.saturating_add(Weight::from_parts(0, 3733))
-			// Standard Error: 42
-			.saturating_add(Weight::from_parts(4_570, 0).saturating_mul(s.into()))
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(935, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -161,8 +161,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `4312`
 		//  Estimated: `7777`
-		// Minimum execution time: 24_300_000 picoseconds.
-		Weight::from_parts(25_154_000, 0)
+		// Minimum execution time: 22_007_000 picoseconds.
+		Weight::from_parts(22_746_000, 0)
 			.saturating_add(Weight::from_parts(0, 7777))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -180,11 +180,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `683`
 		//  Estimated: `4148`
-		// Minimum execution time: 91_676_000 picoseconds.
-		Weight::from_parts(93_066_000, 0)
+		// Minimum execution time: 91_762_000 picoseconds.
+		Weight::from_parts(92_492_215, 0)
 			.saturating_add(Weight::from_parts(0, 4148))
-			// Standard Error: 127
-			.saturating_add(Weight::from_parts(12_834, 0).saturating_mul(c.into()))
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(1_951, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
@@ -196,8 +196,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `28`
 		//  Estimated: `3493`
-		// Minimum execution time: 6_886_000 picoseconds.
-		Weight::from_parts(7_123_000, 0)
+		// Minimum execution time: 7_076_000 picoseconds.
+		Weight::from_parts(7_394_000, 0)
 			.saturating_add(Weight::from_parts(0, 3493))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -212,8 +212,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `26706`
 		//  Estimated: `30171`
-		// Minimum execution time: 114_157_000 picoseconds.
-		Weight::from_parts(120_289_000, 0)
+		// Minimum execution time: 112_839_000 picoseconds.
+		Weight::from_parts(116_733_000, 0)
 			.saturating_add(Weight::from_parts(0, 30171))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -234,8 +234,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `27360`
 		//  Estimated: `30825`
-		// Minimum execution time: 727_795_000 picoseconds.
-		Weight::from_parts(754_623_000, 0)
+		// Minimum execution time: 753_885_000 picoseconds.
+		Weight::from_parts(780_076_000, 0)
 			.saturating_add(Weight::from_parts(0, 30825))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(103))
@@ -250,8 +250,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `27338`
 		//  Estimated: `30803`
-		// Minimum execution time: 110_002_000 picoseconds.
-		Weight::from_parts(117_296_000, 0)
+		// Minimum execution time: 109_551_000 picoseconds.
+		Weight::from_parts(115_723_000, 0)
 			.saturating_add(Weight::from_parts(0, 30803))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -270,8 +270,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `26728`
 		//  Estimated: `30193`
-		// Minimum execution time: 585_996_000 picoseconds.
-		Weight::from_parts(609_200_000, 0)
+		// Minimum execution time: 617_998_000 picoseconds.
+		Weight::from_parts(637_103_000, 0)
 			.saturating_add(Weight::from_parts(0, 30193))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -286,30 +286,38 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `26706`
 		//  Estimated: `30171`
-		// Minimum execution time: 106_306_000 picoseconds.
-		Weight::from_parts(113_807_000, 0)
+		// Minimum execution time: 108_309_000 picoseconds.
+		Weight::from_parts(112_880_000, 0)
 			.saturating_add(Weight::from_parts(0, 30171))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-
+	/// Storage: `Paras::UpgradeCooldowns` (r:1 w:1)
+	/// Proof: `Paras::UpgradeCooldowns` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Paras::UpgradeRestrictionSignal` (r:0 w:1)
+	/// Proof: `Paras::UpgradeRestrictionSignal` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn remove_upgrade_cooldown() -> Weight {
-		// JUST COPIED AND WILL BE UPDATED NEXT TIME
-		Weight::from_parts(107_759_000, 0)
-			.saturating_add(Weight::from_parts(0, 30171))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Proof Size summary in bytes:
+		//  Measured:  `267`
+		//  Estimated: `1752`
+		// Minimum execution time: 33_402_000 picoseconds.
+		Weight::from_parts(34_573_000, 0)
+			.saturating_add(Weight::from_parts(0, 1752))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
 	}
-
+	/// Storage: `Paras::ParaLifecycles` (r:1 w:0)
+	/// Proof: `Paras::ParaLifecycles` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::AuthorizedCodeHash` (r:0 w:1)
 	/// Proof: `Paras::AuthorizedCodeHash` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn authorize_force_set_current_code_hash() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 8_112_000 picoseconds.
-		Weight::from_parts(8_401_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
+		//  Measured:  `61`
+		//  Estimated: `3526`
+		// Minimum execution time: 13_133_000 picoseconds.
+		Weight::from_parts(13_801_000, 0)
+			.saturating_add(Weight::from_parts(0, 3526))
+			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Paras::AuthorizedCodeHash` (r:1 w:1)
@@ -325,11 +333,11 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras::WeightInfo for
 		// Proof Size summary in bytes:
 		//  Measured:  `132`
 		//  Estimated: `3597`
-		// Minimum execution time: 32_733_000 picoseconds.
-		Weight::from_parts(33_172_000, 0)
+		// Minimum execution time: 32_802_000 picoseconds.
+		Weight::from_parts(33_769_000, 0)
 			.saturating_add(Weight::from_parts(0, 3597))
-			// Standard Error: 133
-			.saturating_add(Weight::from_parts(14_731, 0).saturating_mul(c.into()))
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(3_966, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}

prdoc/pr_9514.prdoc

@@ -0,0 +1,10 @@
+title: 'Paras: Clean up `AuthorizedCodeHash` when offboarding'
+doc:
+- audience: Runtime Dev
+  description: This PR updates the `Paras` pallet to clear entries in `AuthorizedCodeHash`
+    as part of the offboarding process.
+crates:
+- name: polkadot-runtime-parachains
+  bump: patch
+- name: westend-runtime
+  bump: patch