enable more proxy types (#1856)

Signed-off-by: Cheng JIANG <[email protected]> Signed-off-by: Cheng JIANG <[email protected]>
parallel-finance · Aug 19, 2022 · 5918d1a · 5918d1a
1 parent 34f7995
commit 5918d1a
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 12 deletions.
diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs
@@ -919,6 +919,7 @@ pub enum ProxyType {
     Farming,
     Streaming,
     Governance,
+    AMM,
 }
 impl Default for ProxyType {
     fn default() -> Self {
@@ -941,6 +942,7 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Loans(pallet_loans::Call::repay_borrow_all { .. })
                         | Call::Loans(pallet_loans::Call::collateral_asset { .. })
                         | Call::Loans(pallet_loans::Call::liquidate_borrow { .. })
+                        | Call::Loans(pallet_loans::Call::add_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward_for_market { .. })
                 )
@@ -950,17 +952,18 @@ impl InstanceFilter<Call> for ProxyType {
                     c,
                     Call::LiquidStaking(pallet_liquid_staking::Call::stake { .. })
                         | Call::LiquidStaking(pallet_liquid_staking::Call::unstake { .. })
+                        | Call::LiquidStaking(pallet_liquid_staking::Call::cancel_unstake { .. })
                 )
             }
             ProxyType::Crowdloans => {
                 matches!(
                     c,
                     Call::Crowdloans(pallet_crowdloans::Call::contribute { .. },)
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
                 )
             }
             ProxyType::Farming => {
@@ -991,6 +994,15 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Utility(..)
                 )
             }
+            ProxyType::AMM => {
+                matches!(
+                    c,
+                    Call::AMM(pallet_amm::Call::add_liquidity { .. })
+                        | Call::AMM(pallet_amm::Call::remove_liquidity { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_tokens_for_exact_tokens { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_exact_tokens_for_tokens { .. })
+                )
+            }
         }
     }
     fn is_superset(&self, o: &Self) -> bool {

diff --git a/runtime/kerria/src/lib.rs b/runtime/kerria/src/lib.rs
@@ -1076,6 +1076,8 @@ pub enum ProxyType {
     Farming,
     Streaming,
     Governance,
+    AMM,
+    EVM,
 }
 impl Default for ProxyType {
     fn default() -> Self {
@@ -1148,6 +1150,19 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Utility(..)
                 )
             }
+            ProxyType::AMM => {
+                matches!(
+                    c,
+                    Call::AMM(pallet_amm::Call::add_liquidity { .. })
+                        | Call::AMM(pallet_amm::Call::remove_liquidity { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_tokens_for_exact_tokens { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_exact_tokens_for_tokens { .. })
+                )
+            }
+            // EVM
+            ProxyType::EVM => {
+                matches!(c, Call::Ethereum(..) | Call::EVM(_) | Call::BaseFee(_))
+            }
         }
     }
     fn is_superset(&self, o: &Self) -> bool {

diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs
@@ -939,6 +939,7 @@ pub enum ProxyType {
     Farming,
     Streaming,
     Governance,
+    AMM,
 }
 impl Default for ProxyType {
     fn default() -> Self {
@@ -961,6 +962,7 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Loans(pallet_loans::Call::repay_borrow_all { .. })
                         | Call::Loans(pallet_loans::Call::collateral_asset { .. })
                         | Call::Loans(pallet_loans::Call::liquidate_borrow { .. })
+                        | Call::Loans(pallet_loans::Call::add_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward_for_market { .. })
                 )
@@ -970,17 +972,18 @@ impl InstanceFilter<Call> for ProxyType {
                     c,
                     Call::LiquidStaking(pallet_liquid_staking::Call::stake { .. })
                         | Call::LiquidStaking(pallet_liquid_staking::Call::unstake { .. })
+                        | Call::LiquidStaking(pallet_liquid_staking::Call::cancel_unstake { .. })
                 )
             }
             ProxyType::Crowdloans => {
                 matches!(
                     c,
                     Call::Crowdloans(pallet_crowdloans::Call::contribute { .. },)
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
                 )
             }
             ProxyType::Farming => {
@@ -1011,6 +1014,15 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Utility(..)
                 )
             }
+            ProxyType::AMM => {
+                matches!(
+                    c,
+                    Call::AMM(pallet_amm::Call::add_liquidity { .. })
+                        | Call::AMM(pallet_amm::Call::remove_liquidity { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_tokens_for_exact_tokens { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_exact_tokens_for_tokens { .. })
+                )
+            }
         }
     }
     fn is_superset(&self, o: &Self) -> bool {

diff --git a/runtime/vanilla/src/lib.rs b/runtime/vanilla/src/lib.rs
@@ -1078,7 +1078,8 @@ pub enum ProxyType {
     Farming,
     Streaming,
     Governance,
-    Evm,
+    AMM,
+    EVM,
 }
 impl Default for ProxyType {
     fn default() -> Self {
@@ -1101,6 +1102,7 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Loans(pallet_loans::Call::repay_borrow_all { .. })
                         | Call::Loans(pallet_loans::Call::collateral_asset { .. })
                         | Call::Loans(pallet_loans::Call::liquidate_borrow { .. })
+                        | Call::Loans(pallet_loans::Call::add_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward { .. })
                         | Call::Loans(pallet_loans::Call::claim_reward_for_market { .. })
                 )
@@ -1110,17 +1112,18 @@ impl InstanceFilter<Call> for ProxyType {
                     c,
                     Call::LiquidStaking(pallet_liquid_staking::Call::stake { .. })
                         | Call::LiquidStaking(pallet_liquid_staking::Call::unstake { .. })
+                        | Call::LiquidStaking(pallet_liquid_staking::Call::cancel_unstake { .. })
                 )
             }
             ProxyType::Crowdloans => {
                 matches!(
                     c,
                     Call::Crowdloans(pallet_crowdloans::Call::contribute { .. },)
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
-                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
                         | Call::Crowdloans(pallet_crowdloans::Call::claim_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::withdraw_for { .. })
+                        | Call::Crowdloans(pallet_crowdloans::Call::redeem { .. })
                 )
             }
             ProxyType::Farming => {
@@ -1151,8 +1154,16 @@ impl InstanceFilter<Call> for ProxyType {
                         | Call::Utility(..)
                 )
             }
-            // EVM
-            ProxyType::Evm => {
+            ProxyType::AMM => {
+                matches!(
+                    c,
+                    Call::AMM(pallet_amm::Call::add_liquidity { .. })
+                        | Call::AMM(pallet_amm::Call::remove_liquidity { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_tokens_for_exact_tokens { .. })
+                        | Call::AMMRoute(pallet_router::Call::swap_exact_tokens_for_tokens { .. })
+                )
+            }
+            ProxyType::EVM => {
                 matches!(c, Call::Ethereum(..) | Call::EVM(_) | Call::BaseFee(_))
             }
         }