From 04eba097b62d1d19890190ad543591cb77985db6 Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 3 Nov 2020 15:24:54 +0100 Subject: [PATCH] Update Proxy Filters (#1890) * Update proxy filters * add session --- polkadot/runtime/kusama/src/lib.rs | 16 +++++++++++----- polkadot/runtime/polkadot/src/lib.rs | 16 +++++++++++----- polkadot/runtime/westend/src/lib.rs | 8 +++++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 26a2ddb92e..14058a2bdc 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -843,15 +843,21 @@ impl InstanceFilter for ProxyType { Call::Multisig(..) ), ProxyType::Governance => matches!(c, - Call::Democracy(..) | Call::Council(..) | Call::TechnicalCommittee(..) - | Call::ElectionsPhragmen(..) | Call::Treasury(..) | Call::Utility(..) + Call::Democracy(..) | + Call::Council(..) | + Call::TechnicalCommittee(..) | + Call::ElectionsPhragmen(..) | + Call::Treasury(..) | + Call::Utility(..) ), ProxyType::Staking => matches!(c, - Call::Staking(..) | Call::Utility(..) + Call::Staking(..) | + Call::Session(..) | + Call::Utility(..) ), ProxyType::IdentityJudgement => matches!(c, - Call::Identity(pallet_identity::Call::provide_judgement(..)) - | Call::Utility(pallet_utility::Call::batch(..)) + Call::Identity(pallet_identity::Call::provide_judgement(..)) | + Call::Utility(..) ) } } diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 4aa91c0841..f4ee569b2d 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -848,15 +848,21 @@ impl InstanceFilter for ProxyType { Call::Multisig(..) ), ProxyType::Governance => matches!(c, - Call::Democracy(..) | Call::Council(..) | Call::TechnicalCommittee(..) - | Call::ElectionsPhragmen(..) | Call::Treasury(..) | Call::Utility(..) + Call::Democracy(..) | + Call::Council(..) | + Call::TechnicalCommittee(..) | + Call::ElectionsPhragmen(..) | + Call::Treasury(..) | + Call::Utility(..) ), ProxyType::Staking => matches!(c, - Call::Staking(..) | Call::Utility(pallet_utility::Call::batch(..)) | Call::Utility(..) + Call::Staking(..) | + Call::Session(..) | + Call::Utility(..) ), ProxyType::IdentityJudgement => matches!(c, - Call::Identity(pallet_identity::Call::provide_judgement(..)) - | Call::Utility(pallet_utility::Call::batch(..)) + Call::Identity(pallet_identity::Call::provide_judgement(..)) | + Call::Utility(..) ) } } diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index ce28bba0c3..754780ce20 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -600,7 +600,9 @@ impl InstanceFilter for ProxyType { Call::Multisig(..) ), ProxyType::Staking => matches!(c, - Call::Staking(..) | Call::Utility(..) + Call::Staking(..) | + Call::Session(..) | + Call::Utility(..) ), ProxyType::SudoBalances => match c { Call::Sudo(pallet_sudo::Call::sudo(ref x)) => matches!(x.as_ref(), &Call::Balances(..)), @@ -608,8 +610,8 @@ impl InstanceFilter for ProxyType { _ => false, }, ProxyType::IdentityJudgement => matches!(c, - Call::Identity(pallet_identity::Call::provide_judgement(..)) - | Call::Utility(pallet_utility::Call::batch(..)) + Call::Identity(pallet_identity::Call::provide_judgement(..)) | + Call::Utility(..) ) } }