Remove All Assets and Uniques from NonTransfer Proxy (#486)

* remove all assets and uniques from `NonTransfer` proxy

* fix merge
This commit is contained in:
Shawn Tabrizi
2021-06-17 00:02:38 +01:00
committed by GitHub
parent 36c3438c74
commit 7d6f46bbde
3 changed files with 4 additions and 21 deletions
@@ -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,
@@ -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,
@@ -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,