Update ProxyType

darwinia-network · Jan 10, 2024 · 27378a1 · 27378a1
1 parent d954a70
commit 27378a1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
@@ -65,17 +65,20 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
 					| RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })
-					| RuntimeCall::Deposit(..)
-					| RuntimeCall::DarwiniaStaking(..)
-					// Might contains transfer {
+					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
 					| RuntimeCall::PolkadotXcm(..)
-					| RuntimeCall::Ethereum(..) // }
+					| RuntimeCall::Ethereum(..)
+			),
+			ProxyType::Governance => matches!(
+				c,
+				RuntimeCall::ConvictionVoting(..)
+					| RuntimeCall::Referenda(..)
+					| RuntimeCall::TechnicalCommittee(..)
+					| RuntimeCall::Treasury(..)
+					| RuntimeCall::Whitelist(..)
 			),
-			ProxyType::Governance =>
-				matches!(c, |RuntimeCall::Referenda(..)| RuntimeCall::TechnicalCommittee(..)
-					| RuntimeCall::Treasury(..)),
 			ProxyType::Staking => {
 				matches!(
 					c,

diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
@@ -57,20 +57,21 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
 					| RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })
-					| RuntimeCall::Deposit(..)
-					| RuntimeCall::DarwiniaStaking(..)
-					// Might contains transfer {
+					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
 					| RuntimeCall::PolkadotXcm(..)
-					| RuntimeCall::Ethereum(..) // }
+					| RuntimeCall::Ethereum(..)
 			),
 			ProxyType::Governance => matches!(
 				c,
-				RuntimeCall::Democracy(..)
+				RuntimeCall::ConvictionVoting(..)
 					| RuntimeCall::Council(..)
+					| RuntimeCall::Democracy(..)
+					| RuntimeCall::Referenda(..)
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::Treasury(..)
+					| RuntimeCall::Whitelist(..)
 			),
 			ProxyType::Staking => {
 				matches!(

diff --git a/runtime/pangolin/src/pallets/proxy.rs b/runtime/pangolin/src/pallets/proxy.rs
@@ -55,20 +55,19 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
-					| RuntimeCall::Deposit(..)
-					| RuntimeCall::DarwiniaStaking(..)
-					// Might contains transfer {
+					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
 					| RuntimeCall::PolkadotXcm(..)
-					| RuntimeCall::Ethereum(..) // }
+					| RuntimeCall::Ethereum(..)
 			),
 			ProxyType::Governance => matches!(
 				c,
-				RuntimeCall::Referenda(..)
-					| RuntimeCall::ConvictionVoting(..)
+				RuntimeCall::ConvictionVoting(..)
+					| RuntimeCall::Referenda(..)
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::Treasury(..)
+					| RuntimeCall::Whitelist(..)
 			),
 			ProxyType::Staking => {
 				matches!(

diff --git a/runtime/pangoro/src/pallets/proxy.rs b/runtime/pangoro/src/pallets/proxy.rs
@@ -55,20 +55,21 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
-					| RuntimeCall::Deposit(..)
-					| RuntimeCall::DarwiniaStaking(..)
-					// Might contains transfer {
+					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
 					| RuntimeCall::PolkadotXcm(..)
-					| RuntimeCall::Ethereum(..) // }
+					| RuntimeCall::Ethereum(..)
 			),
 			ProxyType::Governance => matches!(
 				c,
-				RuntimeCall::Democracy(..)
+				RuntimeCall::ConvictionVoting(..)
 					| RuntimeCall::Council(..)
+					| RuntimeCall::Democracy(..)
+					| RuntimeCall::Referenda(..)
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::Treasury(..)
+					| RuntimeCall::Whitelist(..)
 			),
 			ProxyType::Staking => {
 				matches!(