pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-21 10:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for #11124 (#1316)

Browse Source 
* Fixes

* Bump

* Formatting

* Bump

* Bump
This commit is contained in:
Gavin Wood
2022-05-31 18:50:02 +01:00
committed by GitHub
parent fefd160138
commit 1ea523dde7
5 changed files with 281 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+259 -259
View File
File diff suppressed because it is too large Load Diff
parachains/runtimes/assets/statemine/src/lib.rs
+7 -5
View File
@@ -46,7 +46,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee}; use constants::{currency::*, fee::WeightToFee};
use frame_support::{ use frame_support::{
construct_runtime, parameter_types, construct_runtime, parameter_types,
traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter}, traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
weights::{ConstantMultiplier, DispatchClass, Weight}, weights::{ConstantMultiplier, DispatchClass, Weight},
PalletId, RuntimeDebug, PalletId, RuntimeDebug,
}; };
@@ -222,7 +222,7 @@ 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 = pub type AssetsForceOrigin =
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>; EitherOfDiverse<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;
@@ -428,8 +428,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type ChannelInfo = ParachainSystem; type ChannelInfo = ParachainSystem;
type VersionWrapper = PolkadotXcm; type VersionWrapper = PolkadotXcm;
type ExecuteOverweightOrigin = EnsureRoot<AccountId>; type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
type ControllerOrigin = type ControllerOrigin = EitherOfDiverse<
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>; EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>,
>;
type ControllerOriginConverter = xcm_config::XcmOriginToTransactDispatchOrigin; type ControllerOriginConverter = xcm_config::XcmOriginToTransactDispatchOrigin;
type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>; type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
} }
@@ -476,7 +478,7 @@ 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 = pub type CollatorSelectionUpdateOrigin =
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<KsmLocation, ExecutiveBody>>>; EitherOfDiverse<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;
parachains/runtimes/assets/statemint/src/lib.rs
+7 -5
View File
@@ -75,7 +75,7 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee}; use constants::{currency::*, fee::WeightToFee};
use frame_support::{ use frame_support::{
construct_runtime, parameter_types, construct_runtime, parameter_types,
traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter}, traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
weights::{ConstantMultiplier, DispatchClass, Weight}, weights::{ConstantMultiplier, DispatchClass, Weight},
PalletId, RuntimeDebug, PalletId, RuntimeDebug,
}; };
@@ -252,7 +252,7 @@ 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 = pub type AssetsForceOrigin =
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>; EitherOfDiverse<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;
@@ -458,8 +458,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type ChannelInfo = ParachainSystem; type ChannelInfo = ParachainSystem;
type VersionWrapper = PolkadotXcm; type VersionWrapper = PolkadotXcm;
type ExecuteOverweightOrigin = EnsureRoot<AccountId>; type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
type ControllerOrigin = type ControllerOrigin = EitherOfDiverse<
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>; EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>,
>;
type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>; type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
} }
@@ -506,7 +508,7 @@ 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 = pub type CollatorSelectionUpdateOrigin =
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<DotLocation, ExecutiveBody>>>; EitherOfDiverse<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;
parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs
+6 -4
View File
@@ -19,7 +19,7 @@ use super::{
}; };
use frame_support::{ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{EnsureOneOf, Everything, Nothing}, traits::{EitherOfDiverse, Everything, Nothing},
weights::Weight, weights::Weight,
}; };
use frame_system::EnsureRoot; use frame_system::EnsureRoot;
@@ -48,8 +48,10 @@ 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 = pub type CollatorSelectionUpdateOrigin = EitherOfDiverse<
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>>; EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>,
>;
/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
/// when determining ownership of accounts for asset transacting and when attempting to use XCM /// when determining ownership of accounts for asset transacting and when attempting to use XCM
@@ -194,7 +196,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type ChannelInfo = ParachainSystem; type ChannelInfo = ParachainSystem;
type VersionWrapper = PolkadotXcm; type VersionWrapper = PolkadotXcm;
type ExecuteOverweightOrigin = EnsureRoot<AccountId>; type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
type ControllerOrigin = EnsureOneOf< type ControllerOrigin = EitherOfDiverse<
EnsureRoot<AccountId>, EnsureRoot<AccountId>,
EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>, EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>,
>; >;
parachains/runtimes/testing/rococo-parachain/src/lib.rs
+2 -2
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_types, parameter_types, construct_runtime, match_types, parameter_types,
traits::{EnsureOneOf, Everything, IsInVec, Randomness}, traits::{EitherOfDiverse, Everything, IsInVec, Randomness},
weights::{ weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
ConstantMultiplier, DispatchClass, IdentityFee, Weight, ConstantMultiplier, DispatchClass, IdentityFee, Weight,
@@ -483,7 +483,7 @@ 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 = pub type AdminOrigin =
EnsureOneOf<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<RocLocation, UnitBody>>>; EitherOfDiverse<EnsureRoot<AccountId>, EnsureXcm<IsMajorityOfBody<RocLocation, UnitBody>>>;
impl pallet_assets::Config for Runtime { impl pallet_assets::Config for Runtime {
type Event = Event; type Event = Event;