Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polkadot People Phase 2 (Triggers Release 1.2.7) #350

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ 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.7] 14.06.2024

Note: This release only affects the following runtimes and is not a full system release:

- Polkadot Relay Chain
- Polkadot People

### Changed

- Updated Relay and People configurations to complete launch ([polkadot-fellows/runtimes#350](https://github.com/polkadot-fellows/runtimes/pull/350))

## [1.2.6] 13.06.2024

Note: This release only affects the following runtimes and is not a full system release:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,7 @@ fn assert_reap_id_relay(total_deposit: Balance, id: &Identity) {

assert_ok!(PolkadotIdentityMigrator::reap_identity(
// Note: Root for launch testing, Signed once we open migrations.
// PolkadotOrigin::signed(PolkadotRelaySender::get()),
PolkadotOrigin::root(),
PolkadotOrigin::signed(PolkadotRelaySender::get()),
PolkadotRelaySender::get()
));

Expand Down
8 changes: 5 additions & 3 deletions relay/polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ pub mod xcm_config;

use impls::ToParachainIdentityReaper;

#[cfg(not(feature = "runtime-benchmarks"))]
use frame_system::EnsureSigned;

pub const LOG_TARGET: &str = "runtime::polkadot";

use polkadot_runtime_common as runtime_common;
Expand All @@ -152,7 +155,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0,
spec_version: 1_002_006,
spec_version: 1_002_007,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 26,
Expand Down Expand Up @@ -859,9 +862,8 @@ 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.
#[cfg(not(feature = "runtime-benchmarks"))]
type Reaper = EnsureRoot<AccountId>;
type Reaper = EnsureSigned<AccountId>;
#[cfg(feature = "runtime-benchmarks")]
type Reaper =
impls::benchmarks::InitializeReaperForBenchmarking<AccountId, EnsureRoot<AccountId>>;
Expand Down
17 changes: 4 additions & 13 deletions system-parachains/people/people-polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use frame_support::{
genesis_builder_helper::{build_config, create_default_config},
parameter_types,
traits::{
tokens::imbalance::ResolveTo, ConstBool, ConstU32, ConstU64, ConstU8, Contains,
EitherOfDiverse, EverythingBut, InstanceFilter, TransformOrigin,
tokens::imbalance::ResolveTo, ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
Everything, InstanceFilter, TransformOrigin,
},
weights::{ConstantMultiplier, Weight},
PalletId,
Expand Down Expand Up @@ -128,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("people-polkadot"),
impl_name: create_runtime_str!("people-polkadot"),
authoring_version: 1,
spec_version: 1_002_006,
spec_version: 1_002_007,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 0,
Expand Down Expand Up @@ -166,18 +166,9 @@ parameter_types! {
pub const SS58Prefix: u8 = 0;
}

/// 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<RuntimeCall> 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<IsIdentityCall>;
type BaseCallFilter = Everything;
type AccountId = AccountId;
type Nonce = Nonce;
type Hash = Hash;
Expand Down
Loading