Merge remote-tracking branch 'origin/main' into enable-taplo-checks

Cargo.toml

@@ -62,6 +62,7 @@ members = [
   "pallets/pool-registry",
   "pallets/data-collector",
   "pallets/restricted-tokens",
+  "pallets/restricted-xtokens",
   "pallets/transfer-allowlist",
   "pallets/rewards",
   "runtime/altair",
@@ -248,6 +249,7 @@ pallet-permissions = { path = "pallets/permissions", default-features = false }
 pallet-pool-registry = { path = "pallets/pool-registry", default-features = false }
 pallet-pool-system = { path = "pallets/pool-system", default-features = false }
 pallet-restricted-tokens = { path = "pallets/restricted-tokens", default-features = false }
+pallet-restricted-xtokens = { path = "pallets/restricted-xtokens", default-features = false }
 pallet-rewards = { path = "pallets/rewards", default-features = false }
 pallet-transfer-allowlist = { path = "pallets/transfer-allowlist", default-features = false }
 

libs/types/Cargo.toml

@@ -32,6 +32,7 @@ cfg-primitives = { path = "../primitives", default-features = false }
 cfg-traits = { path = "../traits", default-features = false }
 cfg-utils = { path = "../utils", default-features = false }
 
+
 [dev-dependencies]
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.43" }
 hex = { version = "0.4.3", default_features = false }

libs/types/src/locations.rs

@@ -18,7 +18,7 @@ use sp_runtime::{
 	traits::{BlakeTwo256, Hash},
 	AccountId32,
 };
-use xcm::{latest::MultiLocation, VersionedMultiLocation};
+use xcm::{v3::MultiLocation, VersionedMultiLocation};
 
 use crate::domain_address::DomainAddress;
 /// Location types for destinations that can receive restricted transfers

pallets/liquidity-pools/src/lib.rs

@@ -116,7 +116,8 @@ pub type GeneralCurrencyIndexOf<T> =
 pub mod pallet {
 	use cfg_traits::{
 		investments::{ForeignInvestment, TrancheCurrency},
-		CurrencyInspect, Permissions, PoolInspect, Seconds, TimeAsSecs, TrancheTokenPrice,
+		CurrencyInspect, Permissions, PoolInspect, PreConditions, Seconds, TimeAsSecs,
+		TrancheTokenPrice,
 	};
 	use cfg_types::{
 		permissions::{PermissionScope, PoolRole, Role},
@@ -278,6 +279,11 @@ pub mod pallet {
 		/// message.
 		type TreasuryAccount: Get<Self::AccountId>;
 
+		type PreTransferFilter: PreConditions<
+			(Self::AccountId, DomainAddress, Self::CurrencyId),
+			Result = DispatchResult,
+		>;
+
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 	}
 
@@ -565,6 +571,12 @@ pub mod pallet {
 			// Ensure pool and tranche exist and derive invest id
 			let invest_id = Self::derive_invest_id(pool_id, tranche_id)?;
 
+			T::PreTransferFilter::check((
+				who.clone(),
+				domain_address.clone(),
+				invest_id.clone().into(),
+			))?;
+
 			// Transfer to the domain account for bookkeeping
 			T::Tokens::transfer(
 				invest_id.into(),
@@ -627,6 +639,8 @@ pub mod pallet {
 				}
 			}
 
+			T::PreTransferFilter::check((who.clone(), receiver.clone(), currency_id))?;
+
 			// Transfer to the domain account for bookkeeping
 			T::Tokens::transfer(
 				currency_id,

pallets/restricted-xtokens/Cargo.toml

@@ -0,0 +1,56 @@
+[package]
+name = "pallet-restricted-xtokens"
+authors.workspace = true
+description = "A wrapper pallet around orml-xtokens to allow restricting transfers"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+version = "0.0.1"
+
+[dependencies]
+codec = { package = "parity-scale-codec", workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
+
+# substrate
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+sp-std = { workspace = true }
+
+# orml
+orml-xtokens = { workspace = true }
+orml-traits = { workspace = true }
+
+# polkadot
+xcm = { workspace = true }
+
+# local
+cfg-traits = { workspace = true }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"codec/std",
+	"sp-std/std",
+	"cfg-traits/std",
+	"frame-support/std",
+	"frame-system/std",
+	"scale-info/std",
+	"orml-xtokens/std",
+	"orml-traits/std",
+	"xcm/std"
+]
+
+runtime-benchmarks = [
+	"cfg-traits/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-xtokens/runtime-benchmarks",
+]
+try-runtime = [
+	"cfg-traits/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"orml-xtokens/try-runtime",
+]