pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 12:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for #10379 (EnsureOneOf) (#810)

Browse Source 
* new ensure one of

* Update Cargo.lock

* Update SUbstrate & Polkadot

Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Shawn Tabrizi
2021-12-01 19:06:50 -04:00
committed by GitHub
parent 6b3ac7e1a2
commit a3798775d8
4 changed files with 251 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+235 -235
View File
File diff suppressed because it is too large Load Diff
cumulus/polkadot-parachains/rococo-parachain/src/lib.rs
+4 -7
View File
@@ -38,7 +38,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates. // A few exports that help ease life for downstream crates.
pub use frame_support::{ pub use frame_support::{
construct_runtime, match_type, parameter_types, construct_runtime, match_type, parameter_types,
traits::{Everything, IsInVec, Randomness}, traits::{EnsureOneOf, Everything, IsInVec, Randomness},
weights::{ weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
DispatchClass, IdentityFee, Weight, DispatchClass, IdentityFee, Weight,
@@ -47,7 +47,7 @@ pub use frame_support::{
}; };
use frame_system::{ use frame_system::{
limits::{BlockLength, BlockWeights}, limits::{BlockLength, BlockWeights},
EnsureOneOf, EnsureRoot, EnsureRoot,
}; };
pub use pallet_balances::Call as BalancesCall; pub use pallet_balances::Call as BalancesCall;
pub use pallet_timestamp::Call as TimestampCall; pub use pallet_timestamp::Call as TimestampCall;
@@ -473,11 +473,8 @@ parameter_types! {
} }
/// A majority of the Unit body from Rococo over XCM is our required administration origin. /// A majority of the Unit body from Rococo over XCM is our required administration origin.
pub type AdminOrigin = EnsureOneOf< pub type AdminOrigin =
AccountId, EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<RocLocation, UnitBody>>>;
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<RocLocation, UnitBody>>,
>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;
cumulus/polkadot-parachains/statemine/src/lib.rs
+6 -12
View File
@@ -43,7 +43,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee}; use constants::{currency::*, fee::WeightToFee};
use frame_support::{ use frame_support::{
construct_runtime, match_type, parameter_types, construct_runtime, match_type, parameter_types,
traits::{Everything, InstanceFilter, Nothing}, traits::{EnsureOneOf, Everything, InstanceFilter, Nothing},
weights::{ weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight}, constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, IdentityFee, Weight, DispatchClass, IdentityFee, Weight,
@@ -52,7 +52,7 @@ use frame_support::{
}; };
use frame_system::{ use frame_system::{
limits::{BlockLength, BlockWeights}, limits::{BlockLength, BlockWeights},
EnsureOneOf, EnsureRoot, EnsureRoot,
}; };
pub use parachains_common as common; pub use parachains_common as common;
use parachains_common::{ use parachains_common::{
@@ -224,11 +224,8 @@ parameter_types! {
} }
/// We allow root and the Relay Chain council to execute privileged asset operations. /// We allow root and the Relay Chain council to execute privileged asset operations.
pub type AssetsForceOrigin = EnsureOneOf< pub type AssetsForceOrigin =
AccountId, EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>;
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>,
>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;
@@ -643,11 +640,8 @@ parameter_types! {
} }
/// We allow root and the Relay Chain council to execute privileged collator selection operations. /// We allow root and the Relay Chain council to execute privileged collator selection operations.
pub type CollatorSelectionUpdateOrigin = EnsureOneOf< pub type CollatorSelectionUpdateOrigin =
AccountId, EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>;
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>,
>;
impl pallet_collator_selection::Config for Runtime { impl pallet_collator_selection::Config for Runtime {
type Event = Event; type Event = Event;
cumulus/polkadot-parachains/statemint/src/lib.rs
+6 -12
View File
@@ -43,7 +43,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee}; use constants::{currency::*, fee::WeightToFee};
use frame_support::{ use frame_support::{
construct_runtime, match_type, parameter_types, construct_runtime, match_type, parameter_types,
traits::{Contains, Everything, InstanceFilter, Nothing}, traits::{Contains, EnsureOneOf, Everything, InstanceFilter, Nothing},
weights::{ weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight}, constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, IdentityFee, Weight, DispatchClass, IdentityFee, Weight,
@@ -52,7 +52,7 @@ use frame_support::{
}; };
use frame_system::{ use frame_system::{
limits::{BlockLength, BlockWeights}, limits::{BlockLength, BlockWeights},
EnsureOneOf, EnsureRoot, EnsureRoot,
}; };
pub use parachains_common as common; pub use parachains_common as common;
use parachains_common::{ use parachains_common::{
@@ -236,11 +236,8 @@ parameter_types! {
} }
/// We allow root and the Relay Chain council to execute privileged asset operations. /// We allow root and the Relay Chain council to execute privileged asset operations.
pub type AssetsForceOrigin = EnsureOneOf< pub type AssetsForceOrigin =
AccountId, EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>;
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>,
>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;
@@ -655,11 +652,8 @@ parameter_types! {
} }
/// We allow root and the Relay Chain council to execute privileged collator selection operations. /// We allow root and the Relay Chain council to execute privileged collator selection operations.
pub type CollatorSelectionUpdateOrigin = EnsureOneOf< pub type CollatorSelectionUpdateOrigin =
AccountId, EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>;
EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>,
>;
impl pallet_collator_selection::Config for Runtime { impl pallet_collator_selection::Config for Runtime {
type Event = Event; type Event = Event;