Merge pull request #623 from galacticcouncil/xcm-config

feat: update xcm config
galacticcouncil · Jul 27, 2023 · 1b58960 · 1b58960
2 parents 3feaf40 + e2c4be3
commit 1b58960
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 10 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.0"
+version = "1.8.1"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

diff --git a/integration-tests/src/cross_chain_transfer.rs b/integration-tests/src/cross_chain_transfer.rs
@@ -427,3 +427,27 @@ fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) {
 		));
 	});
 }
+
+#[test]
+fn polkadot_xcm_execute_extrinsic_should_not_be_allowed() {
+	TestNet::reset();
+
+	Hydra::execute_with(|| {
+		let message = VersionedXcm::V3(Xcm(vec![
+			WithdrawAsset((Here, 410000000000u128).into()),
+			BuyExecution {
+				fees: (Here, 400000000000u128).into(),
+				weight_limit: Unlimited,
+			},
+		]));
+
+		assert_noop!(
+			hydradx_runtime::PolkadotXcm::execute(
+				hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+				Box::new(message),
+				Weight::from_ref_time(400_000_000_000)
+			),
+			pallet_xcm::Error::<hydradx_runtime::Runtime>::Filtered
+		);
+	});
+}
diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "168.0.0"
+version = "169.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: 168,
+	spec_version: 169,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/hydradx/src/xcm.rs b/runtime/hydradx/src/xcm.rs
@@ -24,7 +24,7 @@ use xcm_builder::{
 	AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom,
 	EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
 	SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation,
-	TakeWeightCredit,
+	TakeWeightCredit, WithComputedOrigin,
 };
 use xcm_executor::{Config, XcmExecutor};
 
@@ -35,11 +35,18 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, R
 
 pub type Barrier = (
 	TakeWeightCredit,
-	AllowTopLevelPaidExecutionFrom<Everything>,
 	// Expected responses are OK.
 	AllowKnownQueryResponses<PolkadotXcm>,
-	// Subscriptions for version tracking are OK.
-	AllowSubscriptionsFrom<Everything>,
+	// Evaluate the barriers with the effective origin
+	WithComputedOrigin<
+		(
+			AllowTopLevelPaidExecutionFrom<Everything>,
+			// Subscriptions for version tracking are OK.
+			AllowSubscriptionsFrom<Everything>,
+		),
+		UniversalLocation,
+		ConstU32<8>,
+	>,
 );
 
 parameter_types! {
@@ -197,7 +204,7 @@ impl pallet_xcm::Config for Runtime {
 	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmRouter = XcmRouter;
 	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	type XcmExecuteFilter = Everything;
+	type XcmExecuteFilter = Nothing;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Nothing;
 	type XcmReserveTransferFilter = Everything;