Skip to content

Commit 5cd9e70

Browse files
authored
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
1 parent bb42c6b commit 5cd9e70

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Changelog for the runtimes governed by the Polkadot Fellowship.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7+
## [1.2.1] 09.04.2024
8+
9+
### Changed
10+
11+
- Modify runtimes for phase two of People Chain launch (Kusama) ([polkadot-fellows/runtimes#246](https://github.com/polkadot-fellows/runtimes/pull/246))
12+
713
## [1.2.0] 28.03.2024
814

915
### Added

integration-tests/emulated/tests/people/people-kusama/src/tests/reap_identity.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ fn assert_reap_id_relay(total_deposit: Balance, id: &Identity) {
292292

293293
assert_ok!(KusamaIdentityMigrator::reap_identity(
294294
// Note: Root for launch testing, Signed once we open migrations.
295-
KusamaOrigin::root(),
296-
// KusamaOrigin::signed(KusamaRelaySender::get()),
295+
KusamaOrigin::signed(KusamaRelaySender::get()),
297296
KusamaRelaySender::get()
298297
));
299298

relay/kusama/src/lib.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ use frame_support::{
8282
weights::{ConstantMultiplier, WeightMeter},
8383
PalletId,
8484
};
85-
use frame_system::EnsureRoot;
85+
use frame_system::{EnsureRoot, EnsureSigned};
8686
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
8787
use pallet_identity::legacy::IdentityInfo;
8888
use pallet_session::historical as session_historical;
@@ -160,7 +160,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
160160
spec_name: create_runtime_str!("kusama"),
161161
impl_name: create_runtime_str!("parity-kusama"),
162162
authoring_version: 2,
163-
spec_version: 1_002_000,
163+
spec_version: 1_002_001,
164164
impl_version: 0,
165165
apis: RUNTIME_API_VERSIONS,
166166
transaction_version: 25,
@@ -1000,8 +1000,7 @@ impl pallet_identity::Config for Runtime {
10001000

10011001
impl identity_migrator::Config for Runtime {
10021002
type RuntimeEvent = RuntimeEvent;
1003-
// To be updated to `EnsureSigned` once the parachain is producing blocks.
1004-
type Reaper = EnsureRoot<AccountId>;
1003+
type Reaper = EnsureSigned<AccountId>;
10051004
type ReapIdentityHandler = impls::ToParachainIdentityReaper<Runtime, Self::AccountId>;
10061005
type WeightInfo = weights::runtime_common_identity_migrator::WeightInfo<Runtime>;
10071006
}

system-parachains/people/people-kusama/src/lib.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ use frame_support::{
3131
genesis_builder_helper::{build_config, create_default_config},
3232
parameter_types,
3333
traits::{
34-
ConstBool, ConstU32, ConstU64, ConstU8, Contains, EitherOfDiverse, EverythingBut,
35-
InstanceFilter, TransformOrigin,
34+
ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Everything, InstanceFilter,
35+
TransformOrigin,
3636
},
3737
weights::{ConstantMultiplier, Weight},
3838
PalletId,
@@ -128,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
128128
spec_name: create_runtime_str!("people-kusama"),
129129
impl_name: create_runtime_str!("people-kusama"),
130130
authoring_version: 1,
131-
spec_version: 1_002_000,
131+
spec_version: 1_002_001,
132132
impl_version: 0,
133133
apis: RUNTIME_API_VERSIONS,
134134
transaction_version: 0,
@@ -166,18 +166,9 @@ parameter_types! {
166166
pub const SS58Prefix: u8 = 2;
167167
}
168168

169-
/// A type to identify calls to the Identity pallet. These will be filtered to prevent invocation,
170-
/// locking the state of the pallet and preventing updates to identities until the chain is stable.
171-
pub struct IsIdentityCall;
172-
impl Contains<RuntimeCall> for IsIdentityCall {
173-
fn contains(c: &RuntimeCall) -> bool {
174-
matches!(c, RuntimeCall::Identity(_))
175-
}
176-
}
177-
178169
#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
179170
impl frame_system::Config for Runtime {
180-
type BaseCallFilter = EverythingBut<IsIdentityCall>;
171+
type BaseCallFilter = Everything;
181172
type AccountId = AccountId;
182173
type Nonce = Nonce;
183174
type Hash = Hash;

0 commit comments

Comments
 (0)