git.delta.rocks / unique-network / refs/commits / 44d02634621c

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5934,6 +5934,7 @@
  "sp-core",
  "sp-runtime",
  "sp-std",
+ "xcm",
 ]
 
 [[package]]

--- a/pallets/configuration/Cargo.toml
+++ b/pallets/configuration/Cargo.toml
@@ -18,6 +18,7 @@
 sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.30-2" }
 smallvec = "1.6.1"
+xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" }
 
 [features]
 default = ["std"]

--- a/pallets/configuration/src/lib.rs
+++ b/pallets/configuration/src/lib.rs
@@ -35,16 +35,21 @@
 	use super::*;
 	use frame_support::{
 		traits::Get,
-		pallet_prelude::{StorageValue, ValueQuery, DispatchResult},
+		pallet_prelude::{StorageValue, ValueQuery, DispatchResult, OptionQuery}, BoundedVec,
 	};
 	use frame_system::{pallet_prelude::OriginFor, ensure_root};
+	use xcm::v1::MultiLocation;
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		#[pallet::constant]
 		type DefaultWeightToFeeCoefficient: Get<u32>;
+
 		#[pallet::constant]
 		type DefaultMinGasPrice: Get<u64>;
+
+		#[pallet::constant]
+		type MaxOverridedAllowedLocations: Get<u32>;
 	}
 
 	#[pallet::storage]
@@ -58,6 +63,12 @@
 	pub type MinGasPriceOverride<T: Config> =
 		StorageValue<Value = u64, QueryKind = ValueQuery, OnEmpty = T::DefaultMinGasPrice>;
 
+	#[pallet::storage]
+	pub type XcmAllowedLocationsOverride<T: Config> = StorageValue<
+		Value = BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>,
+		QueryKind = OptionQuery,
+	>;
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
 		#[pallet::weight(T::DbWeight::get().writes(1))]
@@ -87,6 +98,16 @@
 			}
 			Ok(())
 		}
+
+		#[pallet::weight(T::DbWeight::get().writes(1))]
+		pub fn set_xcm_allowed_locations(
+			origin: OriginFor<T>,
+			locations: Option<BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>>,
+		) -> DispatchResult {
+			let _sender = ensure_root(origin)?;
+			<XcmAllowedLocationsOverride<T>>::set(locations);
+			Ok(())
+		}
 	}
 
 	#[pallet::pallet]

--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -102,6 +102,7 @@
 impl pallet_configuration::Config for Runtime {
 	type DefaultWeightToFeeCoefficient = ConstU32<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;
 	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;
+	type MaxOverridedAllowedLocations = ConstU32<16>;
 }
 
 impl pallet_maintenance::Config for Runtime {

--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -21,6 +21,7 @@
 pub mod instance;
 pub mod maintenance;
 pub mod runtime_apis;
+pub mod xcm;
 
 #[cfg(feature = "scheduler")]
 pub mod scheduler;

--- a/runtime/quartz/src/xcm_barrier.rs
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -26,8 +26,11 @@
 };
 
 use crate::{
-	ParachainInfo, PolkadotXcm,
-	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+	Runtime, ParachainInfo, PolkadotXcm,
+	runtime_common::{
+		config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+		xcm::OverridableAllowedLocations,
+	}
 };
 
 match_types! {
@@ -38,7 +41,7 @@
 }
 
 parameter_types! {
-	pub QuartzAllowedLocations: Vec<MultiLocation> = vec![
+	pub QuartzDefaultAllowedLocations: Vec<MultiLocation> = vec![
 		// Self location
 		MultiLocation {
 			parents: 0,
@@ -70,7 +73,9 @@
 pub type Barrier = DenyThenTry<
 	(
 		DenyTransact,
-		DenyExchangeWithUnknownLocation<QuartzAllowedLocations>,
+		DenyExchangeWithUnknownLocation<
+			OverridableAllowedLocations<Runtime, QuartzDefaultAllowedLocations>
+		>,
 	),
 	(
 		TakeWeightCredit,

--- a/runtime/unique/src/xcm_barrier.rs
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -26,8 +26,11 @@
 };
 
 use crate::{
-	ParachainInfo, PolkadotXcm,
-	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+	Runtime, ParachainInfo, PolkadotXcm,
+	runtime_common::{
+		config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+		xcm::OverridableAllowedLocations,
+	}
 };
 
 match_types! {
@@ -38,7 +41,7 @@
 }
 
 parameter_types! {
-	pub UniqueAllowedLocations: Vec<MultiLocation> = vec![
+	pub UniqueDefaultAllowedLocations: Vec<MultiLocation> = vec![
 		// Self location
 		MultiLocation {
 			parents: 0,
@@ -70,7 +73,9 @@
 pub type Barrier = DenyThenTry<
 	(
 		DenyTransact,
-		DenyExchangeWithUnknownLocation<UniqueAllowedLocations>,
+		DenyExchangeWithUnknownLocation<
+			OverridableAllowedLocations<Runtime, UniqueDefaultAllowedLocations>
+		>,
 	),
 	(
 		TakeWeightCredit,