From f2ecb5e5b981a6e4ac2d0a3038b725681e44536e Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Tue, 26 Jan 2021 21:19:12 -0400 Subject: [PATCH 1/3] cancel proxy --- runtime/kusama/src/lib.rs | 5 +++++ runtime/polkadot/src/lib.rs | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 1fa7878dbb99..77f79ce09769 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -843,6 +843,7 @@ pub enum ProxyType { Governance, Staking, IdentityJudgement, + CancelProxy, } impl Default for ProxyType { fn default() -> Self { Self::Any } } impl InstanceFilter for ProxyType { @@ -909,6 +910,10 @@ impl InstanceFilter for ProxyType { ProxyType::IdentityJudgement => matches!(c, Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..) + ), + ProxyType::CancelProxy => matches!(c, + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) + Call::Proxy(pallet_proxy::Call::reject_announcement(..)) ) } } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 9535189d0182..1ada8ee3ded9 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -825,6 +825,7 @@ pub enum ProxyType { Staking = 3, // Skip 4 as it is now removed (was SudoBalances) IdentityJudgement = 5, + CancelProxy = 6, } #[cfg(test)] @@ -913,6 +914,10 @@ impl InstanceFilter for ProxyType { ProxyType::IdentityJudgement => matches!(c, Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..) + ), + ProxyType::CancelProxy => matches!(c, + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) + Call::Proxy(pallet_proxy::Call::reject_announcement(..)) ) } } From b3acb8d576688a6e810bc7b8ef39ea1cd10da5cc Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Wed, 27 Jan 2021 00:03:20 -0400 Subject: [PATCH 2/3] fix --- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 77f79ce09769..c6d32b58ce68 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -912,7 +912,7 @@ impl InstanceFilter for ProxyType { Call::Utility(..) ), ProxyType::CancelProxy => matches!(c, - Call::Proxy(pallet_proxy::Call::remove_announcement(..)) + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) | Call::Proxy(pallet_proxy::Call::reject_announcement(..)) ) } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 1ada8ee3ded9..a2c59da38f82 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -916,7 +916,7 @@ impl InstanceFilter for ProxyType { Call::Utility(..) ), ProxyType::CancelProxy => matches!(c, - Call::Proxy(pallet_proxy::Call::remove_announcement(..)) + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) | Call::Proxy(pallet_proxy::Call::reject_announcement(..)) ) } From 7a3f11b983501462a0398cf701190b8c8720d510 Mon Sep 17 00:00:00 2001 From: David Dorgan Date: Thu, 4 Feb 2021 14:42:05 +0000 Subject: [PATCH 3/3] Remove reject_announcement and add CancelProxy to westend --- runtime/kusama/src/lib.rs | 3 +-- runtime/polkadot/src/lib.rs | 3 +-- runtime/westend/src/lib.rs | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index c6d32b58ce68..b5855ab5903e 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -912,8 +912,7 @@ impl InstanceFilter for ProxyType { Call::Utility(..) ), ProxyType::CancelProxy => matches!(c, - Call::Proxy(pallet_proxy::Call::remove_announcement(..)) | - Call::Proxy(pallet_proxy::Call::reject_announcement(..)) + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) ) } } diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index a2c59da38f82..fbc778f3c1bb 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -916,8 +916,7 @@ impl InstanceFilter for ProxyType { Call::Utility(..) ), ProxyType::CancelProxy => matches!(c, - Call::Proxy(pallet_proxy::Call::remove_announcement(..)) | - Call::Proxy(pallet_proxy::Call::reject_announcement(..)) + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) ) } } diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs index 14cb5b512de5..191f2229b926 100644 --- a/runtime/westend/src/lib.rs +++ b/runtime/westend/src/lib.rs @@ -588,6 +588,7 @@ pub enum ProxyType { Staking, SudoBalances, IdentityJudgement, + CancelProxy, } impl Default for ProxyType { fn default() -> Self { Self::Any } } impl InstanceFilter for ProxyType { @@ -640,6 +641,9 @@ impl InstanceFilter for ProxyType { ProxyType::IdentityJudgement => matches!(c, Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..) + ), + ProxyType::CancelProxy => matches!(c, + Call::Proxy(pallet_proxy::Call::remove_announcement(..)) ) } }