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

difftreelog

feat add overridable xcm allowed locations

Daniel Shiposha2022-12-12parent: #489f7f3.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5934,6 +5934,7 @@
  "sp-core",
  "sp-runtime",
  "sp-std",
+ "xcm",
 ]
 
 [[package]]
modifiedpallets/configuration/Cargo.tomldiffbeforeafterboth
--- 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"]
modifiedpallets/configuration/src/lib.rsdiffbeforeafterboth
35	use super::*;35	use super::*;
36	use frame_support::{36	use frame_support::{
37		traits::Get,37		traits::Get,
38		pallet_prelude::{StorageValue, ValueQuery, DispatchResult},38		pallet_prelude::{StorageValue, ValueQuery, DispatchResult, OptionQuery}, BoundedVec,
39	};39	};
40	use frame_system::{pallet_prelude::OriginFor, ensure_root};40	use frame_system::{pallet_prelude::OriginFor, ensure_root};
41	use xcm::v1::MultiLocation;
4142
42	#[pallet::config]43	#[pallet::config]
43	pub trait Config: frame_system::Config {44	pub trait Config: frame_system::Config {
46		#[pallet::constant]48		#[pallet::constant]
47		type DefaultMinGasPrice: Get<u64>;49		type DefaultMinGasPrice: Get<u64>;
50
51		#[pallet::constant]
52		type MaxOverridedAllowedLocations: Get<u32>;
48	}53	}
4954
50	#[pallet::storage]55	#[pallet::storage]
58	pub type MinGasPriceOverride<T: Config> =63	pub type MinGasPriceOverride<T: Config> =
59		StorageValue<Value = u64, QueryKind = ValueQuery, OnEmpty = T::DefaultMinGasPrice>;64		StorageValue<Value = u64, QueryKind = ValueQuery, OnEmpty = T::DefaultMinGasPrice>;
65
66	#[pallet::storage]
67	pub type XcmAllowedLocationsOverride<T: Config> = StorageValue<
68		Value = BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>,
69		QueryKind = OptionQuery,
70	>;
6071
61	#[pallet::call]72	#[pallet::call]
62	impl<T: Config> Pallet<T> {73	impl<T: Config> Pallet<T> {
88			Ok(())99			Ok(())
89		}100		}
101
102		#[pallet::weight(T::DbWeight::get().writes(1))]
103		pub fn set_xcm_allowed_locations(
104			origin: OriginFor<T>,
105			locations: Option<BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>>,
106		) -> DispatchResult {
107			let _sender = ensure_root(origin)?;
108			<XcmAllowedLocationsOverride<T>>::set(locations);
109			Ok(())
110		}
90	}111	}
91112
92	#[pallet::pallet]113	#[pallet::pallet]
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
--- 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 {
modifiedruntime/common/mod.rsdiffbeforeafterboth
--- 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;
addedruntime/common/xcm.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/common/xcm.rs
@@ -0,0 +1,36 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use sp_std::{vec::Vec, marker::PhantomData};
+use xcm::v1::MultiLocation;
+use frame_support::traits::Get;
+
+pub struct OverridableAllowedLocations<T, L>(PhantomData<(T, L)>)
+where
+    T: pallet_configuration::Config,
+    L: Get<Vec<MultiLocation>>;
+
+impl<T, L> Get<Vec<MultiLocation>> for OverridableAllowedLocations<T, L>
+where
+    T: pallet_configuration::Config,
+    L: Get<Vec<MultiLocation>>
+{
+    fn get() -> Vec<MultiLocation> {
+        <pallet_configuration::XcmAllowedLocationsOverride<T>>::get()
+            .map(|bounded| bounded.into_inner())
+            .unwrap_or_else(|| L::get())
+    }
+}
modifiedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
--- 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,
modifiedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
--- 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,