From 5cd9e709a9430365d00b4bd0311b24ef55305b46 Mon Sep 17 00:00:00 2001 From: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:46:05 +0200 Subject: [PATCH] Phase 2 of People Chain Launch (#246) Do not merge until after the 1.2.0 release. These runtimes should be applied first to the Kusama Relay Chain (after People genesis) and then to the People Chain (after migration is complete). See details: https://forum.polkadot.network/t/people-chain-launch-and-identity-migration-plan/5930 --- CHANGELOG.md | 6 ++++++ .../people-kusama/src/tests/reap_identity.rs | 3 +-- relay/kusama/src/lib.rs | 7 +++---- .../people/people-kusama/src/lib.rs | 17 ++++------------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd19d7b88f..0eb1b02644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Changelog for the runtimes governed by the Polkadot Fellowship. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [1.2.1] 09.04.2024 + +### Changed + +- Modify runtimes for phase two of People Chain launch (Kusama) ([polkadot-fellows/runtimes#246](https://github.com/polkadot-fellows/runtimes/pull/246)) + ## [1.2.0] 28.03.2024 ### Added diff --git a/integration-tests/emulated/tests/people/people-kusama/src/tests/reap_identity.rs b/integration-tests/emulated/tests/people/people-kusama/src/tests/reap_identity.rs index fe6990fe69..3a55b3e354 100644 --- a/integration-tests/emulated/tests/people/people-kusama/src/tests/reap_identity.rs +++ b/integration-tests/emulated/tests/people/people-kusama/src/tests/reap_identity.rs @@ -292,8 +292,7 @@ fn assert_reap_id_relay(total_deposit: Balance, id: &Identity) { assert_ok!(KusamaIdentityMigrator::reap_identity( // Note: Root for launch testing, Signed once we open migrations. - KusamaOrigin::root(), - // KusamaOrigin::signed(KusamaRelaySender::get()), + KusamaOrigin::signed(KusamaRelaySender::get()), KusamaRelaySender::get() )); diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 985f87cb97..8e0cfd1b63 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -82,7 +82,7 @@ use frame_support::{ weights::{ConstantMultiplier, WeightMeter}, PalletId, }; -use frame_system::EnsureRoot; +use frame_system::{EnsureRoot, EnsureSigned}; use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_identity::legacy::IdentityInfo; use pallet_session::historical as session_historical; @@ -160,7 +160,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 1_002_000, + spec_version: 1_002_001, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 25, @@ -1000,8 +1000,7 @@ impl pallet_identity::Config for Runtime { impl identity_migrator::Config for Runtime { type RuntimeEvent = RuntimeEvent; - // To be updated to `EnsureSigned` once the parachain is producing blocks. - type Reaper = EnsureRoot; + type Reaper = EnsureSigned; type ReapIdentityHandler = impls::ToParachainIdentityReaper; type WeightInfo = weights::runtime_common_identity_migrator::WeightInfo; } diff --git a/system-parachains/people/people-kusama/src/lib.rs b/system-parachains/people/people-kusama/src/lib.rs index 216219f00f..2965b2295b 100644 --- a/system-parachains/people/people-kusama/src/lib.rs +++ b/system-parachains/people/people-kusama/src/lib.rs @@ -31,8 +31,8 @@ use frame_support::{ genesis_builder_helper::{build_config, create_default_config}, parameter_types, traits::{ - ConstBool, ConstU32, ConstU64, ConstU8, Contains, EitherOfDiverse, EverythingBut, - InstanceFilter, TransformOrigin, + ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything, InstanceFilter, + TransformOrigin, }, weights::{ConstantMultiplier, Weight}, PalletId, @@ -128,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("people-kusama"), impl_name: create_runtime_str!("people-kusama"), authoring_version: 1, - spec_version: 1_002_000, + spec_version: 1_002_001, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 0, @@ -166,18 +166,9 @@ parameter_types! { pub const SS58Prefix: u8 = 2; } -/// A type to identify calls to the Identity pallet. These will be filtered to prevent invocation, -/// locking the state of the pallet and preventing updates to identities until the chain is stable. -pub struct IsIdentityCall; -impl Contains for IsIdentityCall { - fn contains(c: &RuntimeCall) -> bool { - matches!(c, RuntimeCall::Identity(_)) - } -} - #[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)] impl frame_system::Config for Runtime { - type BaseCallFilter = EverythingBut; + type BaseCallFilter = Everything; type AccountId = AccountId; type Nonce = Nonce; type Hash = Hash;