diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 361602dbb32fbfabaabe67938025009ae7cd6bbc..a6362d1b43128c7333183d01ec699ef81f58d50e 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -1562,6 +1562,7 @@ pub mod migrations {
init_state_migration::InitMigrate,
pallet_society::migrations::MigrateToV2<Runtime, (), past_payouts::PastPayouts>,
pallet_im_online::migration::v1::Migration<Runtime>,
+ parachains_configuration::migration::v7::MigrateToV7<Runtime>,
);
/// Migrations that set `StorageVersion`s we missed to set.
diff --git a/polkadot/runtime/parachains/src/configuration.rs b/polkadot/runtime/parachains/src/configuration.rs
index 5317c18f8962ca38a9e32c03c4a297c165a33440..472f449e58e1f43a376de44969b3ce169f4d875a 100644
--- a/polkadot/runtime/parachains/src/configuration.rs
+++ b/polkadot/runtime/parachains/src/configuration.rs
@@ -218,12 +218,6 @@ pub struct HostConfiguration<BlockNumber> {
pub needed_approvals: u32,
/// The number of samples to do of the `RelayVRFModulo` approval assignment criterion.
pub relay_vrf_modulo_samples: u32,
- /// This flag controls whether PVF pre-checking is enabled.
- ///
- /// If the flag is false, the behavior should be exactly the same as prior. Specifically, the
- /// upgrade procedure is time-based and parachains that do not look at the go-ahead signal
- /// should still work.
- pub pvf_checking_enabled: bool,
/// If an active PVF pre-checking vote observes this many number of sessions it gets automatically
/// rejected.
///
@@ -291,7 +285,6 @@ impl<BlockNumber: Default + From<u32>> Default for HostConfiguration<BlockNumber
hrmp_max_parachain_outbound_channels: Default::default(),
hrmp_max_parathread_outbound_channels: Default::default(),
hrmp_max_message_num_per_candidate: Default::default(),
- pvf_checking_enabled: false,
pvf_voting_ttl: 2u32.into(),
minimum_validation_upgrade_delay: 2.into(),
executor_params: Default::default(),
@@ -1070,20 +1063,6 @@ pub mod pallet {
})
}
- /// Enable or disable PVF pre-checking. Consult the field documentation prior executing.
- #[pallet::call_index(41)]
- #[pallet::weight((
- // Using u32 here is a little bit of cheating, but that should be fine.
- T::WeightInfo::set_config_with_u32(),
- DispatchClass::Operational,
- ))]
- pub fn set_pvf_checking_enabled(origin: OriginFor<T>, new: bool) -> DispatchResult {
- ensure_root(origin)?;
- Self::schedule_config_update(|config| {
- config.pvf_checking_enabled = new;
- })
- }
-
/// Set the number of session changes after which a PVF pre-checking voting is rejected.
#[pallet::call_index(42)]
#[pallet::weight((
diff --git a/polkadot/runtime/parachains/src/configuration/migration.rs b/polkadot/runtime/parachains/src/configuration/migration.rs
index e499854e1188b641b661f6485a2bc71152ec08b9..d36e32be6543a7bce912537bd8be7cef7a62d230 100644
--- a/polkadot/runtime/parachains/src/configuration/migration.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration.rs
@@ -20,3 +20,4 @@ use primitives::ExecutorParams;
pub mod v5;
pub mod v6;
+pub mod v7;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v6.rs b/polkadot/runtime/parachains/src/configuration/migration/v6.rs
index 76ff788eb54d755ff589193da61655b2b664df1c..da08d9cd76e4c41fc4b2570700a6aaefe72e426e 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v6.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v6.rs
@@ -26,13 +26,107 @@ use frame_system::pallet_prelude::BlockNumberFor;
use sp_std::vec::Vec;
use frame_support::traits::OnRuntimeUpgrade;
-use primitives::SessionIndex;
+use primitives::{vstaging::AsyncBackingParams, Balance, ExecutorParams, SessionIndex};
#[cfg(feature = "try-runtime")]
use sp_std::prelude::*;
use super::v5::V5HostConfiguration;
-// Change this once there is V7.
-type V6HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+
+#[derive(parity_scale_codec::Encode, parity_scale_codec::Decode, Debug, Clone)]
+pub struct V6HostConfiguration<BlockNumber> {
+ pub max_code_size: u32,
+ pub max_head_data_size: u32,
+ pub max_upward_queue_count: u32,
+ pub max_upward_queue_size: u32,
+ pub max_upward_message_size: u32,
+ pub max_upward_message_num_per_candidate: u32,
+ pub hrmp_max_message_num_per_candidate: u32,
+ pub validation_upgrade_cooldown: BlockNumber,
+ pub validation_upgrade_delay: BlockNumber,
+ pub async_backing_params: AsyncBackingParams,
+ pub max_pov_size: u32,
+ pub max_downward_message_size: u32,
+ pub hrmp_max_parachain_outbound_channels: u32,
+ pub hrmp_max_parathread_outbound_channels: u32,
+ pub hrmp_sender_deposit: Balance,
+ pub hrmp_recipient_deposit: Balance,
+ pub hrmp_channel_max_capacity: u32,
+ pub hrmp_channel_max_total_size: u32,
+ pub hrmp_max_parachain_inbound_channels: u32,
+ pub hrmp_max_parathread_inbound_channels: u32,
+ pub hrmp_channel_max_message_size: u32,
+ pub executor_params: ExecutorParams,
+ pub code_retention_period: BlockNumber,
+ pub parathread_cores: u32,
+ pub parathread_retries: u32,
+ pub group_rotation_frequency: BlockNumber,
+ pub chain_availability_period: BlockNumber,
+ pub thread_availability_period: BlockNumber,
+ pub scheduling_lookahead: u32,
+ pub max_validators_per_core: Option<u32>,
+ pub max_validators: Option<u32>,
+ pub dispute_period: SessionIndex,
+ pub dispute_post_conclusion_acceptance_period: BlockNumber,
+ pub no_show_slots: u32,
+ pub n_delay_tranches: u32,
+ pub zeroth_delay_tranche_width: u32,
+ pub needed_approvals: u32,
+ pub relay_vrf_modulo_samples: u32,
+ pub pvf_checking_enabled: bool,
+ pub pvf_voting_ttl: SessionIndex,
+ pub minimum_validation_upgrade_delay: BlockNumber,
+}
+
+impl<BlockNumber: Default + From<u32>> Default for V6HostConfiguration<BlockNumber> {
+ fn default() -> Self {
+ Self {
+ async_backing_params: AsyncBackingParams {
+ max_candidate_depth: 0,
+ allowed_ancestry_len: 0,
+ },
+ group_rotation_frequency: 1u32.into(),
+ chain_availability_period: 1u32.into(),
+ thread_availability_period: 1u32.into(),
+ no_show_slots: 1u32.into(),
+ validation_upgrade_cooldown: Default::default(),
+ validation_upgrade_delay: 2u32.into(),
+ code_retention_period: Default::default(),
+ max_code_size: Default::default(),
+ max_pov_size: Default::default(),
+ max_head_data_size: Default::default(),
+ parathread_cores: Default::default(),
+ parathread_retries: Default::default(),
+ scheduling_lookahead: Default::default(),
+ max_validators_per_core: Default::default(),
+ max_validators: None,
+ dispute_period: 6,
+ dispute_post_conclusion_acceptance_period: 100.into(),
+ n_delay_tranches: Default::default(),
+ zeroth_delay_tranche_width: Default::default(),
+ needed_approvals: Default::default(),
+ relay_vrf_modulo_samples: Default::default(),
+ max_upward_queue_count: Default::default(),
+ max_upward_queue_size: Default::default(),
+ max_downward_message_size: Default::default(),
+ max_upward_message_size: Default::default(),
+ max_upward_message_num_per_candidate: Default::default(),
+ hrmp_sender_deposit: Default::default(),
+ hrmp_recipient_deposit: Default::default(),
+ hrmp_channel_max_capacity: Default::default(),
+ hrmp_channel_max_total_size: Default::default(),
+ hrmp_max_parachain_inbound_channels: Default::default(),
+ hrmp_max_parathread_inbound_channels: Default::default(),
+ hrmp_channel_max_message_size: Default::default(),
+ hrmp_max_parachain_outbound_channels: Default::default(),
+ hrmp_max_parathread_outbound_channels: Default::default(),
+ hrmp_max_message_num_per_candidate: Default::default(),
+ pvf_checking_enabled: false,
+ pvf_voting_ttl: 2u32.into(),
+ minimum_validation_upgrade_delay: 2.into(),
+ executor_params: Default::default(),
+ }
+ }
+}
mod v5 {
use super::*;
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v7.rs b/polkadot/runtime/parachains/src/configuration/migration/v7.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d3b1d8b94832bcf86e674f12d606b95c8a53a1ed
--- /dev/null
+++ b/polkadot/runtime/parachains/src/configuration/migration/v7.rs
@@ -0,0 +1,294 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
+
+//! A module that is responsible for migration of storage.
+
+use crate::configuration::{self, Config, Pallet};
+use frame_support::{
+ pallet_prelude::*,
+ traits::{Defensive, StorageVersion},
+ weights::Weight,
+};
+use frame_system::pallet_prelude::BlockNumberFor;
+use primitives::SessionIndex;
+use sp_std::vec::Vec;
+
+use frame_support::traits::OnRuntimeUpgrade;
+
+use super::v6::V6HostConfiguration;
+type V7HostConfiguration<BlockNumber> = configuration::HostConfiguration<BlockNumber>;
+
+mod v6 {
+ use super::*;
+
+ #[frame_support::storage_alias]
+ pub(crate) type ActiveConfig<T: Config> =
+ StorageValue<Pallet<T>, V6HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+ #[frame_support::storage_alias]
+ pub(crate) type PendingConfigs<T: Config> = StorageValue<
+ Pallet<T>,
+ Vec<(SessionIndex, V6HostConfiguration<BlockNumberFor<T>>)>,
+ OptionQuery,
+ >;
+}
+
+mod v7 {
+ use super::*;
+
+ #[frame_support::storage_alias]
+ pub(crate) type ActiveConfig<T: Config> =
+ StorageValue<Pallet<T>, V7HostConfiguration<BlockNumberFor<T>>, OptionQuery>;
+
+ #[frame_support::storage_alias]
+ pub(crate) type PendingConfigs<T: Config> = StorageValue<
+ Pallet<T>,
+ Vec<(SessionIndex, V7HostConfiguration<BlockNumberFor<T>>)>,
+ OptionQuery,
+ >;
+}
+
+pub struct MigrateToV7<T>(sp_std::marker::PhantomData<T>);
+impl<T: Config> OnRuntimeUpgrade for MigrateToV7<T> {
+ #[cfg(feature = "try-runtime")]
+ fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+ log::trace!(target: crate::configuration::LOG_TARGET, "Running pre_upgrade()");
+ Ok(Vec::new())
+ }
+
+ fn on_runtime_upgrade() -> Weight {
+ log::info!(target: configuration::LOG_TARGET, "MigrateToV7 started");
+ if StorageVersion::get::<Pallet<T>>() == 6 {
+ let weight_consumed = migrate_to_v7::<T>();
+
+ log::info!(target: configuration::LOG_TARGET, "MigrateToV7 executed successfully");
+ StorageVersion::new(7).put::<Pallet<T>>();
+
+ weight_consumed
+ } else {
+ log::warn!(target: configuration::LOG_TARGET, "MigrateToV7 should be removed.");
+ T::DbWeight::get().reads(1)
+ }
+ }
+
+ #[cfg(feature = "try-runtime")]
+ fn post_upgrade(_state: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+ log::trace!(target: crate::configuration::LOG_TARGET, "Running post_upgrade()");
+ ensure!(
+ StorageVersion::get::<Pallet<T>>() >= 7,
+ "Storage version should be >= 7 after the migration"
+ );
+
+ Ok(())
+ }
+}
+
+fn migrate_to_v7<T: Config>() -> Weight {
+ // Unusual formatting is justified:
+ // - make it easier to verify that fields assign what they supposed to assign.
+ // - this code is transient and will be removed after all migrations are done.
+ // - this code is important enough to optimize for legibility sacrificing consistency.
+ #[rustfmt::skip]
+ let translate =
+ |pre: V6HostConfiguration<BlockNumberFor<T>>| ->
+ V7HostConfiguration<BlockNumberFor<T>>
+ {
+ V7HostConfiguration {
+max_code_size : pre.max_code_size,
+max_head_data_size : pre.max_head_data_size,
+max_upward_queue_count : pre.max_upward_queue_count,
+max_upward_queue_size : pre.max_upward_queue_size,
+max_upward_message_size : pre.max_upward_message_size,
+max_upward_message_num_per_candidate : pre.max_upward_message_num_per_candidate,
+hrmp_max_message_num_per_candidate : pre.hrmp_max_message_num_per_candidate,
+validation_upgrade_cooldown : pre.validation_upgrade_cooldown,
+validation_upgrade_delay : pre.validation_upgrade_delay,
+max_pov_size : pre.max_pov_size,
+max_downward_message_size : pre.max_downward_message_size,
+hrmp_max_parachain_outbound_channels : pre.hrmp_max_parachain_outbound_channels,
+hrmp_max_parathread_outbound_channels : pre.hrmp_max_parathread_outbound_channels,
+hrmp_sender_deposit : pre.hrmp_sender_deposit,
+hrmp_recipient_deposit : pre.hrmp_recipient_deposit,
+hrmp_channel_max_capacity : pre.hrmp_channel_max_capacity,
+hrmp_channel_max_total_size : pre.hrmp_channel_max_total_size,
+hrmp_max_parachain_inbound_channels : pre.hrmp_max_parachain_inbound_channels,
+hrmp_max_parathread_inbound_channels : pre.hrmp_max_parathread_inbound_channels,
+hrmp_channel_max_message_size : pre.hrmp_channel_max_message_size,
+code_retention_period : pre.code_retention_period,
+parathread_cores : pre.parathread_cores,
+parathread_retries : pre.parathread_retries,
+group_rotation_frequency : pre.group_rotation_frequency,
+chain_availability_period : pre.chain_availability_period,
+thread_availability_period : pre.thread_availability_period,
+scheduling_lookahead : pre.scheduling_lookahead,
+max_validators_per_core : pre.max_validators_per_core,
+max_validators : pre.max_validators,
+dispute_period : pre.dispute_period,
+dispute_post_conclusion_acceptance_period: pre.dispute_post_conclusion_acceptance_period,
+no_show_slots : pre.no_show_slots,
+n_delay_tranches : pre.n_delay_tranches,
+zeroth_delay_tranche_width : pre.zeroth_delay_tranche_width,
+needed_approvals : pre.needed_approvals,
+relay_vrf_modulo_samples : pre.relay_vrf_modulo_samples,
+pvf_voting_ttl : pre.pvf_voting_ttl,
+minimum_validation_upgrade_delay : pre.minimum_validation_upgrade_delay,
+async_backing_params : pre.async_backing_params,
+executor_params : pre.executor_params,
+ }
+ };
+
+ let v6 = v6::ActiveConfig::<T>::get()
+ .defensive_proof("Could not decode old config")
+ .unwrap_or_default();
+ let v7 = translate(v6);
+ v7::ActiveConfig::<T>::set(Some(v7));
+
+ let pending_v6 = v6::PendingConfigs::<T>::get()
+ .defensive_proof("Could not decode old pending")
+ .unwrap_or_default();
+ let mut pending_v7 = Vec::new();
+
+ for (session, v6) in pending_v6.into_iter() {
+ let v7 = translate(v6);
+ pending_v7.push((session, v7));
+ }
+ v7::PendingConfigs::<T>::set(Some(pending_v7.clone()));
+
+ let num_configs = (pending_v7.len() + 1) as u64;
+ T::DbWeight::get().reads_writes(num_configs, num_configs)
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use crate::mock::{new_test_ext, Test};
+
+ #[test]
+ fn v6_deserialized_from_actual_data() {
+ // Example how to get new `raw_config`:
+ // We'll obtain the raw_config at a specified a block
+ // Steps:
+ // 1. Go to Polkadot.js -> Developer -> Chain state -> Storage: https://polkadot.js.org/apps/#/chainstate
+ // 2. Set these parameters:
+ // 2.1. selected state query: configuration; activeConfig(): PolkadotRuntimeParachainsConfigurationHostConfiguration
+ // 2.2. blockhash to query at: 0xf89d3ab5312c5f70d396dc59612f0aa65806c798346f9db4b35278baed2e0e53 (the hash of the block)
+ // 2.3. Note the value of encoded storage key -> 0x06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385 for the referenced block.
+ // 2.4. You'll also need the decoded values to update the test.
+ // 3. Go to Polkadot.js -> Developer -> Chain state -> Raw storage
+ // 3.1 Enter the encoded storage key and you get the raw config.
+
+ // This exceeds the maximal line width length, but that's fine, since this is not code and
+ // doesn't need to be read and also leaving it as one line allows to easily copy it.
+ let raw_config = hex_literal::hex!["00003000005000005555150000008000fbff0100000200000a000000c80000006400000000000000000000000000500000c800000a0000000000000000c0220fca950300000000000000000000c0220fca9503000000000000000000e8030000009001000a0000000000000000900100008070000000000000000000000a000000050000000500000001000000010500000001c80000000600000058020000020000002800000000000000020000000100000001020000000f000000"];
+
+ let v6 =
+ V6HostConfiguration::<primitives::BlockNumber>::decode(&mut &raw_config[..]).unwrap();
+
+ // We check only a sample of the values here. If we missed any fields or messed up data types
+ // that would skew all the fields coming after.
+ assert_eq!(v6.max_code_size, 3_145_728);
+ assert_eq!(v6.validation_upgrade_cooldown, 200);
+ assert_eq!(v6.max_pov_size, 5_242_880);
+ assert_eq!(v6.hrmp_channel_max_message_size, 102_400);
+ assert_eq!(v6.n_delay_tranches, 40);
+ assert_eq!(v6.minimum_validation_upgrade_delay, 15);
+ assert_eq!(v6.group_rotation_frequency, 10);
+ }
+
+ #[test]
+ fn test_migrate_to_v7() {
+ // Host configuration has lots of fields. However, in this migration we only remove one field.
+ // The most important part to check are a couple of the last fields. We also pick
+ // extra fields to check arbitrarily, e.g. depending on their position (i.e. the middle) and
+ // also their type.
+ //
+ // We specify only the picked fields and the rest should be provided by the `Default`
+ // implementation. That implementation is copied over between the two types and should work
+ // fine.
+ let v6 = V6HostConfiguration::<primitives::BlockNumber> {
+ needed_approvals: 69,
+ thread_availability_period: 55,
+ hrmp_recipient_deposit: 1337,
+ max_pov_size: 1111,
+ chain_availability_period: 33,
+ minimum_validation_upgrade_delay: 20,
+ pvf_checking_enabled: true,
+ ..Default::default()
+ };
+
+ let mut pending_configs = Vec::new();
+ pending_configs.push((100, v6.clone()));
+ pending_configs.push((300, v6.clone()));
+
+ new_test_ext(Default::default()).execute_with(|| {
+ // Implant the v6 version in the state.
+ v6::ActiveConfig::<Test>::set(Some(v6));
+ v6::PendingConfigs::<Test>::set(Some(pending_configs));
+
+ migrate_to_v7::<Test>();
+
+ let v7 = v7::ActiveConfig::<Test>::get().unwrap();
+ let mut configs_to_check = v7::PendingConfigs::<Test>::get().unwrap();
+ configs_to_check.push((0, v7.clone()));
+
+ for (_, v6) in configs_to_check {
+ #[rustfmt::skip]
+ {
+ assert_eq!(v6.max_code_size , v7.max_code_size);
+ assert_eq!(v6.max_head_data_size , v7.max_head_data_size);
+ assert_eq!(v6.max_upward_queue_count , v7.max_upward_queue_count);
+ assert_eq!(v6.max_upward_queue_size , v7.max_upward_queue_size);
+ assert_eq!(v6.max_upward_message_size , v7.max_upward_message_size);
+ assert_eq!(v6.max_upward_message_num_per_candidate , v7.max_upward_message_num_per_candidate);
+ assert_eq!(v6.hrmp_max_message_num_per_candidate , v7.hrmp_max_message_num_per_candidate);
+ assert_eq!(v6.validation_upgrade_cooldown , v7.validation_upgrade_cooldown);
+ assert_eq!(v6.validation_upgrade_delay , v7.validation_upgrade_delay);
+ assert_eq!(v6.max_pov_size , v7.max_pov_size);
+ assert_eq!(v6.max_downward_message_size , v7.max_downward_message_size);
+ assert_eq!(v6.hrmp_max_parachain_outbound_channels , v7.hrmp_max_parachain_outbound_channels);
+ assert_eq!(v6.hrmp_max_parathread_outbound_channels , v7.hrmp_max_parathread_outbound_channels);
+ assert_eq!(v6.hrmp_sender_deposit , v7.hrmp_sender_deposit);
+ assert_eq!(v6.hrmp_recipient_deposit , v7.hrmp_recipient_deposit);
+ assert_eq!(v6.hrmp_channel_max_capacity , v7.hrmp_channel_max_capacity);
+ assert_eq!(v6.hrmp_channel_max_total_size , v7.hrmp_channel_max_total_size);
+ assert_eq!(v6.hrmp_max_parachain_inbound_channels , v7.hrmp_max_parachain_inbound_channels);
+ assert_eq!(v6.hrmp_max_parathread_inbound_channels , v7.hrmp_max_parathread_inbound_channels);
+ assert_eq!(v6.hrmp_channel_max_message_size , v7.hrmp_channel_max_message_size);
+ assert_eq!(v6.code_retention_period , v7.code_retention_period);
+ assert_eq!(v6.parathread_cores , v7.parathread_cores);
+ assert_eq!(v6.parathread_retries , v7.parathread_retries);
+ assert_eq!(v6.group_rotation_frequency , v7.group_rotation_frequency);
+ assert_eq!(v6.chain_availability_period , v7.chain_availability_period);
+ assert_eq!(v6.thread_availability_period , v7.thread_availability_period);
+ assert_eq!(v6.scheduling_lookahead , v7.scheduling_lookahead);
+ assert_eq!(v6.max_validators_per_core , v7.max_validators_per_core);
+ assert_eq!(v6.max_validators , v7.max_validators);
+ assert_eq!(v6.dispute_period , v7.dispute_period);
+ assert_eq!(v6.no_show_slots , v7.no_show_slots);
+ assert_eq!(v6.n_delay_tranches , v7.n_delay_tranches);
+ assert_eq!(v6.zeroth_delay_tranche_width , v7.zeroth_delay_tranche_width);
+ assert_eq!(v6.needed_approvals , v7.needed_approvals);
+ assert_eq!(v6.relay_vrf_modulo_samples , v7.relay_vrf_modulo_samples);
+ assert_eq!(v6.pvf_voting_ttl , v7.pvf_voting_ttl);
+ assert_eq!(v6.minimum_validation_upgrade_delay , v7.minimum_validation_upgrade_delay);
+ assert_eq!(v6.async_backing_params.allowed_ancestry_len, v7.async_backing_params.allowed_ancestry_len);
+ assert_eq!(v6.async_backing_params.max_candidate_depth , v7.async_backing_params.max_candidate_depth);
+ assert_eq!(v6.executor_params , v7.executor_params);
+ }; // ; makes this a statement. `rustfmt::skip` cannot be put on an expression.
+ }
+ });
+ }
+}
diff --git a/polkadot/runtime/parachains/src/configuration/tests.rs b/polkadot/runtime/parachains/src/configuration/tests.rs
index d36394325bd6f948056f3e668f5349122e398148..0c2b5a779cb5874ad811afcfaec3c075280dfcc3 100644
--- a/polkadot/runtime/parachains/src/configuration/tests.rs
+++ b/polkadot/runtime/parachains/src/configuration/tests.rs
@@ -321,7 +321,6 @@ fn setting_pending_config_members() {
hrmp_max_parachain_outbound_channels: 10,
hrmp_max_parathread_outbound_channels: 20,
hrmp_max_message_num_per_candidate: 20,
- pvf_checking_enabled: true,
pvf_voting_ttl: 3,
minimum_validation_upgrade_delay: 20,
executor_params: Default::default(),
@@ -488,11 +487,6 @@ fn setting_pending_config_members() {
new_config.hrmp_max_message_num_per_candidate,
)
.unwrap();
- Configuration::set_pvf_checking_enabled(
- RuntimeOrigin::root(),
- new_config.pvf_checking_enabled,
- )
- .unwrap();
Configuration::set_pvf_voting_ttl(RuntimeOrigin::root(), new_config.pvf_voting_ttl)
.unwrap();
diff --git a/polkadot/runtime/parachains/src/hrmp/tests.rs b/polkadot/runtime/parachains/src/hrmp/tests.rs
index 78fd983e25b76a78640407893d9708a69da7a33f..8b9fd7136a13d203e10a44703e1cfd304e324ef8 100644
--- a/polkadot/runtime/parachains/src/hrmp/tests.rs
+++ b/polkadot/runtime/parachains/src/hrmp/tests.rs
@@ -119,7 +119,6 @@ fn default_genesis_config() -> MockGenesisConfig {
configuration: crate::configuration::GenesisConfig {
config: crate::configuration::HostConfiguration {
max_downward_message_size: 1024,
- pvf_checking_enabled: false,
..Default::default()
},
},
diff --git a/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs b/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
index 045e965f92e487949ce86344430f144070d49df8..ab5e13124436d076018b6e30dc2cc8a13162d5a1 100644
--- a/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
+++ b/polkadot/runtime/parachains/src/paras/benchmarking/pvf_check.rs
@@ -133,8 +133,7 @@ where
.collect::<Vec<_>>();
// 1. Make sure PVF pre-checking is enabled in the config.
- let mut config = configuration::Pallet::<T>::config();
- config.pvf_checking_enabled = true;
+ let config = configuration::Pallet::<T>::config();
configuration::Pallet::<T>::force_set_active_config(config.clone());
// 2. initialize a new session with deterministic validator set.
diff --git a/polkadot/runtime/parachains/src/paras/tests.rs b/polkadot/runtime/parachains/src/paras/tests.rs
index 7e3e80d102659bc044e44d84035118f292f8aa30..2bf30bb273e56bc63098c65ae80c6f0ee6849aa4 100644
--- a/polkadot/runtime/parachains/src/paras/tests.rs
+++ b/polkadot/runtime/parachains/src/paras/tests.rs
@@ -422,7 +422,6 @@ fn code_upgrade_applied_after_delay() {
code_retention_period,
validation_upgrade_delay,
validation_upgrade_cooldown,
- pvf_checking_enabled: false,
..Default::default()
},
..Default::default()
@@ -536,7 +535,6 @@ fn code_upgrade_applied_after_delay_even_when_late() {
code_retention_period,
validation_upgrade_delay,
validation_upgrade_cooldown,
- pvf_checking_enabled: false,
..Default::default()
},
..Default::default()
@@ -620,7 +618,6 @@ fn submit_code_change_when_not_allowed_is_err() {
code_retention_period,
validation_upgrade_delay,
validation_upgrade_cooldown,
- pvf_checking_enabled: false,
..Default::default()
},
..Default::default()
@@ -691,7 +688,6 @@ fn upgrade_restriction_elapsed_doesnt_mean_can_upgrade() {
code_retention_period,
validation_upgrade_delay,
validation_upgrade_cooldown,
- pvf_checking_enabled: false,
..Default::default()
},
..Default::default()
@@ -753,7 +749,6 @@ fn full_parachain_cleanup_storage() {
config: HostConfiguration {
code_retention_period,
validation_upgrade_delay,
- pvf_checking_enabled: false,
minimum_validation_upgrade_delay: 2,
// Those are not relevant to this test. However, HostConfiguration is still a
// subject for the consistency check.
@@ -861,10 +856,6 @@ fn cannot_offboard_ongoing_pvf_check() {
let genesis_config = MockGenesisConfig {
paras: GenesisConfig { paras, ..Default::default() },
- configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration { pvf_checking_enabled: true, ..Default::default() },
- ..Default::default()
- },
..Default::default()
};
@@ -901,13 +892,7 @@ fn para_incoming_at_session() {
let code_b = ValidationCode(vec![1]);
let code_c = ValidationCode(vec![3]);
- let genesis_config = MockGenesisConfig {
- configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration { pvf_checking_enabled: true, ..Default::default() },
- ..Default::default()
- },
- ..Default::default()
- };
+ let genesis_config = MockGenesisConfig::default();
new_test_ext(genesis_config).execute_with(|| {
run_to_block(1, Some(vec![1]));
@@ -1025,7 +1010,6 @@ fn code_hash_at_returns_up_to_end_of_code_retention_period() {
config: HostConfiguration {
code_retention_period,
validation_upgrade_delay,
- pvf_checking_enabled: false,
..Default::default()
},
..Default::default()
@@ -1118,11 +1102,7 @@ fn pvf_check_coalescing_onboarding_and_upgrade() {
let genesis_config = MockGenesisConfig {
paras: GenesisConfig { paras, ..Default::default() },
configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration {
- pvf_checking_enabled: true,
- validation_upgrade_delay,
- ..Default::default()
- },
+ config: HostConfiguration { validation_upgrade_delay, ..Default::default() },
..Default::default()
},
..Default::default()
@@ -1187,11 +1167,7 @@ fn pvf_check_onboarding_reject_on_expiry() {
let genesis_config = MockGenesisConfig {
configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration {
- pvf_checking_enabled: true,
- pvf_voting_ttl,
- ..Default::default()
- },
+ config: HostConfiguration { pvf_voting_ttl, ..Default::default() },
..Default::default()
},
..Default::default()
@@ -1250,10 +1226,6 @@ fn pvf_check_upgrade_reject() {
let genesis_config = MockGenesisConfig {
paras: GenesisConfig { paras, ..Default::default() },
- configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration { pvf_checking_enabled: true, ..Default::default() },
- ..Default::default()
- },
..Default::default()
};
@@ -1330,13 +1302,7 @@ fn pvf_check_submit_vote() {
(validate_unsigned, dispatch_result)
};
- let genesis_config = MockGenesisConfig {
- configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration { pvf_checking_enabled: true, ..Default::default() },
- ..Default::default()
- },
- ..Default::default()
- };
+ let genesis_config = MockGenesisConfig::default();
new_test_ext(genesis_config).execute_with(|| {
// Important to run this to seed the validators.
@@ -1440,10 +1406,6 @@ fn include_pvf_check_statement_refunds_weight() {
let genesis_config = MockGenesisConfig {
paras: GenesisConfig { paras, ..Default::default() },
- configuration: crate::configuration::GenesisConfig {
- config: HostConfiguration { pvf_checking_enabled: true, ..Default::default() },
- ..Default::default()
- },
..Default::default()
};
@@ -1601,7 +1563,6 @@ fn add_trusted_validation_code_insta_approval() {
let genesis_config = MockGenesisConfig {
configuration: crate::configuration::GenesisConfig {
config: HostConfiguration {
- pvf_checking_enabled: true,
validation_upgrade_delay,
minimum_validation_upgrade_delay,
..Default::default()
@@ -1621,8 +1582,7 @@ fn add_trusted_validation_code_insta_approval() {
Paras::schedule_code_upgrade(para_id, validation_code.clone(), 1, &Configuration::config());
Paras::note_new_head(para_id, HeadData::default(), 1);
- // Verify that the code upgrade has `expected_at` set to `26`. This is the behavior
- // equal to that of `pvf_checking_enabled: false`.
+ // Verify that the code upgrade has `expected_at` set to `26`.
assert_eq!(FutureCodeUpgrades::<Test>::get(¶_id), Some(1 + validation_upgrade_delay));
// Verify that the required events were emitted.
@@ -1645,7 +1605,6 @@ fn add_trusted_validation_code_enacts_existing_pvf_vote() {
let genesis_config = MockGenesisConfig {
configuration: crate::configuration::GenesisConfig {
config: HostConfiguration {
- pvf_checking_enabled: true,
validation_upgrade_delay,
minimum_validation_upgrade_delay,
..Default::default()
diff --git a/polkadot/runtime/parachains/src/scheduler/tests.rs b/polkadot/runtime/parachains/src/scheduler/tests.rs
index f1daf85d5ce18acce46305ccecf53b2e36044de4..2188bb15b2e5ba0314c2ab222d947aba556f79ff 100644
--- a/polkadot/runtime/parachains/src/scheduler/tests.rs
+++ b/polkadot/runtime/parachains/src/scheduler/tests.rs
@@ -103,7 +103,6 @@ fn default_config() -> HostConfiguration<BlockNumber> {
thread_availability_period: 5,
scheduling_lookahead: 2,
parathread_retries: 1,
- pvf_checking_enabled: false,
// This field does not affect anything that scheduler does. However, `HostConfiguration`
// is still a subject to consistency test. It requires that `minimum_validation_upgrade_delay`
// is greater than `chain_availability_period` and `thread_availability_period`.
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index da0c28b9c92a9c243c166ed8c5d332cbb9027007..cc4131e37f051404c82e51332da066a4b99fb6dd 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -1525,7 +1525,10 @@ pub mod migrations {
);
/// Unreleased migrations. Add new ones here:
- pub type Unreleased = (pallet_im_online::migration::v1::Migration<Runtime>,);
+ pub type Unreleased = (
+ pallet_im_online::migration::v1::Migration<Runtime>,
+ parachains_configuration::migration::v7::MigrateToV7<Runtime>,
+ );
/// Migrations that set `StorageVersion`s we missed to set.
pub struct SetStorageVersions;
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 58705283f859abd3b08e28a4e2470b5850d84397..92199dcad398f585fe194cf413f69091cf0def5f 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -1627,6 +1627,7 @@ pub mod migrations {
pub type Unreleased = (
pallet_society::migrations::MigrateToV2<Runtime, (), ()>,
pallet_im_online::migration::v1::Migration<Runtime>,
+ parachains_configuration::migration::v7::MigrateToV7<Runtime>,
);
}
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 7fee94d8265daa44eb510d37541aa01206d6887d..bfa8b6e60f47b3664dd1c5a8e73c127dfba835e3 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1326,7 +1326,10 @@ pub mod migrations {
}
/// Unreleased migrations. Add new ones here:
- pub type Unreleased = (pallet_im_online::migration::v1::Migration<Runtime>,);
+ pub type Unreleased = (
+ pallet_im_online::migration::v1::Migration<Runtime>,
+ parachains_configuration::migration::v7::MigrateToV7<Runtime>,
+ );
}
/// Helpers to configure all migrations.