git.delta.rocks / unique-network / refs/commits / 752d713492c3

--- a/pallets/configuration/src/benchmarking.rs
+++ b/pallets/configuration/src/benchmarking.rs
@@ -19,8 +19,7 @@
 use super::*;
 use frame_benchmarking::benchmarks;
 use frame_system::{EventRecord, RawOrigin};
-use frame_support::{assert_ok, BoundedVec, traits::Currency};
-use xcm::latest::MultiLocation;
+use frame_support::{assert_ok, traits::Currency};
 
 fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 	let events = frame_system::Pallet::<T>::events();
@@ -46,14 +45,6 @@
 	}: {
 		assert_ok!(
 			<Pallet<T>>::set_min_gas_price_override(RawOrigin::Root.into(), Some(coeff))
-		);
-	}
-
-	set_xcm_allowed_locations {
-		let locations: BoundedVec<MultiLocation, T::MaxXcmAllowedLocations> = Default::default();
-	}: {
-		assert_ok!(
-			<Pallet<T>>::set_xcm_allowed_locations(RawOrigin::Root.into(), Some(locations))
 		);
 	}
 

--- a/pallets/configuration/src/lib.rs
+++ b/pallets/configuration/src/lib.rs
@@ -43,11 +43,9 @@
 	use super::*;
 	use frame_support::{
 		traits::{Get, ReservableCurrency, Currency},
-		pallet_prelude::{StorageValue, ValueQuery, DispatchResult, IsType, OptionQuery},
-		BoundedVec, log,
+		pallet_prelude::{StorageValue, ValueQuery, DispatchResult, IsType}, log,
 	};
 	use frame_system::{pallet_prelude::OriginFor, ensure_root, Config as SystemConfig};
-	use xcm::latest::MultiLocation;
 
 	pub use crate::weights::WeightInfo;
 	pub type BalanceOf<T> =
@@ -115,12 +113,6 @@
 		StorageValue<Value = u64, QueryKind = ValueQuery, OnEmpty = T::DefaultMinGasPrice>;
 
 	#[pallet::storage]
-	pub type XcmAllowedLocationsOverride<T: Config> = StorageValue<
-		Value = BoundedVec<xcm::v3::MultiLocation, T::MaxXcmAllowedLocations>,
-		QueryKind = OptionQuery,
-	>;
-
-	#[pallet::storage]
 	pub type AppPromomotionConfigurationOverride<T: Config> =
 		StorageValue<Value = AppPromotionConfiguration<T::BlockNumber>, QueryKind = ValueQuery>;
 
@@ -174,17 +166,6 @@
 			} else {
 				<MinGasPriceOverride<T>>::kill();
 			}
-			Ok(())
-		}
-
-		#[pallet::call_index(2)]
-		#[pallet::weight(T::WeightInfo::set_xcm_allowed_locations())]
-		pub fn set_xcm_allowed_locations(
-			origin: OriginFor<T>,
-			locations: Option<BoundedVec<MultiLocation, T::MaxXcmAllowedLocations>>,
-		) -> DispatchResult {
-			ensure_root(origin)?;
-			<XcmAllowedLocationsOverride<T>>::set(locations);
 			Ok(())
 		}
 

148	}148	}
149}149}
150
151// Allow xcm exchange only with locations in list
152pub struct DenyExchangeWithUnknownLocation<T>(PhantomData<T>);
153impl<T: Get<Vec<MultiLocation>>> TryPass for DenyExchangeWithUnknownLocation<T> {
154	fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()> {
155		let allowed_locations = T::get();
156
157		// Check if deposit or transfer belongs to allowed parachains
158		let mut allowed = allowed_locations.contains(origin);
159
160		message.iter().for_each(|inst| match inst {
161			DepositReserveAsset { dest: dst, .. }
162			| TransferReserveAsset { dest: dst, .. }
163			| InitiateReserveWithdraw { reserve: dst, .. } => {
164				allowed |= allowed_locations.contains(&dst);
165			}
166			// ? There are more instructions worth checking
167			_ => {}
168		});
169
170		if allowed {
171			return Ok(());
172		}
173
174		log::warn!(
175			target: "xcm::barrier",
176			"Unexpected deposit or transfer location"
177		);
178		// Deny
179		Err(())
180	}
181}
182150
183pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;151pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
184152

--- a/runtime/quartz/src/xcm_barrier.rs
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -15,23 +15,16 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{
-	match_types, parameter_types,
-	traits::{Get, Everything},
+	match_types,
+	traits::Everything,
 };
