From f357bba8fc4ce9e0fa44a45abf9bb6ae043f2d57 Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Mon, 17 Jan 2022 17:51:09 +1300
Subject: [PATCH] enable features

---
 runtime/acala/src/lib.rs   | 51 ++++++++++++++++++++++----------------
 runtime/karura/src/lib.rs  |  2 +-
 runtime/mandala/src/lib.rs |  2 +-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
index 85e9ddc87a..1bc048b917 100644
--- a/runtime/acala/src/lib.rs
+++ b/runtime/acala/src/lib.rs
@@ -127,7 +127,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("acala"),
 	impl_name: create_runtime_str!("acala"),
 	authoring_version: 1,
-	spec_version: 2020,
+	spec_version: 2021,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -205,31 +205,38 @@ impl Contains<Call> for BaseCallFilter {
 			return false;
 		}
 
-		let is_whitelisted = matches!(
+		let is_evm = matches!(
 			call,
-			Call::Sudo(_) | // sudo
-			Call::Scheduler(_) | Call::Utility(_) | Call::Multisig(_) | Call::Proxy(_) | // utility
-			Call::TransactionPause(_) | // transaction pause
-			Call::Treasury(_) | Call::Bounties(_) | Call::Tips(_) | // treasury
-			Call::CollatorSelection(_) | Call::Session(_) | Call::SessionManager(_) | // collator
-			Call::DmpQueue(_) | Call::OrmlXcm(_) | // xcm
-			// Call::PolkadotXcm(_) | Call::XTokens(_) | // not allow user to make xcm call
-			Call::Authority(_) |
-			Call::GeneralCouncil(_) | Call::GeneralCouncilMembership(_) |
-			Call::FinancialCouncil(_) | Call::FinancialCouncilMembership(_) |
-			Call::HomaCouncil(_) | Call::HomaCouncilMembership(_) |
-			Call::TechnicalCommittee(_) | Call::TechnicalCommitteeMembership(_) | // governance
-			Call::Democracy(_) | // democracy
-			Call::AcalaOracle(_) | Call::OperatorMembershipAcala(_) | // oracle
-			Call::Vesting(_) // vesting
+			Call::EVM(_) | Call::EvmAccounts(_) // EvmBridge / EvmManager does not have call
 		);
-		if is_whitelisted {
-			// allow whitelisted calls
-			return true;
+		if is_evm {
+			// no evm call
+			return false;
+		}
+
+		if let Call::PolkadotXcm(xcm_method) = call {
+			match xcm_method {
+				pallet_xcm::Call::send { .. }
+				| pallet_xcm::Call::execute { .. }
+				| pallet_xcm::Call::teleport_assets { .. }
+				| pallet_xcm::Call::reserve_transfer_assets { .. }
+				| pallet_xcm::Call::limited_reserve_transfer_assets { .. }
+				| pallet_xcm::Call::limited_teleport_assets { .. } => {
+					return false;
+				}
+				pallet_xcm::Call::force_xcm_version { .. }
+				| pallet_xcm::Call::force_default_xcm_version { .. }
+				| pallet_xcm::Call::force_subscribe_version_notify { .. }
+				| pallet_xcm::Call::force_unsubscribe_version_notify { .. } => {
+					return true;
+				}
+				pallet_xcm::Call::__Ignore { .. } => {
+					unimplemented!()
+				}
+			}
 		}
 
-		// disable everything else
-		false
+		true
 	}
 }
 
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
index 998653765a..2a48949a5d 100644
--- a/runtime/karura/src/lib.rs
+++ b/runtime/karura/src/lib.rs
@@ -128,7 +128,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("karura"),
 	impl_name: create_runtime_str!("karura"),
 	authoring_version: 1,
-	spec_version: 2020,
+	spec_version: 2021,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
index cc6848f91e..efbb4d3f18 100644
--- a/runtime/mandala/src/lib.rs
+++ b/runtime/mandala/src/lib.rs
@@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("mandala"),
 	impl_name: create_runtime_str!("mandala"),
 	authoring_version: 1,
-	spec_version: 2020,
+	spec_version: 2021,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,