From de41c476d89c2f0bf4b683264029e6c0e531291c Mon Sep 17 00:00:00 2001
From: William Freudenberger <w.freude@icloud.com>
Date: Fri, 16 Aug 2024 22:40:24 +0200
Subject: [PATCH] chore: compile runtimes

---
 Cargo.lock                                   |   3 +
 pallets/liquidity-pools-forwarder/src/lib.rs |  14 +-
 pallets/liquidity-pools-gateway/src/lib.rs   |   8 +-
 pallets/liquidity-pools/src/message.rs       |   6 +-
 runtime/altair/Cargo.toml                    | 586 +++++++++---------
 runtime/altair/src/lib.rs                    |  15 +-
 runtime/centrifuge/Cargo.toml                | 560 +++++++++---------
 runtime/centrifuge/src/lib.rs                |  15 +-
 runtime/development/Cargo.toml               | 590 ++++++++++---------
 runtime/development/src/lib.rs               |  15 +-
 10 files changed, 932 insertions(+), 880 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6df85e79f6..f7c390f229 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,6 +180,7 @@ dependencies = [
  "pallet-investments",
  "pallet-keystore",
  "pallet-liquidity-pools",
+ "pallet-liquidity-pools-forwarder",
  "pallet-liquidity-pools-gateway",
  "pallet-liquidity-pools-gateway-queue",
  "pallet-liquidity-rewards",
@@ -1502,6 +1503,7 @@ dependencies = [
  "pallet-investments",
  "pallet-keystore",
  "pallet-liquidity-pools",
+ "pallet-liquidity-pools-forwarder",
  "pallet-liquidity-pools-gateway",
  "pallet-liquidity-pools-gateway-queue",
  "pallet-liquidity-rewards",
@@ -3115,6 +3117,7 @@ dependencies = [
  "pallet-investments",
  "pallet-keystore",
  "pallet-liquidity-pools",
+ "pallet-liquidity-pools-forwarder",
  "pallet-liquidity-pools-gateway",
  "pallet-liquidity-pools-gateway-queue",
  "pallet-liquidity-rewards",
diff --git a/pallets/liquidity-pools-forwarder/src/lib.rs b/pallets/liquidity-pools-forwarder/src/lib.rs
index 1e3801d92e..f795d039ca 100644
--- a/pallets/liquidity-pools-forwarder/src/lib.rs
+++ b/pallets/liquidity-pools-forwarder/src/lib.rs
@@ -81,14 +81,14 @@ pub mod pallet {
 			+ FullCodec;
 
 		/// The entity of the messages coming from this chain.
-		type Sender: MessageSender<
+		type MessageSender: MessageSender<
 			Middleware = Self::RouterId,
 			Origin = DomainAddress,
 			Message = Vec<u8>,
 		>;
 
 		/// The entity which acts on unwrapped messages.
-		type Receiver: MessageReceiver<Middleware = Self::RouterId, Origin = Domain>;
+		type MessageReceiver: MessageReceiver<Middleware = Self::RouterId, Origin = DomainAddress>;
 
 		/// An identification of a router.
 		type RouterId: Parameter + MaxEncodedLen;
@@ -149,7 +149,7 @@ pub mod pallet {
 			RouterForwarding::<T>::insert(
 				&router_id,
 				ForwardInfo {
-					source_domain: source_domain.clone(),
+					source_domain,
 					contract: forwarding_contract,
 				},
 			);
@@ -203,7 +203,7 @@ pub mod pallet {
 				message.serialize()
 			};
 
-			T::Sender::send(router_id, origin, payload)
+			T::MessageSender::send(router_id, origin, payload)
 		}
 	}
 
@@ -225,9 +225,9 @@ pub mod pallet {
 					// NOTE: We can rely on EVM side to ensure forwarded messages are valid such
 					// that it suffices to filter for the existence of forwarding info
 					if RouterForwarding::<T>::get(&router_id).is_some() {
-						return T::Receiver::receive(
+						return T::MessageReceiver::receive(
 							router_id,
-							domain_address.domain(),
+							domain_address,
 							lp_message.serialize(),
 						);
 					}
@@ -235,7 +235,7 @@ pub mod pallet {
 
 				Err(Error::<T>::ForwardInfoNotFound.into())
 			} else {
-				T::Receiver::receive(router_id, domain_address.domain(), payload)
+				T::MessageReceiver::receive(router_id, domain_address, payload)
 			}
 		}
 	}
diff --git a/pallets/liquidity-pools-gateway/src/lib.rs b/pallets/liquidity-pools-gateway/src/lib.rs
index 0e7dfb39ce..23572c3bb3 100644
--- a/pallets/liquidity-pools-gateway/src/lib.rs
+++ b/pallets/liquidity-pools-gateway/src/lib.rs
@@ -105,7 +105,11 @@ pub mod pallet {
 			+ FullCodec;
 
 		/// The target of the messages coming from this chain
-		type MessageSender: MessageSender<Middleware = Self::RouterId, Origin = DomainAddress>;
+		type MessageSender: MessageSender<
+			Middleware = Self::RouterId,
+			Origin = DomainAddress,
+			Message = Self::Message,
+		>;
 
 		/// An identification of a router
 		type RouterId: Parameter + MaxEncodedLen;
@@ -525,7 +529,7 @@ pub mod pallet {
 				} => {
 					let weight = LP_DEFENSIVE_WEIGHT;
 
-					match T::MessageSender::send(router_id, sender, message.serialize()) {
+					match T::MessageSender::send(router_id, sender, message) {
 						Ok(_) => (Ok(()), weight),
 						Err(e) => (Err(e), weight),
 					}
diff --git a/pallets/liquidity-pools/src/message.rs b/pallets/liquidity-pools/src/message.rs
index a1ed535070..c40755c382 100644
--- a/pallets/liquidity-pools/src/message.rs
+++ b/pallets/liquidity-pools/src/message.rs
@@ -212,9 +212,9 @@ impl TryFrom<Message> for NonForwardMessage {
 	}
 }
 
-impl Into<Message> for NonForwardMessage {
-	fn into(self) -> Message {
-		*self.0
+impl From<NonForwardMessage> for Message {
+	fn from(value: NonForwardMessage) -> Self {
+		*value.0
 	}
 }
 
diff --git a/runtime/altair/Cargo.toml b/runtime/altair/Cargo.toml
index ea5009dd4e..e21ab5048b 100644
--- a/runtime/altair/Cargo.toml
+++ b/runtime/altair/Cargo.toml
@@ -105,6 +105,7 @@ pallet-interest-accrual = { workspace = true }
 pallet-investments = { workspace = true }
 pallet-keystore = { workspace = true }
 pallet-liquidity-pools = { workspace = true }
+pallet-liquidity-pools-forwarder = { workspace = true }
 pallet-liquidity-pools-gateway = { workspace = true }
 pallet-liquidity-pools-gateway-queue = { workspace = true }
 pallet-liquidity-rewards = { workspace = true }
@@ -149,300 +150,303 @@ substrate-wasm-builder = { workspace = true }
 default = ["std"]
 
 std = [
-  "parity-scale-codec/std",
-  "hex/std",
-  "scale-info/std",
-  "serde/std",
-  "log/std",
-  # Substrate related
-  "sp-api/std",
-  "sp-arithmetic/std",
-  "sp-runtime/std",
-  "sp-block-builder/std",
-  "sp-consensus-aura/std",
-  "sp-core/std",
-  "sp-genesis-builder/std",
-  "sp-inherents/std",
-  "sp-io/std",
-  "sp-offchain/std",
-  "sp-session/std",
-  "sp-std/std",
-  "sp-transaction-pool/std",
-  "sp-version/std",
-  "sp-staking/std",
-  "frame-support/std",
-  "frame-system/std",
-  "frame-system-rpc-runtime-api/std",
-  "frame-executive/std",
-  "frame-metadata-hash-extension/std",
-  "frame-try-runtime?/std",
-  "frame-system-benchmarking?/std",
-  "frame-benchmarking?/std",
-  "cumulus-primitives-core/std",
-  "cumulus-primitives-timestamp/std",
-  "cumulus-primitives-utility/std",
-  "cumulus-pallet-session-benchmarking?/std",
-  "staging-xcm/std",
-  "staging-xcm-builder/std",
-  "staging-xcm-executor/std",
-  "xcm-primitives/std",
-  "orml-traits/std",
-  "orml-xcm-support/std",
-  "fp-rpc/std",
-  "fp-self-contained/std",
-  "pallet-transaction-payment-rpc-runtime-api/std",
-  "polkadot-runtime-common/std",
-  "polkadot-parachain-primitives/std",
-  # Locals
-  "cfg-primitives/std",
-  "cfg-utils/std",
-  "cfg-traits/std",
-  "cfg-types/std",
-  "runtime-common/std",
-  # Pallet list
-  "chainbridge/std",
-  "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-parachain-system/std",
-  "cumulus-pallet-xcm/std",
-  "cumulus-pallet-xcmp-queue/std",
-  "orml-asset-registry/std",
-  "orml-tokens/std",
-  "orml-xcm/std",
-  "orml-xtokens/std",
-  "pallet-anchors/std",
-  "pallet-aura/std",
-  "pallet-authorship/std",
-  "pallet-axelar-router/std",
-  "pallet-balances/std",
-  "pallet-base-fee/std",
-  "pallet-block-rewards/std",
-  "pallet-bridge/std",
-  "pallet-conviction-voting/std",
-  "pallet-collator-allowlist/std",
-  "pallet-collator-selection/std",
-  "pallet-collective/std",
-  "pallet-democracy/std",
-  "pallet-elections-phragmen/std",
-  "pallet-ethereum/std",
-  "pallet-ethereum-transaction/std",
-  "pallet-evm/std",
-  "pallet-evm-chain-id/std",
-  "pallet-fees/std",
-  "pallet-foreign-investments/std",
-  "pallet-identity/std",
-  "pallet-interest-accrual/std",
-  "pallet-investments/std",
-  "pallet-keystore/std",
-  "pallet-liquidity-pools/std",
-  "pallet-liquidity-pools-gateway/std",
-  "pallet-liquidity-rewards/std",
-  "pallet-loans/std",
-  "pallet-membership/std",
-  "pallet-multisig/std",
-  "pallet-oracle-collection/std",
-  "pallet-oracle-feed/std",
-  "pallet-order-book/std",
-  "pallet-permissions/std",
-  "pallet-pool-fees/std",
-  "pallet-pool-registry/std",
-  "pallet-pool-system/std",
-  "pallet-preimage/std",
-  "pallet-proxy/std",
-  "pallet-restricted-tokens/std",
-  "pallet-restricted-xtokens/std",
-  "pallet-referenda/std",
-  "pallet-rewards/std",
-  "pallet-remarks/std",
-  "pallet-scheduler/std",
-  "pallet-session/std",
-  "pallet-sudo/std",
-  "pallet-timestamp/std",
-  "pallet-token-mux/std",
-  "pallet-transaction-payment/std",
-  "pallet-transfer-allowlist/std",
-  "pallet-treasury/std",
-  "pallet-uniques/std",
-  "pallet-utility/std",
-  "pallet-vesting/std",
-  "pallet-whitelist/std",
-  "pallet-xcm/std",
-  "pallet-xcm-transactor/std",
-  "pallet-message-queue/std",
-  "staging-parachain-info/std",
-  "pallet-liquidity-pools-gateway-queue/std",
+    "parity-scale-codec/std",
+    "hex/std",
+    "scale-info/std",
+    "serde/std",
+    "log/std",
+    # Substrate related
+    "sp-api/std",
+    "sp-arithmetic/std",
+    "sp-runtime/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-genesis-builder/std",
+    "sp-inherents/std",
+    "sp-io/std",
+    "sp-offchain/std",
+    "sp-session/std",
+    "sp-std/std",
+    "sp-transaction-pool/std",
+    "sp-version/std",
+    "sp-staking/std",
+    "frame-support/std",
+    "frame-system/std",
+    "frame-system-rpc-runtime-api/std",
+    "frame-executive/std",
+    "frame-metadata-hash-extension/std",
+    "frame-try-runtime?/std",
+    "frame-system-benchmarking?/std",
+    "frame-benchmarking?/std",
+    "cumulus-primitives-core/std",
+    "cumulus-primitives-timestamp/std",
+    "cumulus-primitives-utility/std",
+    "cumulus-pallet-session-benchmarking?/std",
+    "staging-xcm/std",
+    "staging-xcm-builder/std",
+    "staging-xcm-executor/std",
+    "xcm-primitives/std",
+    "orml-traits/std",
+    "orml-xcm-support/std",
+    "fp-rpc/std",
+    "fp-self-contained/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
+    "polkadot-runtime-common/std",
+    "polkadot-parachain-primitives/std",
+    # Locals
+    "cfg-primitives/std",
+    "cfg-utils/std",
+    "cfg-traits/std",
+    "cfg-types/std",
+    "runtime-common/std",
+    # Pallet list
+    "chainbridge/std",
+    "cumulus-pallet-aura-ext/std",
+    "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-xcm/std",
+    "cumulus-pallet-xcmp-queue/std",
+    "orml-asset-registry/std",
+    "orml-tokens/std",
+    "orml-xcm/std",
+    "orml-xtokens/std",
+    "pallet-anchors/std",
+    "pallet-aura/std",
+    "pallet-authorship/std",
+    "pallet-axelar-router/std",
+    "pallet-balances/std",
+    "pallet-base-fee/std",
+    "pallet-block-rewards/std",
+    "pallet-bridge/std",
+    "pallet-conviction-voting/std",
+    "pallet-collator-allowlist/std",
+    "pallet-collator-selection/std",
+    "pallet-collective/std",
+    "pallet-democracy/std",
+    "pallet-elections-phragmen/std",
+    "pallet-ethereum/std",
+    "pallet-ethereum-transaction/std",
+    "pallet-evm/std",
+    "pallet-evm-chain-id/std",
+    "pallet-fees/std",
+    "pallet-foreign-investments/std",
+    "pallet-identity/std",
+    "pallet-interest-accrual/std",
+    "pallet-investments/std",
+    "pallet-keystore/std",
+    "pallet-liquidity-pools/std",
+    "pallet-liquidity-pools-forwarder/std",
+    "pallet-liquidity-pools-gateway/std",
+    "pallet-liquidity-rewards/std",
+    "pallet-loans/std",
+    "pallet-membership/std",
+    "pallet-multisig/std",
+    "pallet-oracle-collection/std",
+    "pallet-oracle-feed/std",
+    "pallet-order-book/std",
+    "pallet-permissions/std",
+    "pallet-pool-fees/std",
+    "pallet-pool-registry/std",
+    "pallet-pool-system/std",
+    "pallet-preimage/std",
+    "pallet-proxy/std",
+    "pallet-restricted-tokens/std",
+    "pallet-restricted-xtokens/std",
+    "pallet-referenda/std",
+    "pallet-rewards/std",
+    "pallet-remarks/std",
+    "pallet-scheduler/std",
+    "pallet-session/std",
+    "pallet-sudo/std",
+    "pallet-timestamp/std",
+    "pallet-token-mux/std",
+    "pallet-transaction-payment/std",
+    "pallet-transfer-allowlist/std",
+    "pallet-treasury/std",
+    "pallet-uniques/std",
+    "pallet-utility/std",
+    "pallet-vesting/std",
+    "pallet-whitelist/std",
+    "pallet-xcm/std",
+    "pallet-xcm-transactor/std",
+    "pallet-message-queue/std",
+    "staging-parachain-info/std",
+    "pallet-liquidity-pools-gateway-queue/std",
 ]
 
 runtime-benchmarks = [
-  # Enabling optional
-  "frame-system-benchmarking/runtime-benchmarks",
-  "frame-benchmarking/runtime-benchmarks",
-  "cumulus-pallet-session-benchmarking/runtime-benchmarks",
-  # Substrate related
-  "sp-runtime/runtime-benchmarks",
-  "sp-staking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "staging-xcm-builder/runtime-benchmarks",
-  "staging-xcm-executor/runtime-benchmarks",
-  "xcm-primitives/runtime-benchmarks",
-  "polkadot-runtime-common/runtime-benchmarks",
-  "polkadot-parachain-primitives/runtime-benchmarks",
-  # Locals
-  "cfg-primitives/runtime-benchmarks",
-  "cfg-utils/runtime-benchmarks",
-  "cfg-traits/runtime-benchmarks",
-  "cfg-types/runtime-benchmarks",
-  "runtime-common/runtime-benchmarks",
-  # Pallet list
-  "chainbridge/runtime-benchmarks",
-  "cumulus-pallet-parachain-system/runtime-benchmarks",
-  "cumulus-pallet-xcmp-queue/runtime-benchmarks",
-  "orml-asset-registry/runtime-benchmarks",
-  "orml-tokens/runtime-benchmarks",
-  "orml-xtokens/runtime-benchmarks",
-  "pallet-anchors/runtime-benchmarks",
-  "pallet-axelar-router/runtime-benchmarks",
-  "pallet-balances/runtime-benchmarks",
-  "pallet-block-rewards/runtime-benchmarks",
-  "pallet-bridge/runtime-benchmarks",
-  "pallet-conviction-voting/runtime-benchmarks",
-  "pallet-collator-allowlist/runtime-benchmarks",
-  "pallet-collator-selection/runtime-benchmarks",
-  "pallet-collective/runtime-benchmarks",
-  "pallet-democracy/runtime-benchmarks",
-  "pallet-elections-phragmen/runtime-benchmarks",
-  "pallet-ethereum/runtime-benchmarks",
-  "pallet-ethereum-transaction/runtime-benchmarks",
-  "pallet-evm/runtime-benchmarks",
-  "pallet-fees/runtime-benchmarks",
-  "pallet-foreign-investments/runtime-benchmarks",
-  "pallet-identity/runtime-benchmarks",
-  "pallet-interest-accrual/runtime-benchmarks",
-  "pallet-investments/runtime-benchmarks",
-  "pallet-keystore/runtime-benchmarks",
-  "pallet-liquidity-pools/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway/runtime-benchmarks",
-  "pallet-liquidity-rewards/runtime-benchmarks",
-  "pallet-loans/runtime-benchmarks",
-  "pallet-membership/runtime-benchmarks",
-  "pallet-multisig/runtime-benchmarks",
-  "pallet-oracle-collection/runtime-benchmarks",
-  "pallet-oracle-feed/runtime-benchmarks",
-  "pallet-order-book/runtime-benchmarks",
-  "pallet-permissions/runtime-benchmarks",
-  "pallet-pool-fees/runtime-benchmarks",
-  "pallet-pool-registry/runtime-benchmarks",
-  "pallet-pool-system/runtime-benchmarks",
-  "pallet-preimage/runtime-benchmarks",
-  "pallet-proxy/runtime-benchmarks",
-  "pallet-restricted-tokens/runtime-benchmarks",
-  "pallet-restricted-xtokens/runtime-benchmarks",
-  "pallet-referenda/runtime-benchmarks",
-  "pallet-rewards/runtime-benchmarks",
-  "pallet-remarks/runtime-benchmarks",
-  "pallet-scheduler/runtime-benchmarks",
-  "pallet-sudo/runtime-benchmarks",
-  "pallet-timestamp/runtime-benchmarks",
-  "pallet-token-mux/runtime-benchmarks",
-  "pallet-transfer-allowlist/runtime-benchmarks",
-  "pallet-treasury/runtime-benchmarks",
-  "pallet-uniques/runtime-benchmarks",
-  "pallet-utility/runtime-benchmarks",
-  "pallet-vesting/runtime-benchmarks",
-  "pallet-whitelist/runtime-benchmarks",
-  "pallet-xcm/runtime-benchmarks",
-  "pallet-xcm-transactor/runtime-benchmarks",
-  "pallet-message-queue/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
+    # Enabling optional
+    "frame-system-benchmarking/runtime-benchmarks",
+    "frame-benchmarking/runtime-benchmarks",
+    "cumulus-pallet-session-benchmarking/runtime-benchmarks",
+    # Substrate related
+    "sp-runtime/runtime-benchmarks",
+    "sp-staking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "staging-xcm-builder/runtime-benchmarks",
+    "staging-xcm-executor/runtime-benchmarks",
+    "xcm-primitives/runtime-benchmarks",
+    "polkadot-runtime-common/runtime-benchmarks",
+    "polkadot-parachain-primitives/runtime-benchmarks",
+    # Locals
+    "cfg-primitives/runtime-benchmarks",
+    "cfg-utils/runtime-benchmarks",
+    "cfg-traits/runtime-benchmarks",
+    "cfg-types/runtime-benchmarks",
+    "runtime-common/runtime-benchmarks",
+    # Pallet list
+    "chainbridge/runtime-benchmarks",
+    "cumulus-pallet-parachain-system/runtime-benchmarks",
+    "cumulus-pallet-xcmp-queue/runtime-benchmarks",
+    "orml-asset-registry/runtime-benchmarks",
+    "orml-tokens/runtime-benchmarks",
+    "orml-xtokens/runtime-benchmarks",
+    "pallet-anchors/runtime-benchmarks",
+    "pallet-axelar-router/runtime-benchmarks",
+    "pallet-balances/runtime-benchmarks",
+    "pallet-block-rewards/runtime-benchmarks",
+    "pallet-bridge/runtime-benchmarks",
+    "pallet-conviction-voting/runtime-benchmarks",
+    "pallet-collator-allowlist/runtime-benchmarks",
+    "pallet-collator-selection/runtime-benchmarks",
+    "pallet-collective/runtime-benchmarks",
+    "pallet-democracy/runtime-benchmarks",
+    "pallet-elections-phragmen/runtime-benchmarks",
+    "pallet-ethereum/runtime-benchmarks",
+    "pallet-ethereum-transaction/runtime-benchmarks",
+    "pallet-evm/runtime-benchmarks",
+    "pallet-fees/runtime-benchmarks",
+    "pallet-foreign-investments/runtime-benchmarks",
+    "pallet-identity/runtime-benchmarks",
+    "pallet-interest-accrual/runtime-benchmarks",
+    "pallet-investments/runtime-benchmarks",
+    "pallet-keystore/runtime-benchmarks",
+    "pallet-liquidity-pools/runtime-benchmarks",
+    "pallet-liquidity-pools-forwarder/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway/runtime-benchmarks",
+    "pallet-liquidity-rewards/runtime-benchmarks",
+    "pallet-loans/runtime-benchmarks",
+    "pallet-membership/runtime-benchmarks",
+    "pallet-multisig/runtime-benchmarks",
+    "pallet-oracle-collection/runtime-benchmarks",
+    "pallet-oracle-feed/runtime-benchmarks",
+    "pallet-order-book/runtime-benchmarks",
+    "pallet-permissions/runtime-benchmarks",
+    "pallet-pool-fees/runtime-benchmarks",
+    "pallet-pool-registry/runtime-benchmarks",
+    "pallet-pool-system/runtime-benchmarks",
+    "pallet-preimage/runtime-benchmarks",
+    "pallet-proxy/runtime-benchmarks",
+    "pallet-restricted-tokens/runtime-benchmarks",
+    "pallet-restricted-xtokens/runtime-benchmarks",
+    "pallet-referenda/runtime-benchmarks",
+    "pallet-rewards/runtime-benchmarks",
+    "pallet-remarks/runtime-benchmarks",
+    "pallet-scheduler/runtime-benchmarks",
+    "pallet-sudo/runtime-benchmarks",
+    "pallet-timestamp/runtime-benchmarks",
+    "pallet-token-mux/runtime-benchmarks",
+    "pallet-transfer-allowlist/runtime-benchmarks",
+    "pallet-treasury/runtime-benchmarks",
+    "pallet-uniques/runtime-benchmarks",
+    "pallet-utility/runtime-benchmarks",
+    "pallet-vesting/runtime-benchmarks",
+    "pallet-whitelist/runtime-benchmarks",
+    "pallet-xcm/runtime-benchmarks",
+    "pallet-xcm-transactor/runtime-benchmarks",
+    "pallet-message-queue/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
 ]
 
 try-runtime = [
-  # Enabling optional
-  "frame-try-runtime/try-runtime",
-  # Substrate related
-  "sp-runtime/try-runtime",
-  "frame-support/try-runtime",
-  "frame-system/try-runtime",
-  "frame-executive/try-runtime",
-  "fp-self-contained/try-runtime",
-  "polkadot-runtime-common/try-runtime",
-  # Locals
-  "cfg-primitives/try-runtime",
-  "cfg-utils/try-runtime",
-  "cfg-traits/try-runtime",
-  "cfg-types/try-runtime",
-  "runtime-common/try-runtime",
-  # Pallet list
-  "chainbridge/try-runtime",
-  "cumulus-pallet-aura-ext/try-runtime",
-  "cumulus-pallet-parachain-system/try-runtime",
-  "cumulus-pallet-xcm/try-runtime",
-  "cumulus-pallet-xcmp-queue/try-runtime",
-  "orml-asset-registry/try-runtime",
-  "orml-tokens/try-runtime",
-  "orml-xcm/try-runtime",
-  "orml-xtokens/try-runtime",
-  "pallet-anchors/try-runtime",
-  "pallet-aura/try-runtime",
-  "pallet-authorship/try-runtime",
-  "pallet-axelar-router/try-runtime",
-  "pallet-balances/try-runtime",
-  "pallet-base-fee/try-runtime",
-  "pallet-block-rewards/try-runtime",
-  "pallet-bridge/try-runtime",
-  "pallet-conviction-voting/try-runtime",
-  "pallet-collator-allowlist/try-runtime",
-  "pallet-collator-selection/try-runtime",
-  "pallet-collective/try-runtime",
-  "pallet-democracy/try-runtime",
-  "pallet-elections-phragmen/try-runtime",
-  "pallet-ethereum/try-runtime",
-  "pallet-ethereum-transaction/try-runtime",
-  "pallet-evm/try-runtime",
-  "pallet-evm-chain-id/try-runtime",
-  "pallet-fees/try-runtime",
-  "pallet-foreign-investments/try-runtime",
-  "pallet-identity/try-runtime",
-  "pallet-interest-accrual/try-runtime",
-  "pallet-investments/try-runtime",
-  "pallet-keystore/try-runtime",
-  "pallet-liquidity-pools/try-runtime",
-  "pallet-liquidity-pools-gateway/try-runtime",
-  "pallet-liquidity-rewards/try-runtime",
-  "pallet-loans/try-runtime",
-  "pallet-membership/try-runtime",
-  "pallet-multisig/try-runtime",
-  "pallet-oracle-collection/try-runtime",
-  "pallet-oracle-feed/try-runtime",
-  "pallet-order-book/try-runtime",
-  "pallet-permissions/try-runtime",
-  "pallet-pool-fees/try-runtime",
-  "pallet-pool-registry/try-runtime",
-  "pallet-pool-system/try-runtime",
-  "pallet-preimage/try-runtime",
-  "pallet-proxy/try-runtime",
-  "pallet-restricted-tokens/try-runtime",
-  "pallet-restricted-xtokens/try-runtime",
-  "pallet-referenda/try-runtime",
-  "pallet-rewards/try-runtime",
-  "pallet-remarks/try-runtime",
-  "pallet-scheduler/try-runtime",
-  "pallet-session/try-runtime",
-  "pallet-sudo/try-runtime",
-  "pallet-timestamp/try-runtime",
-  "pallet-token-mux/try-runtime",
-  "pallet-transaction-payment/try-runtime",
-  "pallet-transfer-allowlist/try-runtime",
-  "pallet-treasury/try-runtime",
-  "pallet-uniques/try-runtime",
-  "pallet-utility/try-runtime",
-  "pallet-vesting/try-runtime",
-  "pallet-whitelist/try-runtime",
-  "pallet-xcm/try-runtime",
-  "pallet-xcm-transactor/try-runtime",
-  "pallet-message-queue/try-runtime",
-  "staging-parachain-info/try-runtime",
-  "pallet-liquidity-pools-gateway-queue/try-runtime",
+    # Enabling optional
+    "frame-try-runtime/try-runtime",
+    # Substrate related
+    "sp-runtime/try-runtime",
+    "frame-support/try-runtime",
+    "frame-system/try-runtime",
+    "frame-executive/try-runtime",
+    "fp-self-contained/try-runtime",
+    "polkadot-runtime-common/try-runtime",
+    # Locals
+    "cfg-primitives/try-runtime",
+    "cfg-utils/try-runtime",
+    "cfg-traits/try-runtime",
+    "cfg-types/try-runtime",
+    "runtime-common/try-runtime",
+    # Pallet list
+    "chainbridge/try-runtime",
+    "cumulus-pallet-aura-ext/try-runtime",
+    "cumulus-pallet-parachain-system/try-runtime",
+    "cumulus-pallet-xcm/try-runtime",
+    "cumulus-pallet-xcmp-queue/try-runtime",
+    "orml-asset-registry/try-runtime",
+    "orml-tokens/try-runtime",
+    "orml-xcm/try-runtime",
+    "orml-xtokens/try-runtime",
+    "pallet-anchors/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-authorship/try-runtime",
+    "pallet-axelar-router/try-runtime",
+    "pallet-balances/try-runtime",
+    "pallet-base-fee/try-runtime",
+    "pallet-block-rewards/try-runtime",
+    "pallet-bridge/try-runtime",
+    "pallet-conviction-voting/try-runtime",
+    "pallet-collator-allowlist/try-runtime",
+    "pallet-collator-selection/try-runtime",
+    "pallet-collective/try-runtime",
+    "pallet-democracy/try-runtime",
+    "pallet-elections-phragmen/try-runtime",
+    "pallet-ethereum/try-runtime",
+    "pallet-ethereum-transaction/try-runtime",
+    "pallet-evm/try-runtime",
+    "pallet-evm-chain-id/try-runtime",
+    "pallet-fees/try-runtime",
+    "pallet-foreign-investments/try-runtime",
+    "pallet-identity/try-runtime",
+    "pallet-interest-accrual/try-runtime",
+    "pallet-investments/try-runtime",
+    "pallet-keystore/try-runtime",
+    "pallet-liquidity-pools/try-runtime",
+    "pallet-liquidity-pools-forwarder/try-runtime",
+    "pallet-liquidity-pools-gateway/try-runtime",
+    "pallet-liquidity-rewards/try-runtime",
+    "pallet-loans/try-runtime",
+    "pallet-membership/try-runtime",
+    "pallet-multisig/try-runtime",
+    "pallet-oracle-collection/try-runtime",
+    "pallet-oracle-feed/try-runtime",
+    "pallet-order-book/try-runtime",
+    "pallet-permissions/try-runtime",
+    "pallet-pool-fees/try-runtime",
+    "pallet-pool-registry/try-runtime",
+    "pallet-pool-system/try-runtime",
+    "pallet-preimage/try-runtime",
+    "pallet-proxy/try-runtime",
+    "pallet-restricted-tokens/try-runtime",
+    "pallet-restricted-xtokens/try-runtime",
+    "pallet-referenda/try-runtime",
+    "pallet-rewards/try-runtime",
+    "pallet-remarks/try-runtime",
+    "pallet-scheduler/try-runtime",
+    "pallet-session/try-runtime",
+    "pallet-sudo/try-runtime",
+    "pallet-timestamp/try-runtime",
+    "pallet-token-mux/try-runtime",
+    "pallet-transaction-payment/try-runtime",
+    "pallet-transfer-allowlist/try-runtime",
+    "pallet-treasury/try-runtime",
+    "pallet-uniques/try-runtime",
+    "pallet-utility/try-runtime",
+    "pallet-vesting/try-runtime",
+    "pallet-whitelist/try-runtime",
+    "pallet-xcm/try-runtime",
+    "pallet-xcm-transactor/try-runtime",
+    "pallet-message-queue/try-runtime",
+    "staging-parachain-info/try-runtime",
+    "pallet-liquidity-pools-gateway-queue/try-runtime",
 ]
 
 # Enable the metadata hash generation.
@@ -458,9 +462,9 @@ metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
 on-chain-release-build = [
-  "sp-api/disable-logging",
-  "runtime-common/on-chain-release-build",
-  "metadata-hash",
+    "sp-api/disable-logging",
+    "runtime-common/on-chain-release-build",
+    "metadata-hash",
 ]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs
index 4c809605ef..ac9ba978bf 100644
--- a/runtime/altair/src/lib.rs
+++ b/runtime/altair/src/lib.rs
@@ -1754,6 +1754,16 @@ impl pallet_liquidity_pools::Config for Runtime {
 	type WeightInfo = ();
 }
 
+impl pallet_liquidity_pools_forwarder::Config for Runtime {
+	type AdminOrigin = EnsureRootOr<HalfOfCouncil>;
+	type Message = pallet_liquidity_pools::Message;
+	type MessageReceiver = LiquidityPoolsGateway;
+	type MessageSender = RouterDispatcher<Runtime>;
+	type RouterId = RouterId;
+	type RouterProvider = LPGatewayRouterProvider;
+	type RuntimeEvent = RuntimeEvent;
+}
+
 parameter_types! {
 	pub Sender: DomainAddress = gateway::get_gateway_domain_address::<Runtime>();
 	pub const MaxIncomingMessageSize: u32 = 1024;
@@ -1768,7 +1778,7 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
 	type MessageQueue = LiquidityPoolsGatewayQueue;
-	type MessageSender = RouterDispatcher<Runtime>;
+	type MessageSender = LiquidityPoolsForwarder;
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
@@ -1893,7 +1903,7 @@ impl pallet_axelar_router::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type EvmAccountCodeChecker = EvmAccountCodeChecker<Runtime>;
 	type Middleware = RouterId;
-	type Receiver = LiquidityPoolsGateway;
+	type Receiver = LiquidityPoolsForwarder;
 	type RuntimeEvent = RuntimeEvent;
 	type Transactor = EthereumTransaction;
 }
@@ -2124,6 +2134,7 @@ construct_runtime!(
 		// Removed: Swaps = 200
 		TokenMux: pallet_token_mux::{Pallet, Call, Storage, Event<T>} = 201,
 		LiquidityPoolsGatewayQueue: pallet_liquidity_pools_gateway_queue::{Pallet, Call, Storage, Event<T>} = 202,
+		LiquidityPoolsForwarder: pallet_liquidity_pools_forwarder::{Pallet, Call, Storage, Event<T>} = 203,
 	}
 );
 
diff --git a/runtime/centrifuge/Cargo.toml b/runtime/centrifuge/Cargo.toml
index 0a4f83b50f..b4eb7e2bdc 100644
--- a/runtime/centrifuge/Cargo.toml
+++ b/runtime/centrifuge/Cargo.toml
@@ -102,6 +102,7 @@ pallet-interest-accrual = { workspace = true }
 pallet-investments = { workspace = true }
 pallet-keystore = { workspace = true }
 pallet-liquidity-pools = { workspace = true }
+pallet-liquidity-pools-forwarder = { workspace = true }
 pallet-liquidity-pools-gateway = { workspace = true }
 pallet-liquidity-pools-gateway-queue = { workspace = true }
 pallet-liquidity-rewards = { workspace = true }
@@ -144,287 +145,290 @@ substrate-wasm-builder = { workspace = true }
 default = ["std"]
 
 std = [
-  "parity-scale-codec/std",
-  "hex/std",
-  "scale-info/std",
-  "serde/std",
-  "log/std",
-  # Substrate related
-  "sp-api/std",
-  "sp-runtime/std",
-  "sp-block-builder/std",
-  "sp-consensus-aura/std",
-  "sp-core/std",
-  "sp-genesis-builder/std",
-  "sp-inherents/std",
-  "sp-io/std",
-  "sp-offchain/std",
-  "sp-session/std",
-  "sp-std/std",
-  "sp-transaction-pool/std",
-  "sp-version/std",
-  "sp-staking/std",
-  "frame-support/std",
-  "frame-system/std",
-  "frame-system-rpc-runtime-api/std",
-  "frame-executive/std",
-  "frame-metadata-hash-extension/std",
-  "frame-try-runtime?/std",
-  "frame-system-benchmarking?/std",
-  "frame-benchmarking?/std",
-  "cumulus-primitives-core/std",
-  "cumulus-primitives-timestamp/std",
-  "cumulus-primitives-utility/std",
-  "cumulus-pallet-session-benchmarking?/std",
-  "staging-xcm/std",
-  "staging-xcm-builder/std",
-  "staging-xcm-executor/std",
-  "xcm-primitives/std",
-  "orml-traits/std",
-  "orml-xcm-support/std",
-  "fp-rpc/std",
-  "fp-self-contained/std",
-  "pallet-transaction-payment-rpc-runtime-api/std",
-  "polkadot-runtime-common/std",
-  "polkadot-parachain-primitives/std",
-  # Locals
-  "cfg-primitives/std",
-  "cfg-traits/std",
-  "cfg-types/std",
-  "runtime-common/std",
-  # Pallet list
-  "chainbridge/std",
-  "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-parachain-system/std",
-  "cumulus-pallet-xcm/std",
-  "cumulus-pallet-xcmp-queue/std",
-  "orml-asset-registry/std",
-  "orml-tokens/std",
-  "orml-xcm/std",
-  "orml-xtokens/std",
-  "pallet-anchors/std",
-  "pallet-aura/std",
-  "pallet-authorship/std",
-  "pallet-axelar-router/std",
-  "pallet-balances/std",
-  "pallet-base-fee/std",
-  "pallet-block-rewards/std",
-  "pallet-bridge/std",
-  "pallet-collator-allowlist/std",
-  "pallet-collator-selection/std",
-  "pallet-collective/std",
-  "pallet-democracy/std",
-  "pallet-elections-phragmen/std",
-  "pallet-ethereum/std",
-  "pallet-ethereum-transaction/std",
-  "pallet-evm/std",
-  "pallet-evm-chain-id/std",
-  "pallet-fees/std",
-  "pallet-foreign-investments/std",
-  "pallet-identity/std",
-  "pallet-interest-accrual/std",
-  "pallet-investments/std",
-  "pallet-keystore/std",
-  "pallet-liquidity-pools/std",
-  "pallet-liquidity-pools-gateway/std",
-  "pallet-liquidity-rewards/std",
-  "pallet-loans/std",
-  "pallet-membership/std",
-  "pallet-multisig/std",
-  "pallet-oracle-collection/std",
-  "pallet-oracle-feed/std",
-  "pallet-order-book/std",
-  "pallet-permissions/std",
-  "pallet-pool-fees/std",
-  "pallet-pool-registry/std",
-  "pallet-pool-system/std",
-  "pallet-preimage/std",
-  "pallet-proxy/std",
-  "pallet-remarks/std",
-  "pallet-restricted-tokens/std",
-  "pallet-restricted-xtokens/std",
-  "pallet-rewards/std",
-  "pallet-scheduler/std",
-  "pallet-session/std",
-  "pallet-sudo/std",
-  "pallet-timestamp/std",
-  "pallet-token-mux/std",
-  "pallet-transaction-payment/std",
-  "pallet-transfer-allowlist/std",
-  "pallet-treasury/std",
-  "pallet-uniques/std",
-  "pallet-utility/std",
-  "pallet-vesting/std",
-  "pallet-xcm/std",
-  "pallet-xcm-transactor/std",
-  "pallet-message-queue/std",
-  "staging-parachain-info/std",
-  "pallet-liquidity-pools-gateway-queue/std",
+    "parity-scale-codec/std",
+    "hex/std",
+    "scale-info/std",
+    "serde/std",
+    "log/std",
+    # Substrate related
+    "sp-api/std",
+    "sp-runtime/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-genesis-builder/std",
+    "sp-inherents/std",
+    "sp-io/std",
+    "sp-offchain/std",
+    "sp-session/std",
+    "sp-std/std",
+    "sp-transaction-pool/std",
+    "sp-version/std",
+    "sp-staking/std",
+    "frame-support/std",
+    "frame-system/std",
+    "frame-system-rpc-runtime-api/std",
+    "frame-executive/std",
+    "frame-metadata-hash-extension/std",
+    "frame-try-runtime?/std",
+    "frame-system-benchmarking?/std",
+    "frame-benchmarking?/std",
+    "cumulus-primitives-core/std",
+    "cumulus-primitives-timestamp/std",
+    "cumulus-primitives-utility/std",
+    "cumulus-pallet-session-benchmarking?/std",
+    "staging-xcm/std",
+    "staging-xcm-builder/std",
+    "staging-xcm-executor/std",
+    "xcm-primitives/std",
+    "orml-traits/std",
+    "orml-xcm-support/std",
+    "fp-rpc/std",
+    "fp-self-contained/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
+    "polkadot-runtime-common/std",
+    "polkadot-parachain-primitives/std",
+    # Locals
+    "cfg-primitives/std",
+    "cfg-traits/std",
+    "cfg-types/std",
+    "runtime-common/std",
+    # Pallet list
+    "chainbridge/std",
+    "cumulus-pallet-aura-ext/std",
+    "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-xcm/std",
+    "cumulus-pallet-xcmp-queue/std",
+    "orml-asset-registry/std",
+    "orml-tokens/std",
+    "orml-xcm/std",
+    "orml-xtokens/std",
+    "pallet-anchors/std",
+    "pallet-aura/std",
+    "pallet-authorship/std",
+    "pallet-axelar-router/std",
+    "pallet-balances/std",
+    "pallet-base-fee/std",
+    "pallet-block-rewards/std",
+    "pallet-bridge/std",
+    "pallet-collator-allowlist/std",
+    "pallet-collator-selection/std",
+    "pallet-collective/std",
+    "pallet-democracy/std",
+    "pallet-elections-phragmen/std",
+    "pallet-ethereum/std",
+    "pallet-ethereum-transaction/std",
+    "pallet-evm/std",
+    "pallet-evm-chain-id/std",
+    "pallet-fees/std",
+    "pallet-foreign-investments/std",
+    "pallet-identity/std",
+    "pallet-interest-accrual/std",
+    "pallet-investments/std",
+    "pallet-keystore/std",
+    "pallet-liquidity-pools/std",
+    "pallet-liquidity-pools-forwarder/std",
+    "pallet-liquidity-pools-gateway/std",
+    "pallet-liquidity-rewards/std",
+    "pallet-loans/std",
+    "pallet-membership/std",
+    "pallet-multisig/std",
+    "pallet-oracle-collection/std",
+    "pallet-oracle-feed/std",
+    "pallet-order-book/std",
+    "pallet-permissions/std",
+    "pallet-pool-fees/std",
+    "pallet-pool-registry/std",
+    "pallet-pool-system/std",
+    "pallet-preimage/std",
+    "pallet-proxy/std",
+    "pallet-remarks/std",
+    "pallet-restricted-tokens/std",
+    "pallet-restricted-xtokens/std",
+    "pallet-rewards/std",
+    "pallet-scheduler/std",
+    "pallet-session/std",
+    "pallet-sudo/std",
+    "pallet-timestamp/std",
+    "pallet-token-mux/std",
+    "pallet-transaction-payment/std",
+    "pallet-transfer-allowlist/std",
+    "pallet-treasury/std",
+    "pallet-uniques/std",
+    "pallet-utility/std",
+    "pallet-vesting/std",
+    "pallet-xcm/std",
+    "pallet-xcm-transactor/std",
+    "pallet-message-queue/std",
+    "staging-parachain-info/std",
+    "pallet-liquidity-pools-gateway-queue/std",
 ]
 
 runtime-benchmarks = [
-  # Enabling optional
-  "frame-system-benchmarking/runtime-benchmarks",
-  "frame-benchmarking/runtime-benchmarks",
-  "cumulus-pallet-session-benchmarking/runtime-benchmarks",
-  # Substrate related
-  "sp-runtime/runtime-benchmarks",
-  "sp-staking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "staging-xcm-builder/runtime-benchmarks",
-  "staging-xcm-executor/runtime-benchmarks",
-  "xcm-primitives/runtime-benchmarks",
-  "polkadot-runtime-common/runtime-benchmarks",
-  "polkadot-parachain-primitives/runtime-benchmarks",
-  # Locals
-  "cfg-primitives/runtime-benchmarks",
-  "cfg-traits/runtime-benchmarks",
-  "cfg-types/runtime-benchmarks",
-  "runtime-common/runtime-benchmarks",
-  # Pallet list
-  "chainbridge/runtime-benchmarks",
-  "cumulus-pallet-parachain-system/runtime-benchmarks",
-  "cumulus-pallet-xcmp-queue/runtime-benchmarks",
-  "orml-asset-registry/runtime-benchmarks",
-  "orml-tokens/runtime-benchmarks",
-  "orml-xtokens/runtime-benchmarks",
-  "pallet-anchors/runtime-benchmarks",
-  "pallet-axelar-router/runtime-benchmarks",
-  "pallet-balances/runtime-benchmarks",
-  "pallet-block-rewards/runtime-benchmarks",
-  "pallet-bridge/runtime-benchmarks",
-  "pallet-collator-allowlist/runtime-benchmarks",
-  "pallet-collator-selection/runtime-benchmarks",
-  "pallet-collective/runtime-benchmarks",
-  "pallet-democracy/runtime-benchmarks",
-  "pallet-elections-phragmen/runtime-benchmarks",
-  "pallet-ethereum/runtime-benchmarks",
-  "pallet-ethereum-transaction/runtime-benchmarks",
-  "pallet-evm/runtime-benchmarks",
-  "pallet-fees/runtime-benchmarks",
-  "pallet-foreign-investments/runtime-benchmarks",
-  "pallet-identity/runtime-benchmarks",
-  "pallet-interest-accrual/runtime-benchmarks",
-  "pallet-investments/runtime-benchmarks",
-  "pallet-keystore/runtime-benchmarks",
-  "pallet-liquidity-pools/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway/runtime-benchmarks",
-  "pallet-liquidity-rewards/runtime-benchmarks",
-  "pallet-loans/runtime-benchmarks",
-  "pallet-membership/runtime-benchmarks",
-  "pallet-multisig/runtime-benchmarks",
-  "pallet-oracle-collection/runtime-benchmarks",
-  "pallet-oracle-feed/runtime-benchmarks",
-  "pallet-order-book/runtime-benchmarks",
-  "pallet-permissions/runtime-benchmarks",
-  "pallet-pool-fees/runtime-benchmarks",
-  "pallet-pool-registry/runtime-benchmarks",
-  "pallet-pool-system/runtime-benchmarks",
-  "pallet-preimage/runtime-benchmarks",
-  "pallet-proxy/runtime-benchmarks",
-  "pallet-remarks/runtime-benchmarks",
-  "pallet-restricted-tokens/runtime-benchmarks",
-  "pallet-restricted-xtokens/runtime-benchmarks",
-  "pallet-rewards/runtime-benchmarks",
-  "pallet-scheduler/runtime-benchmarks",
-  "pallet-sudo/runtime-benchmarks",
-  "pallet-timestamp/runtime-benchmarks",
-  "pallet-token-mux/runtime-benchmarks",
-  "pallet-transfer-allowlist/runtime-benchmarks",
-  "pallet-treasury/runtime-benchmarks",
-  "pallet-uniques/runtime-benchmarks",
-  "pallet-utility/runtime-benchmarks",
-  "pallet-vesting/runtime-benchmarks",
-  "pallet-xcm/runtime-benchmarks",
-  "pallet-xcm-transactor/runtime-benchmarks",
-  "pallet-message-queue/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
+    # Enabling optional
+    "frame-system-benchmarking/runtime-benchmarks",
+    "frame-benchmarking/runtime-benchmarks",
+    "cumulus-pallet-session-benchmarking/runtime-benchmarks",
+    # Substrate related
+    "sp-runtime/runtime-benchmarks",
+    "sp-staking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "staging-xcm-builder/runtime-benchmarks",
+    "staging-xcm-executor/runtime-benchmarks",
+    "xcm-primitives/runtime-benchmarks",
+    "polkadot-runtime-common/runtime-benchmarks",
+    "polkadot-parachain-primitives/runtime-benchmarks",
+    # Locals
+    "cfg-primitives/runtime-benchmarks",
+    "cfg-traits/runtime-benchmarks",
+    "cfg-types/runtime-benchmarks",
+    "runtime-common/runtime-benchmarks",
+    # Pallet list
+    "chainbridge/runtime-benchmarks",
+    "cumulus-pallet-parachain-system/runtime-benchmarks",
+    "cumulus-pallet-xcmp-queue/runtime-benchmarks",
+    "orml-asset-registry/runtime-benchmarks",
+    "orml-tokens/runtime-benchmarks",
+    "orml-xtokens/runtime-benchmarks",
+    "pallet-anchors/runtime-benchmarks",
+    "pallet-axelar-router/runtime-benchmarks",
+    "pallet-balances/runtime-benchmarks",
+    "pallet-block-rewards/runtime-benchmarks",
+    "pallet-bridge/runtime-benchmarks",
+    "pallet-collator-allowlist/runtime-benchmarks",
+    "pallet-collator-selection/runtime-benchmarks",
+    "pallet-collective/runtime-benchmarks",
+    "pallet-democracy/runtime-benchmarks",
+    "pallet-elections-phragmen/runtime-benchmarks",
+    "pallet-ethereum/runtime-benchmarks",
+    "pallet-ethereum-transaction/runtime-benchmarks",
+    "pallet-evm/runtime-benchmarks",
+    "pallet-fees/runtime-benchmarks",
+    "pallet-foreign-investments/runtime-benchmarks",
+    "pallet-identity/runtime-benchmarks",
+    "pallet-interest-accrual/runtime-benchmarks",
+    "pallet-investments/runtime-benchmarks",
+    "pallet-keystore/runtime-benchmarks",
+    "pallet-liquidity-pools/runtime-benchmarks",
+    "pallet-liquidity-pools-forwarder/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway/runtime-benchmarks",
+    "pallet-liquidity-rewards/runtime-benchmarks",
+    "pallet-loans/runtime-benchmarks",
+    "pallet-membership/runtime-benchmarks",
+    "pallet-multisig/runtime-benchmarks",
+    "pallet-oracle-collection/runtime-benchmarks",
+    "pallet-oracle-feed/runtime-benchmarks",
+    "pallet-order-book/runtime-benchmarks",
+    "pallet-permissions/runtime-benchmarks",
+    "pallet-pool-fees/runtime-benchmarks",
+    "pallet-pool-registry/runtime-benchmarks",
+    "pallet-pool-system/runtime-benchmarks",
+    "pallet-preimage/runtime-benchmarks",
+    "pallet-proxy/runtime-benchmarks",
+    "pallet-remarks/runtime-benchmarks",
+    "pallet-restricted-tokens/runtime-benchmarks",
+    "pallet-restricted-xtokens/runtime-benchmarks",
+    "pallet-rewards/runtime-benchmarks",
+    "pallet-scheduler/runtime-benchmarks",
+    "pallet-sudo/runtime-benchmarks",
+    "pallet-timestamp/runtime-benchmarks",
+    "pallet-token-mux/runtime-benchmarks",
+    "pallet-transfer-allowlist/runtime-benchmarks",
+    "pallet-treasury/runtime-benchmarks",
+    "pallet-uniques/runtime-benchmarks",
+    "pallet-utility/runtime-benchmarks",
+    "pallet-vesting/runtime-benchmarks",
+    "pallet-xcm/runtime-benchmarks",
+    "pallet-xcm-transactor/runtime-benchmarks",
+    "pallet-message-queue/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
 ]
 
 try-runtime = [
-  # Enabling optional
-  "frame-try-runtime/try-runtime",
-  # Substrate related
-  "sp-runtime/try-runtime",
-  "frame-support/try-runtime",
-  "frame-system/try-runtime",
-  "frame-executive/try-runtime",
-  "fp-self-contained/try-runtime",
-  "polkadot-runtime-common/try-runtime",
-  # Locals
-  "cfg-primitives/try-runtime",
-  "cfg-traits/try-runtime",
-  "cfg-types/try-runtime",
-  "runtime-common/try-runtime",
-  # Pallet list
-  "chainbridge/try-runtime",
-  "cumulus-pallet-aura-ext/try-runtime",
-  "cumulus-pallet-parachain-system/try-runtime",
-  "cumulus-pallet-xcm/try-runtime",
-  "cumulus-pallet-xcmp-queue/try-runtime",
-  "orml-asset-registry/try-runtime",
-  "orml-tokens/try-runtime",
-  "orml-xcm/try-runtime",
-  "orml-xtokens/try-runtime",
-  "pallet-anchors/try-runtime",
-  "pallet-aura/try-runtime",
-  "pallet-authorship/try-runtime",
-  "pallet-axelar-router/try-runtime",
-  "pallet-balances/try-runtime",
-  "pallet-base-fee/try-runtime",
-  "pallet-block-rewards/try-runtime",
-  "pallet-bridge/try-runtime",
-  "pallet-collator-allowlist/try-runtime",
-  "pallet-collator-selection/try-runtime",
-  "pallet-collective/try-runtime",
-  "pallet-democracy/try-runtime",
-  "pallet-elections-phragmen/try-runtime",
-  "pallet-ethereum/try-runtime",
-  "pallet-ethereum-transaction/try-runtime",
-  "pallet-evm/try-runtime",
-  "pallet-evm-chain-id/try-runtime",
-  "pallet-fees/try-runtime",
-  "pallet-foreign-investments/try-runtime",
-  "pallet-identity/try-runtime",
-  "pallet-interest-accrual/try-runtime",
-  "pallet-investments/try-runtime",
-  "pallet-keystore/try-runtime",
-  "pallet-liquidity-pools/try-runtime",
-  "pallet-liquidity-pools-gateway/try-runtime",
-  "pallet-liquidity-rewards/try-runtime",
-  "pallet-loans/try-runtime",
-  "pallet-membership/try-runtime",
-  "pallet-multisig/try-runtime",
-  "pallet-oracle-collection/try-runtime",
-  "pallet-oracle-feed/try-runtime",
-  "pallet-order-book/try-runtime",
-  "pallet-permissions/try-runtime",
-  "pallet-pool-fees/try-runtime",
-  "pallet-pool-registry/try-runtime",
-  "pallet-pool-system/try-runtime",
-  "pallet-preimage/try-runtime",
-  "pallet-proxy/try-runtime",
-  "pallet-remarks/try-runtime",
-  "pallet-restricted-tokens/try-runtime",
-  "pallet-restricted-xtokens/try-runtime",
-  "pallet-rewards/try-runtime",
-  "pallet-scheduler/try-runtime",
-  "pallet-session/try-runtime",
-  "pallet-sudo/try-runtime",
-  "pallet-timestamp/try-runtime",
-  "pallet-token-mux/try-runtime",
-  "pallet-transaction-payment/try-runtime",
-  "pallet-transfer-allowlist/try-runtime",
-  "pallet-treasury/try-runtime",
-  "pallet-uniques/try-runtime",
-  "pallet-utility/try-runtime",
-  "pallet-vesting/try-runtime",
-  "pallet-xcm/try-runtime",
-  "pallet-xcm-transactor/try-runtime",
-  "pallet-message-queue/try-runtime",
-  "staging-parachain-info/try-runtime",
-  "pallet-liquidity-pools-gateway-queue/try-runtime",
+    # Enabling optional
+    "frame-try-runtime/try-runtime",
+    # Substrate related
+    "sp-runtime/try-runtime",
+    "frame-support/try-runtime",
+    "frame-system/try-runtime",
+    "frame-executive/try-runtime",
+    "fp-self-contained/try-runtime",
+    "polkadot-runtime-common/try-runtime",
+    # Locals
+    "cfg-primitives/try-runtime",
+    "cfg-traits/try-runtime",
+    "cfg-types/try-runtime",
+    "runtime-common/try-runtime",
+    # Pallet list
+    "chainbridge/try-runtime",
+    "cumulus-pallet-aura-ext/try-runtime",
+    "cumulus-pallet-parachain-system/try-runtime",
+    "cumulus-pallet-xcm/try-runtime",
+    "cumulus-pallet-xcmp-queue/try-runtime",
+    "orml-asset-registry/try-runtime",
+    "orml-tokens/try-runtime",
+    "orml-xcm/try-runtime",
+    "orml-xtokens/try-runtime",
+    "pallet-anchors/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-authorship/try-runtime",
+    "pallet-axelar-router/try-runtime",
+    "pallet-balances/try-runtime",
+    "pallet-base-fee/try-runtime",
+    "pallet-block-rewards/try-runtime",
+    "pallet-bridge/try-runtime",
+    "pallet-collator-allowlist/try-runtime",
+    "pallet-collator-selection/try-runtime",
+    "pallet-collective/try-runtime",
+    "pallet-democracy/try-runtime",
+    "pallet-elections-phragmen/try-runtime",
+    "pallet-ethereum/try-runtime",
+    "pallet-ethereum-transaction/try-runtime",
+    "pallet-evm/try-runtime",
+    "pallet-evm-chain-id/try-runtime",
+    "pallet-fees/try-runtime",
+    "pallet-foreign-investments/try-runtime",
+    "pallet-identity/try-runtime",
+    "pallet-interest-accrual/try-runtime",
+    "pallet-investments/try-runtime",
+    "pallet-keystore/try-runtime",
+    "pallet-liquidity-pools/try-runtime",
+    "pallet-liquidity-pools-forwarder/try-runtime",
+    "pallet-liquidity-pools-gateway/try-runtime",
+    "pallet-liquidity-rewards/try-runtime",
+    "pallet-loans/try-runtime",
+    "pallet-membership/try-runtime",
+    "pallet-multisig/try-runtime",
+    "pallet-oracle-collection/try-runtime",
+    "pallet-oracle-feed/try-runtime",
+    "pallet-order-book/try-runtime",
+    "pallet-permissions/try-runtime",
+    "pallet-pool-fees/try-runtime",
+    "pallet-pool-registry/try-runtime",
+    "pallet-pool-system/try-runtime",
+    "pallet-preimage/try-runtime",
+    "pallet-proxy/try-runtime",
+    "pallet-remarks/try-runtime",
+    "pallet-restricted-tokens/try-runtime",
+    "pallet-restricted-xtokens/try-runtime",
+    "pallet-rewards/try-runtime",
+    "pallet-scheduler/try-runtime",
+    "pallet-session/try-runtime",
+    "pallet-sudo/try-runtime",
+    "pallet-timestamp/try-runtime",
+    "pallet-token-mux/try-runtime",
+    "pallet-transaction-payment/try-runtime",
+    "pallet-transfer-allowlist/try-runtime",
+    "pallet-treasury/try-runtime",
+    "pallet-uniques/try-runtime",
+    "pallet-utility/try-runtime",
+    "pallet-vesting/try-runtime",
+    "pallet-xcm/try-runtime",
+    "pallet-xcm-transactor/try-runtime",
+    "pallet-message-queue/try-runtime",
+    "staging-parachain-info/try-runtime",
+    "pallet-liquidity-pools-gateway-queue/try-runtime",
 ]
 
 # Enable the metadata hash generation.
@@ -440,9 +444,9 @@ metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
 on-chain-release-build = [
-  "sp-api/disable-logging",
-  "runtime-common/on-chain-release-build",
-  "metadata-hash",
+    "sp-api/disable-logging",
+    "runtime-common/on-chain-release-build",
+    "metadata-hash",
 ]
 
 # Set timing constants (e.g. session period) to faster versions to speed up testing.
diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs
index 7aaf756c4d..2512fc843d 100644
--- a/runtime/centrifuge/src/lib.rs
+++ b/runtime/centrifuge/src/lib.rs
@@ -1843,6 +1843,16 @@ parameter_types! {
 	pub const MaxRouterCount: u32 = 8;
 }
 
+impl pallet_liquidity_pools_forwarder::Config for Runtime {
+	type AdminOrigin = EnsureAccountOrRootOr<LpAdminAccount, TwoThirdOfCouncil>;
+	type Message = pallet_liquidity_pools::Message;
+	type MessageReceiver = LiquidityPoolsGateway;
+	type MessageSender = RouterDispatcher<Runtime>;
+	type RouterId = RouterId;
+	type RouterProvider = LPGatewayRouterProvider;
+	type RuntimeEvent = RuntimeEvent;
+}
+
 parameter_types! {
 	// A temporary admin account for the LP logic
 	// This is a multi-sig controlled pure proxy on mainnet
@@ -1867,7 +1877,7 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
 	type MessageQueue = LiquidityPoolsGatewayQueue;
-	type MessageSender = RouterDispatcher<Runtime>;
+	type MessageSender = LiquidityPoolsForwarder;
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
@@ -1992,7 +2002,7 @@ impl pallet_axelar_router::Config for Runtime {
 	type AdminOrigin = EnsureAccountOrRootOr<LpAdminAccount, TwoThirdOfCouncil>;
 	type EvmAccountCodeChecker = EvmAccountCodeChecker<Runtime>;
 	type Middleware = RouterId;
-	type Receiver = LiquidityPoolsGateway;
+	type Receiver = LiquidityPoolsForwarder;
 	type RuntimeEvent = RuntimeEvent;
 	type Transactor = EthereumTransaction;
 }
@@ -2096,6 +2106,7 @@ construct_runtime!(
 		Remarks: pallet_remarks::{Pallet, Call, Event<T>} = 113,
 		PoolFees: pallet_pool_fees::{Pallet, Call, Storage, Event<T>} = 114,
 		LiquidityPoolsGatewayQueue: pallet_liquidity_pools_gateway_queue::{Pallet, Call, Storage, Event<T>} = 115,
+		LiquidityPoolsForwarder: pallet_liquidity_pools_forwarder::{Pallet, Call, Storage, Event<T>} = 116,
 
 		// XCM
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 120,
diff --git a/runtime/development/Cargo.toml b/runtime/development/Cargo.toml
index ac92c94e31..a2126ce0c0 100644
--- a/runtime/development/Cargo.toml
+++ b/runtime/development/Cargo.toml
@@ -106,6 +106,7 @@ pallet-interest-accrual = { workspace = true }
 pallet-investments = { workspace = true }
 pallet-keystore = { workspace = true }
 pallet-liquidity-pools = { workspace = true }
+pallet-liquidity-pools-forwarder = { workspace = true }
 pallet-liquidity-pools-gateway = { workspace = true }
 pallet-liquidity-pools-gateway-queue = { workspace = true }
 pallet-liquidity-rewards = { workspace = true }
@@ -150,302 +151,305 @@ substrate-wasm-builder = { workspace = true }
 default = ["std"]
 
 std = [
-  "parity-scale-codec/std",
-  "hex/std",
-  "log/std",
-  "scale-info/std",
-  "serde/std",
-  # Substrate related
-  "sp-api/std",
-  "sp-arithmetic/std",
-  "sp-runtime/std",
-  "sp-block-builder/std",
-  "sp-consensus-aura/std",
-  "sp-core/std",
-  "sp-genesis-builder/std",
-  "sp-inherents/std",
-  "sp-io/std",
-  "sp-offchain/std",
-  "sp-session/std",
-  "sp-std/std",
-  "sp-transaction-pool/std",
-  "sp-version/std",
-  "sp-staking/std",
-  "frame-support/std",
-  "frame-system/std",
-  "frame-system-rpc-runtime-api/std",
-  "frame-executive/std",
-  "frame-metadata-hash-extension/std",
-  "frame-try-runtime?/std",
-  "frame-system-benchmarking?/std",
-  "frame-benchmarking?/std",
-  "cumulus-primitives-core/std",
-  "cumulus-primitives-timestamp/std",
-  "cumulus-primitives-utility/std",
-  "cumulus-pallet-session-benchmarking?/std",
-  "staging-xcm/std",
-  "staging-xcm-builder/std",
-  "staging-xcm-executor/std",
-  "xcm-primitives/std",
-  "orml-traits/std",
-  "orml-xcm-support/std",
-  "fp-rpc/std",
-  "fp-self-contained/std",
-  "pallet-transaction-payment-rpc-runtime-api/std",
-  "polkadot-runtime-common/std",
-  "polkadot-parachain-primitives/std",
-  # Locals
-  "cfg-primitives/std",
-  "cfg-utils/std",
-  "cfg-traits/std",
-  "cfg-types/std",
-  "runtime-common/std",
-  # Pallet list
-  "chainbridge/std",
-  "cumulus-pallet-aura-ext/std",
-  "cumulus-pallet-parachain-system/std",
-  "cumulus-pallet-xcm/std",
-  "cumulus-pallet-xcmp-queue/std",
-  "orml-asset-registry/std",
-  "orml-tokens/std",
-  "orml-xcm/std",
-  "orml-xtokens/std",
-  "pallet-anchors/std",
-  "pallet-anchors-v2/std",
-  "pallet-aura/std",
-  "pallet-authorship/std",
-  "pallet-axelar-router/std",
-  "pallet-balances/std",
-  "pallet-base-fee/std",
-  "pallet-block-rewards/std",
-  "pallet-bridge/std",
-  "pallet-collator-allowlist/std",
-  "pallet-collator-selection/std",
-  "pallet-collective/std",
-  "pallet-conviction-voting/std",
-  "pallet-democracy/std",
-  "pallet-elections-phragmen/std",
-  "pallet-ethereum/std",
-  "pallet-ethereum-transaction/std",
-  "pallet-evm/std",
-  "pallet-evm-chain-id/std",
-  "pallet-fees/std",
-  "pallet-foreign-investments/std",
-  "pallet-identity/std",
-  "pallet-interest-accrual/std",
-  "pallet-investments/std",
-  "pallet-keystore/std",
-  "pallet-liquidity-pools/std",
-  "pallet-liquidity-pools-gateway/std",
-  "pallet-liquidity-rewards/std",
-  "pallet-loans/std",
-  "pallet-membership/std",
-  "pallet-multisig/std",
-  "pallet-oracle-collection/std",
-  "pallet-oracle-feed/std",
-  "pallet-order-book/std",
-  "pallet-permissions/std",
-  "pallet-pool-fees/std",
-  "pallet-pool-registry/std",
-  "pallet-pool-system/std",
-  "pallet-preimage/std",
-  "pallet-proxy/std",
-  "pallet-referenda/std",
-  "pallet-remarks/std",
-  "pallet-restricted-tokens/std",
-  "pallet-restricted-xtokens/std",
-  "pallet-rewards/std",
-  "pallet-scheduler/std",
-  "pallet-session/std",
-  "pallet-sudo/std",
-  "pallet-timestamp/std",
-  "pallet-token-mux/std",
-  "pallet-transaction-payment/std",
-  "pallet-transfer-allowlist/std",
-  "pallet-treasury/std",
-  "pallet-uniques/std",
-  "pallet-utility/std",
-  "pallet-vesting/std",
-  "pallet-whitelist/std",
-  "pallet-xcm/std",
-  "pallet-xcm-transactor/std",
-  "pallet-message-queue/std",
-  "staging-parachain-info/std",
+    "parity-scale-codec/std",
+    "hex/std",
+    "log/std",
+    "scale-info/std",
+    "serde/std",
+    # Substrate related
+    "sp-api/std",
+    "sp-arithmetic/std",
+    "sp-runtime/std",
+    "sp-block-builder/std",
+    "sp-consensus-aura/std",
+    "sp-core/std",
+    "sp-genesis-builder/std",
+    "sp-inherents/std",
+    "sp-io/std",
+    "sp-offchain/std",
+    "sp-session/std",
+    "sp-std/std",
+    "sp-transaction-pool/std",
+    "sp-version/std",
+    "sp-staking/std",
+    "frame-support/std",
+    "frame-system/std",
+    "frame-system-rpc-runtime-api/std",
+    "frame-executive/std",
+    "frame-metadata-hash-extension/std",
+    "frame-try-runtime?/std",
+    "frame-system-benchmarking?/std",
+    "frame-benchmarking?/std",
+    "cumulus-primitives-core/std",
+    "cumulus-primitives-timestamp/std",
+    "cumulus-primitives-utility/std",
+    "cumulus-pallet-session-benchmarking?/std",
+    "staging-xcm/std",
+    "staging-xcm-builder/std",
+    "staging-xcm-executor/std",
+    "xcm-primitives/std",
+    "orml-traits/std",
+    "orml-xcm-support/std",
+    "fp-rpc/std",
+    "fp-self-contained/std",
+    "pallet-transaction-payment-rpc-runtime-api/std",
+    "polkadot-runtime-common/std",
+    "polkadot-parachain-primitives/std",
+    # Locals
+    "cfg-primitives/std",
+    "cfg-utils/std",
+    "cfg-traits/std",
+    "cfg-types/std",
+    "runtime-common/std",
+    # Pallet list
+    "chainbridge/std",
+    "cumulus-pallet-aura-ext/std",
+    "cumulus-pallet-parachain-system/std",
+    "cumulus-pallet-xcm/std",
+    "cumulus-pallet-xcmp-queue/std",
+    "orml-asset-registry/std",
+    "orml-tokens/std",
+    "orml-xcm/std",
+    "orml-xtokens/std",
+    "pallet-anchors/std",
+    "pallet-anchors-v2/std",
+    "pallet-aura/std",
+    "pallet-authorship/std",
+    "pallet-axelar-router/std",
+    "pallet-balances/std",
+    "pallet-base-fee/std",
+    "pallet-block-rewards/std",
+    "pallet-bridge/std",
+    "pallet-collator-allowlist/std",
+    "pallet-collator-selection/std",
+    "pallet-collective/std",
+    "pallet-conviction-voting/std",
+    "pallet-democracy/std",
+    "pallet-elections-phragmen/std",
+    "pallet-ethereum/std",
+    "pallet-ethereum-transaction/std",
+    "pallet-evm/std",
+    "pallet-evm-chain-id/std",
+    "pallet-fees/std",
+    "pallet-foreign-investments/std",
+    "pallet-identity/std",
+    "pallet-interest-accrual/std",
+    "pallet-investments/std",
+    "pallet-keystore/std",
+    "pallet-liquidity-pools/std",
+    "pallet-liquidity-pools-forwarder/std",
+    "pallet-liquidity-pools-gateway/std",
+    "pallet-liquidity-rewards/std",
+    "pallet-loans/std",
+    "pallet-membership/std",
+    "pallet-multisig/std",
+    "pallet-oracle-collection/std",
+    "pallet-oracle-feed/std",
+    "pallet-order-book/std",
+    "pallet-permissions/std",
+    "pallet-pool-fees/std",
+    "pallet-pool-registry/std",
+    "pallet-pool-system/std",
+    "pallet-preimage/std",
+    "pallet-proxy/std",
+    "pallet-referenda/std",
+    "pallet-remarks/std",
+    "pallet-restricted-tokens/std",
+    "pallet-restricted-xtokens/std",
+    "pallet-rewards/std",
+    "pallet-scheduler/std",
+    "pallet-session/std",
+    "pallet-sudo/std",
+    "pallet-timestamp/std",
+    "pallet-token-mux/std",
+    "pallet-transaction-payment/std",
+    "pallet-transfer-allowlist/std",
+    "pallet-treasury/std",
+    "pallet-uniques/std",
+    "pallet-utility/std",
+    "pallet-vesting/std",
+    "pallet-whitelist/std",
+    "pallet-xcm/std",
+    "pallet-xcm-transactor/std",
+    "pallet-message-queue/std",
+    "staging-parachain-info/std",
 ]
 
 runtime-benchmarks = [
-  # Enabling optional
-  "frame-system-benchmarking/runtime-benchmarks",
-  "frame-benchmarking/runtime-benchmarks",
-  "cumulus-pallet-session-benchmarking/runtime-benchmarks",
-  # Substrate related
-  "sp-runtime/runtime-benchmarks",
-  "sp-staking/runtime-benchmarks",
-  "frame-support/runtime-benchmarks",
-  "frame-system/runtime-benchmarks",
-  "staging-xcm-builder/runtime-benchmarks",
-  "staging-xcm-executor/runtime-benchmarks",
-  "xcm-primitives/runtime-benchmarks",
-  "polkadot-runtime-common/runtime-benchmarks",
-  "polkadot-parachain-primitives/runtime-benchmarks",
-  # Locals
-  "cfg-primitives/runtime-benchmarks",
-  "cfg-utils/runtime-benchmarks",
-  "cfg-traits/runtime-benchmarks",
-  "cfg-types/runtime-benchmarks",
-  "runtime-common/runtime-benchmarks",
-  # Pallet list
-  "chainbridge/runtime-benchmarks",
-  "cumulus-pallet-parachain-system/runtime-benchmarks",
-  "cumulus-pallet-xcmp-queue/runtime-benchmarks",
-  "orml-asset-registry/runtime-benchmarks",
-  "orml-tokens/runtime-benchmarks",
-  "orml-xtokens/runtime-benchmarks",
-  "pallet-anchors/runtime-benchmarks",
-  "pallet-anchors-v2/runtime-benchmarks",
-  "pallet-axelar-router/runtime-benchmarks",
-  "pallet-balances/runtime-benchmarks",
-  "pallet-block-rewards/runtime-benchmarks",
-  "pallet-bridge/runtime-benchmarks",
-  "pallet-collator-allowlist/runtime-benchmarks",
-  "pallet-collator-selection/runtime-benchmarks",
-  "pallet-collective/runtime-benchmarks",
-  "pallet-conviction-voting/runtime-benchmarks",
-  "pallet-democracy/runtime-benchmarks",
-  "pallet-elections-phragmen/runtime-benchmarks",
-  "pallet-ethereum/runtime-benchmarks",
-  "pallet-ethereum-transaction/runtime-benchmarks",
-  "pallet-evm/runtime-benchmarks",
-  "pallet-fees/runtime-benchmarks",
-  "pallet-foreign-investments/runtime-benchmarks",
-  "pallet-identity/runtime-benchmarks",
-  "pallet-interest-accrual/runtime-benchmarks",
-  "pallet-investments/runtime-benchmarks",
-  "pallet-keystore/runtime-benchmarks",
-  "pallet-liquidity-pools/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway/runtime-benchmarks",
-  "pallet-liquidity-rewards/runtime-benchmarks",
-  "pallet-loans/runtime-benchmarks",
-  "pallet-membership/runtime-benchmarks",
-  "pallet-multisig/runtime-benchmarks",
-  "pallet-oracle-collection/runtime-benchmarks",
-  "pallet-oracle-feed/runtime-benchmarks",
-  "pallet-order-book/runtime-benchmarks",
-  "pallet-permissions/runtime-benchmarks",
-  "pallet-pool-fees/runtime-benchmarks",
-  "pallet-pool-registry/runtime-benchmarks",
-  "pallet-pool-system/runtime-benchmarks",
-  "pallet-preimage/runtime-benchmarks",
-  "pallet-proxy/runtime-benchmarks",
-  "pallet-remarks/runtime-benchmarks",
-  "pallet-referenda/runtime-benchmarks",
-  "pallet-restricted-tokens/runtime-benchmarks",
-  "pallet-restricted-xtokens/runtime-benchmarks",
-  "pallet-rewards/runtime-benchmarks",
-  "pallet-scheduler/runtime-benchmarks",
-  "pallet-sudo/runtime-benchmarks",
-  "pallet-timestamp/runtime-benchmarks",
-  "pallet-token-mux/runtime-benchmarks",
-  "pallet-transfer-allowlist/runtime-benchmarks",
-  "pallet-treasury/runtime-benchmarks",
-  "pallet-uniques/runtime-benchmarks",
-  "pallet-utility/runtime-benchmarks",
-  "pallet-vesting/runtime-benchmarks",
-  "pallet-whitelist/runtime-benchmarks",
-  "pallet-xcm/runtime-benchmarks",
-  "pallet-xcm-transactor/runtime-benchmarks",
-  "pallet-message-queue/runtime-benchmarks",
-  "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
+    # Enabling optional
+    "frame-system-benchmarking/runtime-benchmarks",
+    "frame-benchmarking/runtime-benchmarks",
+    "cumulus-pallet-session-benchmarking/runtime-benchmarks",
+    # Substrate related
+    "sp-runtime/runtime-benchmarks",
+    "sp-staking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "staging-xcm-builder/runtime-benchmarks",
+    "staging-xcm-executor/runtime-benchmarks",
+    "xcm-primitives/runtime-benchmarks",
+    "polkadot-runtime-common/runtime-benchmarks",
+    "polkadot-parachain-primitives/runtime-benchmarks",
+    # Locals
+    "cfg-primitives/runtime-benchmarks",
+    "cfg-utils/runtime-benchmarks",
+    "cfg-traits/runtime-benchmarks",
+    "cfg-types/runtime-benchmarks",
+    "runtime-common/runtime-benchmarks",
+    # Pallet list
+    "chainbridge/runtime-benchmarks",
+    "cumulus-pallet-parachain-system/runtime-benchmarks",
+    "cumulus-pallet-xcmp-queue/runtime-benchmarks",
+    "orml-asset-registry/runtime-benchmarks",
+    "orml-tokens/runtime-benchmarks",
+    "orml-xtokens/runtime-benchmarks",
+    "pallet-anchors/runtime-benchmarks",
+    "pallet-anchors-v2/runtime-benchmarks",
+    "pallet-axelar-router/runtime-benchmarks",
+    "pallet-balances/runtime-benchmarks",
+    "pallet-block-rewards/runtime-benchmarks",
+    "pallet-bridge/runtime-benchmarks",
+    "pallet-collator-allowlist/runtime-benchmarks",
+    "pallet-collator-selection/runtime-benchmarks",
+    "pallet-collective/runtime-benchmarks",
+    "pallet-conviction-voting/runtime-benchmarks",
+    "pallet-democracy/runtime-benchmarks",
+    "pallet-elections-phragmen/runtime-benchmarks",
+    "pallet-ethereum/runtime-benchmarks",
+    "pallet-ethereum-transaction/runtime-benchmarks",
+    "pallet-evm/runtime-benchmarks",
+    "pallet-fees/runtime-benchmarks",
+    "pallet-foreign-investments/runtime-benchmarks",
+    "pallet-identity/runtime-benchmarks",
+    "pallet-interest-accrual/runtime-benchmarks",
+    "pallet-investments/runtime-benchmarks",
+    "pallet-keystore/runtime-benchmarks",
+    "pallet-liquidity-pools/runtime-benchmarks",
+    "pallet-liquidity-pools-forwarder/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway/runtime-benchmarks",
+    "pallet-liquidity-rewards/runtime-benchmarks",
+    "pallet-loans/runtime-benchmarks",
+    "pallet-membership/runtime-benchmarks",
+    "pallet-multisig/runtime-benchmarks",
+    "pallet-oracle-collection/runtime-benchmarks",
+    "pallet-oracle-feed/runtime-benchmarks",
+    "pallet-order-book/runtime-benchmarks",
+    "pallet-permissions/runtime-benchmarks",
+    "pallet-pool-fees/runtime-benchmarks",
+    "pallet-pool-registry/runtime-benchmarks",
+    "pallet-pool-system/runtime-benchmarks",
+    "pallet-preimage/runtime-benchmarks",
+    "pallet-proxy/runtime-benchmarks",
+    "pallet-remarks/runtime-benchmarks",
+    "pallet-referenda/runtime-benchmarks",
+    "pallet-restricted-tokens/runtime-benchmarks",
+    "pallet-restricted-xtokens/runtime-benchmarks",
+    "pallet-rewards/runtime-benchmarks",
+    "pallet-scheduler/runtime-benchmarks",
+    "pallet-sudo/runtime-benchmarks",
+    "pallet-timestamp/runtime-benchmarks",
+    "pallet-token-mux/runtime-benchmarks",
+    "pallet-transfer-allowlist/runtime-benchmarks",
+    "pallet-treasury/runtime-benchmarks",
+    "pallet-uniques/runtime-benchmarks",
+    "pallet-utility/runtime-benchmarks",
+    "pallet-vesting/runtime-benchmarks",
+    "pallet-whitelist/runtime-benchmarks",
+    "pallet-xcm/runtime-benchmarks",
+    "pallet-xcm-transactor/runtime-benchmarks",
+    "pallet-message-queue/runtime-benchmarks",
+    "pallet-liquidity-pools-gateway-queue/runtime-benchmarks",
 ]
 
 try-runtime = [
-  # Enabling optional
-  "frame-try-runtime/try-runtime",
-  # Substrate related
-  "sp-runtime/try-runtime",
-  "frame-support/try-runtime",
-  "frame-system/try-runtime",
-  "frame-executive/try-runtime",
-  "fp-self-contained/try-runtime",
-  "polkadot-runtime-common/try-runtime",
-  # Locals
-  "cfg-primitives/try-runtime",
-  "cfg-utils/try-runtime",
-  "cfg-traits/try-runtime",
-  "cfg-types/try-runtime",
-  "runtime-common/try-runtime",
-  # Pallet list
-  "chainbridge/try-runtime",
-  "cumulus-pallet-aura-ext/try-runtime",
-  "cumulus-pallet-parachain-system/try-runtime",
-  "cumulus-pallet-xcm/try-runtime",
-  "cumulus-pallet-xcmp-queue/try-runtime",
-  "orml-asset-registry/try-runtime",
-  "orml-tokens/try-runtime",
-  "orml-xcm/try-runtime",
-  "orml-xtokens/try-runtime",
-  "pallet-anchors/try-runtime",
-  "pallet-anchors-v2/try-runtime",
-  "pallet-aura/try-runtime",
-  "pallet-authorship/try-runtime",
-  "pallet-axelar-router/try-runtime",
-  "pallet-balances/try-runtime",
-  "pallet-base-fee/try-runtime",
-  "pallet-block-rewards/try-runtime",
-  "pallet-bridge/try-runtime",
-  "pallet-collator-allowlist/try-runtime",
-  "pallet-collator-selection/try-runtime",
-  "pallet-collective/try-runtime",
-  "pallet-conviction-voting/try-runtime",
-  "pallet-democracy/try-runtime",
-  "pallet-elections-phragmen/try-runtime",
-  "pallet-ethereum/try-runtime",
-  "pallet-ethereum-transaction/try-runtime",
-  "pallet-evm/try-runtime",
-  "pallet-evm-chain-id/try-runtime",
-  "pallet-fees/try-runtime",
-  "pallet-foreign-investments/try-runtime",
-  "pallet-identity/try-runtime",
-  "pallet-interest-accrual/try-runtime",
-  "pallet-investments/try-runtime",
-  "pallet-keystore/try-runtime",
-  "pallet-liquidity-pools/try-runtime",
-  "pallet-liquidity-pools-gateway/try-runtime",
-  "pallet-liquidity-rewards/try-runtime",
-  "pallet-loans/try-runtime",
-  "pallet-membership/try-runtime",
-  "pallet-multisig/try-runtime",
-  "pallet-oracle-collection/try-runtime",
-  "pallet-oracle-feed/try-runtime",
-  "pallet-order-book/try-runtime",
-  "pallet-permissions/try-runtime",
-  "pallet-pool-fees/try-runtime",
-  "pallet-pool-registry/try-runtime",
-  "pallet-pool-system/try-runtime",
-  "pallet-preimage/try-runtime",
-  "pallet-proxy/try-runtime",
-  "pallet-referenda/try-runtime",
-  "pallet-remarks/try-runtime",
-  "pallet-restricted-tokens/try-runtime",
-  "pallet-restricted-xtokens/try-runtime",
-  "pallet-rewards/try-runtime",
-  "pallet-scheduler/try-runtime",
-  "pallet-session/try-runtime",
-  "pallet-sudo/try-runtime",
-  "pallet-timestamp/try-runtime",
-  "pallet-token-mux/try-runtime",
-  "pallet-transaction-payment/try-runtime",
-  "pallet-transfer-allowlist/try-runtime",
-  "pallet-treasury/try-runtime",
-  "pallet-uniques/try-runtime",
-  "pallet-utility/try-runtime",
-  "pallet-vesting/try-runtime",
-  "pallet-whitelist/try-runtime",
-  "pallet-xcm/try-runtime",
-  "pallet-xcm-transactor/try-runtime",
-  "pallet-message-queue/try-runtime",
-  "staging-parachain-info/try-runtime",
-  "pallet-liquidity-pools-gateway-queue/try-runtime",
+    # Enabling optional
+    "frame-try-runtime/try-runtime",
+    # Substrate related
+    "sp-runtime/try-runtime",
+    "frame-support/try-runtime",
+    "frame-system/try-runtime",
+    "frame-executive/try-runtime",
+    "fp-self-contained/try-runtime",
+    "polkadot-runtime-common/try-runtime",
+    # Locals
+    "cfg-primitives/try-runtime",
+    "cfg-utils/try-runtime",
+    "cfg-traits/try-runtime",
+    "cfg-types/try-runtime",
+    "runtime-common/try-runtime",
+    # Pallet list
+    "chainbridge/try-runtime",
+    "cumulus-pallet-aura-ext/try-runtime",
+    "cumulus-pallet-parachain-system/try-runtime",
+    "cumulus-pallet-xcm/try-runtime",
+    "cumulus-pallet-xcmp-queue/try-runtime",
+    "orml-asset-registry/try-runtime",
+    "orml-tokens/try-runtime",
+    "orml-xcm/try-runtime",
+    "orml-xtokens/try-runtime",
+    "pallet-anchors/try-runtime",
+    "pallet-anchors-v2/try-runtime",
+    "pallet-aura/try-runtime",
+    "pallet-authorship/try-runtime",
+    "pallet-axelar-router/try-runtime",
+    "pallet-balances/try-runtime",
+    "pallet-base-fee/try-runtime",
+    "pallet-block-rewards/try-runtime",
+    "pallet-bridge/try-runtime",
+    "pallet-collator-allowlist/try-runtime",
+    "pallet-collator-selection/try-runtime",
+    "pallet-collective/try-runtime",
+    "pallet-conviction-voting/try-runtime",
+    "pallet-democracy/try-runtime",
+    "pallet-elections-phragmen/try-runtime",
+    "pallet-ethereum/try-runtime",
+    "pallet-ethereum-transaction/try-runtime",
+    "pallet-evm/try-runtime",
+    "pallet-evm-chain-id/try-runtime",
+    "pallet-fees/try-runtime",
+    "pallet-foreign-investments/try-runtime",
+    "pallet-identity/try-runtime",
+    "pallet-interest-accrual/try-runtime",
+    "pallet-investments/try-runtime",
+    "pallet-keystore/try-runtime",
+    "pallet-liquidity-pools/try-runtime",
+    "pallet-liquidity-pools-forwarder/try-runtime",
+    "pallet-liquidity-pools-gateway/try-runtime",
+    "pallet-liquidity-rewards/try-runtime",
+    "pallet-loans/try-runtime",
+    "pallet-membership/try-runtime",
+    "pallet-multisig/try-runtime",
+    "pallet-oracle-collection/try-runtime",
+    "pallet-oracle-feed/try-runtime",
+    "pallet-order-book/try-runtime",
+    "pallet-permissions/try-runtime",
+    "pallet-pool-fees/try-runtime",
+    "pallet-pool-registry/try-runtime",
+    "pallet-pool-system/try-runtime",
+    "pallet-preimage/try-runtime",
+    "pallet-proxy/try-runtime",
+    "pallet-referenda/try-runtime",
+    "pallet-remarks/try-runtime",
+    "pallet-restricted-tokens/try-runtime",
+    "pallet-restricted-xtokens/try-runtime",
+    "pallet-rewards/try-runtime",
+    "pallet-scheduler/try-runtime",
+    "pallet-session/try-runtime",
+    "pallet-sudo/try-runtime",
+    "pallet-timestamp/try-runtime",
+    "pallet-token-mux/try-runtime",
+    "pallet-transaction-payment/try-runtime",
+    "pallet-transfer-allowlist/try-runtime",
+    "pallet-treasury/try-runtime",
+    "pallet-uniques/try-runtime",
+    "pallet-utility/try-runtime",
+    "pallet-vesting/try-runtime",
+    "pallet-whitelist/try-runtime",
+    "pallet-xcm/try-runtime",
+    "pallet-xcm-transactor/try-runtime",
+    "pallet-message-queue/try-runtime",
+    "staging-parachain-info/try-runtime",
+    "pallet-liquidity-pools-gateway-queue/try-runtime",
 ]
 
 # Enable the metadata hash generation.
@@ -461,9 +465,9 @@ metadata-hash = ["substrate-wasm-builder/metadata-hash"]
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller like logging for example.
 on-chain-release-build = [
-  "sp-api/disable-logging",
-  "runtime-common/on-chain-release-build",
-  "metadata-hash",
+    "sp-api/disable-logging",
+    "runtime-common/on-chain-release-build",
+    "metadata-hash",
 ]
 
 # Used by integration testing
diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs
index ed499ffe89..bda5f844d3 100644
--- a/runtime/development/src/lib.rs
+++ b/runtime/development/src/lib.rs
@@ -1859,6 +1859,16 @@ impl pallet_liquidity_pools::Config for Runtime {
 	type WeightInfo = ();
 }
 
+impl pallet_liquidity_pools_forwarder::Config for Runtime {
+	type AdminOrigin = EnsureRootOr<HalfOfCouncil>;
+	type Message = pallet_liquidity_pools::Message;
+	type MessageReceiver = LiquidityPoolsGateway;
+	type MessageSender = RouterDispatcher<Runtime>;
+	type RouterId = RouterId;
+	type RouterProvider = LPGatewayRouterProvider;
+	type RuntimeEvent = RuntimeEvent;
+}
+
 parameter_types! {
 	pub Sender: DomainAddress = gateway::get_gateway_domain_address::<Runtime>();
 	pub const MaxIncomingMessageSize: u32 = 1024;
@@ -1873,7 +1883,7 @@ impl pallet_liquidity_pools_gateway::Config for Runtime {
 	type MaxRouterCount = MaxRouterCount;
 	type Message = pallet_liquidity_pools::Message;
 	type MessageQueue = LiquidityPoolsGatewayQueue;
-	type MessageSender = RouterDispatcher<Runtime>;
+	type MessageSender = LiquidityPoolsForwarder;
 	type RouterId = RouterId;
 	type RouterProvider = LPGatewayRouterProvider;
 	type RuntimeEvent = RuntimeEvent;
@@ -1999,7 +2009,7 @@ impl pallet_axelar_router::Config for Runtime {
 	type AdminOrigin = EnsureRoot<AccountId>;
 	type EvmAccountCodeChecker = EvmAccountCodeChecker<Runtime>;
 	type Middleware = RouterId;
-	type Receiver = LiquidityPoolsGateway;
+	type Receiver = LiquidityPoolsForwarder;
 	type RuntimeEvent = RuntimeEvent;
 	type Transactor = EthereumTransaction;
 }
@@ -2204,6 +2214,7 @@ construct_runtime!(
 		// our pallets part 2
 		AnchorsV2: pallet_anchors_v2::{Pallet, Call, Storage, Event<T>} = 130,
 		LiquidityPoolsGatewayQueue: pallet_liquidity_pools_gateway_queue::{Pallet, Call, Storage, Event<T>} = 131,
+		LiquidityPoolsForwarder: pallet_liquidity_pools_forwarder::{Pallet, Call, Storage, Event<T>} = 132,
 
 		// XCM
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 120,