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

[Feature] Limit collectives teleports to DOT (#1579)

Browse Source 
* [Feature] Limit collectives teleports to DOT

* Update pallets/xcm/src/lib.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* fix review comments

* Update parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs

Co-authored-by: Chevdor <chevdor@users.noreply.github.com>

* [ci] Apply cargo-fmt

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
This commit is contained in:
Roman Useinov
2022-08-31 13:27:14 +02:00
committed by GitHub
parent 1715b6f1f9
commit 6165597eb7
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/parachains/common/src/xcm_config.rs
+13 -1
View File
@@ -5,8 +5,9 @@ use frame_support::{
traits::{fungibles::Inspect, tokens::BalanceConversion}, traits::{fungibles::Inspect, tokens::BalanceConversion},
weights::{Weight, WeightToFee, WeightToFeePolynomial}, weights::{Weight, WeightToFee, WeightToFeePolynomial},
}; };
use sp_runtime::traits::Get;
use xcm::latest::prelude::*; use xcm::latest::prelude::*;
use xcm_executor::traits::ShouldExecute; use xcm_executor::traits::{FilterAssetLocation, ShouldExecute};
//TODO: move DenyThenTry to polkadot's xcm module. //TODO: move DenyThenTry to polkadot's xcm module.
/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else. /// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.
@@ -107,3 +108,14 @@ where
Ok(asset_amount) Ok(asset_amount)
} }
} }
/// Accepts an asset if it is a native asset from a particular `MultiLocation`.
pub struct ConcreteNativeAssetFrom<Location>(PhantomData<Location>);
impl<Location: Get<MultiLocation>> FilterAssetLocation for ConcreteNativeAssetFrom<Location> {
fn filter_asset_location(asset: &MultiAsset, origin: &MultiLocation) -> bool {
log::trace!(target: "xcm::filter_asset_location",
"ConcreteNativeAsset asset: {:?}, origin: {:?}, location: {:?}",
asset, origin, Location::get());
matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get())
}
}
cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs
+5 -4
View File
@@ -25,15 +25,15 @@ use frame_support::{
use pallet_xcm::XcmPassthrough; use pallet_xcm::XcmPassthrough;
use parachains_common::{ use parachains_common::{
impls::ToStakingPot, impls::ToStakingPot,
xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry}, xcm_config::{ConcreteNativeAssetFrom, DenyReserveTransferToRelayChain, DenyThenTry},
}; };
use polkadot_parachain::primitives::Sibling; use polkadot_parachain::primitives::Sibling;
use xcm::latest::prelude::*; use xcm::latest::prelude::*;
use xcm_builder::{ use xcm_builder::{
AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom,
AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin,
FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, FixedWeightBounds, IsConcrete, LocationInverter, ParentAsSuperuser, ParentIsPreset,
ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
UsingComponents, UsingComponents,
}; };
@@ -140,7 +140,8 @@ impl xcm_executor::Config for XcmConfig {
// Collectives does not recognize a reserve location for any asset. Users must teleport DOT // Collectives does not recognize a reserve location for any asset. Users must teleport DOT
// where allowed (e.g. with the Relay Chain). // where allowed (e.g. with the Relay Chain).
type IsReserve = (); type IsReserve = ();
type IsTeleporter = NativeAsset; // <- should be enough to allow teleportation of DOT /// Only allow teleportation of DOT.
type IsTeleporter = ConcreteNativeAssetFrom<DotLocation>;
type LocationInverter = LocationInverter<Ancestry>; type LocationInverter = LocationInverter<Ancestry>;
type Barrier = Barrier; type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>; type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;