Companion for polkadot#6928 (#2356)

* add AdminOrigin to all xcm-configs in cumulus

* cargo fmt

* Update Substrate & Polkadot

---------

Co-authored-by: parity-processbot <>
Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Just van Stam
2023-03-23 11:36:03 +01:00
committed by GitHub
parent 2e0243603b
commit 490593bf6e
12 changed files with 276 additions and 256 deletions
+256 -256
View File
File diff suppressed because it is too large Load Diff
@@ -8,6 +8,7 @@ use frame_support::{
traits::{ConstU32, Everything, Nothing}, traits::{ConstU32, Everything, Nothing},
weights::Weight, weights::Weight,
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use polkadot_parachain::primitives::Sibling; use polkadot_parachain::primitives::Sibling;
use polkadot_runtime_common::impls::ToAuthor; use polkadot_runtime_common::impls::ToAuthor;
@@ -246,6 +247,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = pallet_xcm::TestWeightInfo; type WeightInfo = pallet_xcm::TestWeightInfo;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess}, traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::{ use parachains_common::{
impls::ToStakingPot, impls::ToStakingPot,
@@ -407,6 +408,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess}, traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::{ use parachains_common::{
impls::ToStakingPot, impls::ToStakingPot,
@@ -372,6 +373,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess}, traits::{ConstU32, Contains, Everything, Nothing, PalletInfoAccess},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::{ use parachains_common::{
impls::ToStakingPot, impls::ToStakingPot,
@@ -395,6 +396,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing}, traits::{ConstU32, Contains, Everything, Nothing},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::xcm_config::{ use parachains_common::xcm_config::{
ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry, ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry,
@@ -260,6 +261,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing}, traits::{ConstU32, Contains, Everything, Nothing},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::xcm_config::{ use parachains_common::xcm_config::{
ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry, ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry,
@@ -260,6 +261,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
match_types, parameter_types, match_types, parameter_types,
traits::{ConstU32, Contains, Everything, Nothing}, traits::{ConstU32, Contains, Everything, Nothing},
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::xcm_config::{ use parachains_common::xcm_config::{
ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry, ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry,
@@ -258,6 +259,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -22,6 +22,7 @@ use frame_support::{
traits::{ConstU32, Contains, Everything, Nothing}, traits::{ConstU32, Contains, Everything, Nothing},
weights::Weight, weights::Weight,
}; };
use frame_system::EnsureRoot;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::{ use parachains_common::{
impls::ToStakingPot, impls::ToStakingPot,
@@ -295,6 +296,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>; type WeightInfo = crate::weights::pallet_xcm::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -212,6 +212,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = pallet_xcm::TestWeightInfo; type WeightInfo = pallet_xcm::TestWeightInfo;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -35,6 +35,7 @@ use frame_support::{
}, },
weights::Weight, weights::Weight,
}; };
use frame_system::EnsureRoot;
use pallet_asset_tx_payment::HandleCredit; use pallet_asset_tx_payment::HandleCredit;
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}; use parachains_common::xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry};
@@ -337,6 +338,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = pallet_xcm::TestWeightInfo; type WeightInfo = pallet_xcm::TestWeightInfo;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {
@@ -469,6 +469,7 @@ impl pallet_xcm::Config for Runtime {
type WeightInfo = pallet_xcm::TestWeightInfo; type WeightInfo = pallet_xcm::TestWeightInfo;
#[cfg(feature = "runtime-benchmarks")] #[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest; type ReachableDest = ReachableDest;
type AdminOrigin = EnsureRoot<AccountId>;
} }
impl cumulus_pallet_xcm::Config for Runtime { impl cumulus_pallet_xcm::Config for Runtime {