-use sp_std::{vec, vec::Vec};
-use xcm::latest::{Junction::*, Junctions::*, MultiLocation};
+use xcm::latest::{Junctions::*, MultiLocation};
 use xcm_builder::{
 	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
 	AllowTopLevelPaidExecutionFrom,
 };
 
-use crate::{
-	Runtime, ParachainInfo, PolkadotXcm,
-	runtime_common::{
-		config::xcm::{DenyThenTry, DenyExchangeWithUnknownLocation},
-		xcm::OverridableAllowedLocations,
-	},
-};
+use crate::PolkadotXcm;
 
 match_types! {
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -40,51 +33,11 @@
 	};
 }
 
-parameter_types! {
-	pub QuartzDefaultAllowedLocations: Vec<MultiLocation> = vec![
-		// Self location
-		MultiLocation {
-			parents: 0,
-			interior: Here,
-		},
-		// Parent location
-		MultiLocation {
-			parents: 1,
-			interior: Here,
-		},
-		// Statemint/Statemint location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(1000)),
-		},
-		// Karura/Acala location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2000)),
-		},
-		// Moonriver location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2023)),
-		},
-		// Self parachain address
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(ParachainInfo::get().into())),
-		},
-	];
-}
-
-pub type Barrier = DenyThenTry<
-	DenyExchangeWithUnknownLocation<
-		OverridableAllowedLocations<Runtime, QuartzDefaultAllowedLocations>,
-	>,
-	(
-		TakeWeightCredit,
-		AllowTopLevelPaidExecutionFrom<Everything>,
-		// Expected responses are OK.
-		AllowKnownQueryResponses<PolkadotXcm>,
-		// Subscriptions for version tracking are OK.
-		AllowSubscriptionsFrom<ParentOrSiblings>,
-	),
->;
+pub type Barrier = (
+	TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom<Everything>,
+	// Expected responses are OK.
+	AllowKnownQueryResponses<PolkadotXcm>,
+	// Subscriptions for version tracking are OK.
+	AllowSubscriptionsFrom<ParentOrSiblings>,
+);

--- a/runtime/unique/src/xcm_barrier.rs
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -15,23 +15,16 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::{
-	match_types, parameter_types,
-	traits::{Get, Everything},
+	match_types,
+	traits::Everything,
 };
-use sp_std::{vec, vec::Vec};
-use xcm::latest::{Junction::*, Junctions::*, MultiLocation};
+use xcm::latest::{Junctions::*, MultiLocation};
 use xcm_builder::{
 	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
 	AllowTopLevelPaidExecutionFrom,
 };
 
-use crate::{
-	Runtime, ParachainInfo, PolkadotXcm,
-	runtime_common::{
-		config::xcm::{DenyThenTry, DenyExchangeWithUnknownLocation},
-		xcm::OverridableAllowedLocations,
-	},
-};
+use crate::PolkadotXcm;
 
 match_types! {
 	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
@@ -40,51 +33,11 @@
 	};
 }
 
-parameter_types! {
-	pub UniqueDefaultAllowedLocations: Vec<MultiLocation> = vec![
-		// Self location
-		MultiLocation {
-			parents: 0,
-			interior: Here,
-		},
-		// Parent location
-		MultiLocation {
-			parents: 1,
-			interior: Here,
-		},
-		// Statemint/Statemint location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(1000)),
-		},
-		// Karura/Acala location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2000)),
-		},
-		// Moonbeam location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2004)),
-		},
-		// Self parachain address
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(ParachainInfo::get().into())),
-		},
-	];
-}
-
-pub type Barrier = DenyThenTry<
-	DenyExchangeWithUnknownLocation<
-		OverridableAllowedLocations<Runtime, UniqueDefaultAllowedLocations>,
-	>,
-	(
-		TakeWeightCredit,
-		AllowTopLevelPaidExecutionFrom<Everything>,
-		// Expected responses are OK.
-		AllowKnownQueryResponses<PolkadotXcm>,
-		// Subscriptions for version tracking are OK.
-		AllowSubscriptionsFrom<ParentOrSiblings>,
-	),
->;
+pub type Barrier = (
+	TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom<Everything>,
+	// Expected responses are OK.
+	AllowKnownQueryResponses<PolkadotXcm>,
+	// Subscriptions for version tracking are OK.
+	AllowSubscriptionsFrom<ParentOrSiblings>,
+);