Merge branch 'master' into stableswap-invariants

galacticcouncil · Jul 31, 2023 · ca7d4c4 · ca7d4c4
2 parents 7d783ab + 6173a8b
commit ca7d4c4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.8.1"
+version = "1.8.2"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

diff --git a/integration-tests/src/call_filter.rs b/integration-tests/src/call_filter.rs
@@ -5,6 +5,7 @@ use frame_support::{
 	assert_ok,
 	sp_runtime::{FixedU128, Permill},
 	traits::Contains,
+	weights::Weight,
 };
 use polkadot_xcm::latest::prelude::*;
 use polkadot_xcm::VersionedXcm;
@@ -206,7 +207,7 @@ fn transfer_should_not_work_when_transfering_omnipool_assets_to_omnipool_account
 }
 
 #[test]
-fn calling_pallet_xcm_extrinsic_should_be_filtered_by_call_filter() {
+fn calling_pallet_xcm_send_extrinsic_should_not_be_filtered_by_call_filter() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
@@ -216,6 +217,21 @@ fn calling_pallet_xcm_extrinsic_should_be_filtered_by_call_filter() {
 			message: Box::new(VersionedXcm::from(Xcm(vec![]))),
 		});
 
+		assert!(hydradx_runtime::CallFilter::contains(&call));
+	});
+}
+
+#[test]
+fn calling_pallet_xcm_extrinsic_should_be_filtered_by_call_filter() {
+	TestNet::reset();
+
+	Hydra::execute_with(|| {
+		// the values here don't need to make sense, all we need is a valid Call
+		let call = hydradx_runtime::RuntimeCall::PolkadotXcm(pallet_xcm::Call::execute {
+			message: Box::new(VersionedXcm::from(Xcm(vec![]))),
+			max_weight: Weight::zero(),
+		});
+
 		assert!(!hydradx_runtime::CallFilter::contains(&call));
 	});
 }

diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "169.0.0"
+version = "170.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"

diff --git a/runtime/hydradx/src/lib.rs b/runtime/hydradx/src/lib.rs
@@ -95,7 +95,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("hydradx"),
 	impl_name: create_runtime_str!("hydradx"),
 	authoring_version: 1,
-	spec_version: 169,
+	spec_version: 170,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/hydradx/src/system.rs b/runtime/hydradx/src/system.rs
@@ -84,6 +84,7 @@ impl Contains<RuntimeCall> for CallFilter {
 		}
 
 		match call {
+			RuntimeCall::PolkadotXcm(pallet_xcm::Call::send { .. }) => true,
 			RuntimeCall::PolkadotXcm(_) => false,
 			RuntimeCall::OrmlXcm(_) => false,
 			_ => true,