WIP: Liquidity Pools v2

Cargo.toml

@@ -23,6 +23,7 @@ members = [
   "pallets/liquidity-pools-gateway",
   "pallets/liquidity-pools-gateway/axelar-gateway-precompile",
   "pallets/liquidity-pools-gateway/routers",
+  "pallets/liquidity-pools-gateway/queue",
   "pallets/liquidity-rewards",
   "pallets/loans",
   "pallets/oracle-feed",
@@ -35,7 +36,6 @@ members = [
   "pallets/restricted-tokens",
   "pallets/restricted-xtokens",
   "pallets/rewards",
-  "pallets/swaps",
   "pallets/token-mux",
   "pallets/transfer-allowlist",
   "runtime/altair",
@@ -53,7 +53,7 @@ license = "LGPL-3.0"
 homepage = "https://centrifuge.io/"
 repository = "https://github.com/centrifuge/centrifuge-chain"
 documentation = "https://reference.centrifuge.io/centrifuge_chain/index.html"
-version = "0.13.0"
+version = "0.14.0"
 
 [workspace.dependencies]
 hex-literal = { version = "0.4.1" }
@@ -237,6 +237,7 @@ pallet-investments = { path = "pallets/investments", default-features = false }
 pallet-keystore = { path = "pallets/keystore", default-features = false }
 pallet-liquidity-pools = { path = "pallets/liquidity-pools", default-features = false }
 pallet-liquidity-pools-gateway = { path = "pallets/liquidity-pools-gateway", default-features = false }
+pallet-liquidity-pools-gateway-queue = { path = "pallets/liquidity-pools-gateway/queue", default-features = false }
 pallet-liquidity-rewards = { path = "pallets/liquidity-rewards", default-features = false }
 pallet-loans = { path = "pallets/loans", default-features = false }
 pallet-oracle-feed = { path = "pallets/oracle-feed", default-features = false }
@@ -249,7 +250,6 @@ 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-swaps = { path = "pallets/swaps", default-features = false }
 pallet-token-mux = { path = "pallets/token-mux", default-features = false }
 pallet-transfer-allowlist = { path = "pallets/transfer-allowlist", default-features = false }
 

README.md

@@ -54,6 +54,8 @@ On top of the [Substrate FRAME](https://docs.substrate.io/reference/frame-pallet
 - [**liquidity-pools**](https://github.com/centrifuge/centrifuge-chain/tree/main/pallets/liquidity-pools) ([docs](https://reference.centrifuge.io/pallet_liquidity_pools/index.html)): Provides the toolset to enable foreign investments on foreign domains.
 
 - [**liquidity-pools-gateway**](https://github.com/centrifuge/centrifuge-chain/tree/main/pallets/liquidity-pools-gateway) ([docs](https://reference.centrifuge.io/pallet_liquidity_pools_gateway/index.html)): The main handler of incoming and outgoing Liquidity Pools messages.
+- 
+- [**liquidity-pools-gateway-queue**](https://github.com/centrifuge/centrifuge-chain/tree/main/pallets/liquidity-pools-gateway/queue) ([docs](https://reference.centrifuge.io/pallet_liquidity_pools_gateway_queue/index.html)): The queue used by the Liquidity Pools Gateway for processing inbound/outbound messages.
 
 - [**liquidity-pools-gateway-routers**](https://github.com/centrifuge/centrifuge-chain/tree/main/pallets/liquidity-pools-gateway/routers) ([docs](https://reference.centrifuge.io/liquidity_pools_gateway_routers/index.html)): This crate contains the `DomainRouters` used by the Liquidity Pools Gateway pallet.
 

libs/mocks/src/foreign_investment.rs

@@ -26,11 +26,10 @@ pub mod pallet {
 			register_call!(move |(a, b, c, d)| f(a, b, c, d));
 		}
 
-		pub fn mock_decrease_foreign_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::Amount, T::CurrencyId) -> DispatchResult
-				+ 'static,
+		pub fn mock_cancel_foreign_investment(
+			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
 		) {
-			register_call!(move |(a, b, c, d)| f(a, b, c, d));
+			register_call!(move |(a, b, c)| f(a, b, c));
 		}
 
 		pub fn mock_increase_foreign_redemption(
@@ -45,48 +44,21 @@ pub mod pallet {
 			register_call!(move |(a, b, c, d)| f(a, b, c, d));
 		}
 
-		pub fn mock_decrease_foreign_redemption(
+		pub fn mock_cancel_foreign_redemption(
 			f: impl Fn(
 					&T::AccountId,
 					T::InvestmentId,
-					T::TrancheAmount,
 					T::CurrencyId,
-				) -> DispatchResult
+				) -> Result<T::TrancheAmount, DispatchError>
 				+ 'static,
-		) {
-			register_call!(move |(a, b, c, d)| f(a, b, c, d));
-		}
-
-		pub fn mock_collect_foreign_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
 		) {
 			register_call!(move |(a, b, c)| f(a, b, c));
 		}
-
-		pub fn mock_collect_foreign_redemption(
-			f: impl Fn(&T::AccountId, T::InvestmentId, T::CurrencyId) -> DispatchResult + 'static,
-		) {
-			register_call!(move |(a, b, c)| f(a, b, c));
-		}
-
-		pub fn mock_investment(
-			f: impl Fn(&T::AccountId, T::InvestmentId) -> Result<T::Amount, DispatchError> + 'static,
-		) {
-			register_call!(move |(a, b)| f(a, b));
-		}
-
-		pub fn mock_redemption(
-			f: impl Fn(&T::AccountId, T::InvestmentId) -> Result<T::TrancheAmount, DispatchError>
-				+ 'static,
-		) {
-			register_call!(move |(a, b)| f(a, b));
-		}
 	}
 
 	impl<T: Config> ForeignInvestment<T::AccountId> for Pallet<T> {
 		type Amount = T::Amount;
 		type CurrencyId = T::CurrencyId;
-		type Error = DispatchError;
 		type InvestmentId = T::InvestmentId;
 		type TrancheAmount = T::TrancheAmount;
 
@@ -99,13 +71,12 @@ pub mod pallet {
 			execute_call!((a, b, c, d))
 		}
 
-		fn decrease_foreign_investment(
+		fn cancel_foreign_investment(
 			a: &T::AccountId,
 			b: Self::InvestmentId,
-			c: Self::Amount,
-			d: Self::CurrencyId,
+			c: Self::CurrencyId,
 		) -> DispatchResult {
-			execute_call!((a, b, c, d))
+			execute_call!((a, b, c))
 		}
 
 		fn increase_foreign_redemption(
@@ -117,43 +88,12 @@ pub mod pallet {
 			execute_call!((a, b, c, d))
 		}
 
-		fn decrease_foreign_redemption(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-			c: Self::TrancheAmount,
-			d: Self::CurrencyId,
-		) -> DispatchResult {
-			execute_call!((a, b, c, d))
-		}
-
-		fn collect_foreign_investment(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-			c: Self::CurrencyId,
-		) -> DispatchResult {
-			execute_call!((a, b, c))
-		}
-
-		fn collect_foreign_redemption(
+		fn cancel_foreign_redemption(
 			a: &T::AccountId,
 			b: Self::InvestmentId,
 			c: Self::CurrencyId,
-		) -> DispatchResult {
+		) -> Result<T::TrancheAmount, DispatchError> {
 			execute_call!((a, b, c))
 		}
-
-		fn investment(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-		) -> Result<Self::Amount, DispatchError> {
-			execute_call!((a, b))
-		}
-
-		fn redemption(
-			a: &T::AccountId,
-			b: Self::InvestmentId,
-		) -> Result<Self::TrancheAmount, DispatchError> {
-			execute_call!((a, b))
-		}
 	}
 }