From f45c55be3b21ec6a7a458b098afa0c6be2ac4696 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Thu, 17 Jun 2021 00:02:38 +0100
Subject: [PATCH] Remove All Assets and Uniques from `NonTransfer` Proxy (#486)
* remove all assets and uniques from `NonTransfer` proxy
* fix merge
---
.../polkadot-parachains/statemine-runtime/src/lib.rs | 11 ++---------
.../polkadot-parachains/statemint-runtime/src/lib.rs | 7 +------
.../polkadot-parachains/westmint-runtime/src/lib.rs | 7 +------
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs b/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs
index b3a04af5dd2..4ceb15e5d85 100644
--- a/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs
+++ b/cumulus/polkadot-parachains/statemine-runtime/src/lib.rs
@@ -367,15 +367,8 @@ impl InstanceFilter<Call> for ProxyType {
ProxyType::NonTransfer => !matches!(
c,
Call::Balances(..)
- | Call::Assets(pallet_assets::Call::transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_keep_alive(..))
- | Call::Assets(pallet_assets::Call::force_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_ownership(..))
- | Call::Assets(pallet_assets::Call::approve_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_approved(..))
- | Call::Uniques(pallet_uniques::Call::transfer(..))
- | Call::Uniques(pallet_uniques::Call::transfer_ownership(..))
- | Call::Uniques(pallet_uniques::Call::approve_transfer(..))
+ | Call::Assets(..)
+ | Call::Uniques(..)
),
ProxyType::CancelProxy => matches!(
c,
diff --git a/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs b/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs
index 7745a04be5e..568bd0e6337 100644
--- a/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs
+++ b/cumulus/polkadot-parachains/statemint-runtime/src/lib.rs
@@ -328,12 +328,7 @@ impl InstanceFilter<Call> for ProxyType {
ProxyType::NonTransfer => !matches!(
c,
Call::Balances(..)
- | Call::Assets(pallet_assets::Call::transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_keep_alive(..))
- | Call::Assets(pallet_assets::Call::force_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_ownership(..))
- | Call::Assets(pallet_assets::Call::approve_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_approved(..))
+ | Call::Assets(..)
),
ProxyType::CancelProxy => matches!(
c,
diff --git a/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs b/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs
index 3f8ee777713..fa6d9e39053 100644
--- a/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs
+++ b/cumulus/polkadot-parachains/westmint-runtime/src/lib.rs
@@ -326,12 +326,7 @@ impl InstanceFilter<Call> for ProxyType {
ProxyType::NonTransfer => !matches!(
c,
Call::Balances(..)
- | Call::Assets(pallet_assets::Call::transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_keep_alive(..))
- | Call::Assets(pallet_assets::Call::force_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_ownership(..))
- | Call::Assets(pallet_assets::Call::approve_transfer(..))
- | Call::Assets(pallet_assets::Call::transfer_approved(..))
+ | Call::Assets(..)
),
ProxyType::CancelProxy => matches!(
c,
--
GitLab