lp-gateway: Add queue for outbound messages

libs/mocks/src/liquidity_pools.rs

@@ -1,8 +1,8 @@
 use cfg_traits::liquidity_pools::Codec;
-use parity_scale_codec::{Decode, Encode, Error, Input};
+use parity_scale_codec::{Decode, Encode, Error, Input, MaxEncodedLen};
 use scale_info::TypeInfo;
 
-#[derive(Debug, Eq, PartialEq, Clone, Encode, Decode, TypeInfo)]
+#[derive(Debug, Eq, PartialEq, Clone, Encode, Decode, TypeInfo, MaxEncodedLen)]
 pub enum MessageMock {
 	First,
 	Second,

libs/mocks/src/liquidity_pools_gateway_routers.rs

@@ -28,7 +28,9 @@ pub mod pallet {
 			register_call!(move |()| f());
 		}
 
-		pub fn mock_send(f: impl Fn(T::AccountId, MessageMock) -> DispatchResult + 'static) {
+		pub fn mock_send(
+			f: impl Fn(T::AccountId, MessageMock) -> DispatchResultWithPostInfo + 'static,
+		) {
 			register_call!(move |(sender, message)| f(sender, message));
 		}
 	}
@@ -41,7 +43,7 @@ pub mod pallet {
 			execute_call!(())
 		}
 
-		fn send(sender: Self::Sender, message: MessageMock) -> DispatchResult {
+		fn send(sender: Self::Sender, message: MessageMock) -> DispatchResultWithPostInfo {
 			execute_call!((sender, message))
 		}
 	}
@@ -68,7 +70,10 @@ impl<T: pallet::Config> RouterMock<T> {
 		pallet::Pallet::<T>::mock_init(f)
 	}
 
-	pub fn mock_send(&self, f: impl Fn(T::AccountId, MessageMock) -> DispatchResult + 'static) {
+	pub fn mock_send(
+		&self,
+		f: impl Fn(T::AccountId, MessageMock) -> DispatchResultWithPostInfo + 'static,
+	) {
 		pallet::Pallet::<T>::mock_send(f)
 	}
 }
@@ -83,7 +88,7 @@ impl<T: pallet::Config> Router for RouterMock<T> {
 		pallet::Pallet::<T>::init()
 	}
 
-	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResult {
+	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResultWithPostInfo {
 		pallet::Pallet::<T>::send(sender, message)
 	}
 }
@@ -105,5 +110,5 @@ trait MockedRouter {
 	fn init() -> DispatchResult;
 
 	/// Send the message to the router's destination.
-	fn send(sender: Self::Sender, message: Self::Message) -> DispatchResult;
+	fn send(sender: Self::Sender, message: Self::Message) -> DispatchResultWithPostInfo;
 }

libs/traits/src/liquidity_pools.rs

@@ -11,7 +11,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-use frame_support::dispatch::DispatchResult;
+use frame_support::dispatch::{DispatchResult, DispatchResultWithPostInfo};
 use parity_scale_codec::Input;
 use sp_std::vec::Vec;
 
@@ -34,7 +34,7 @@ pub trait Router {
 	fn init(&self) -> DispatchResult;
 
 	/// Send the message to the router's destination.
-	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResult;
+	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResultWithPostInfo;
 }
 
 /// The trait required for processing outbound messages.

pallets/liquidity-pools-gateway/routers/src/lib.rs

@@ -29,7 +29,9 @@ pub const GAS_TO_WEIGHT_MULTIPLIER: u64 = 25_000;
 
 use cfg_traits::{ethereum::EthereumTransactor, liquidity_pools::Router};
 use frame_support::{
-	dispatch::{DispatchError, DispatchResult, Weight},
+	dispatch::{
+		DispatchError, DispatchResult, DispatchResultWithPostInfo, PostDispatchInfo, Weight,
+	},
 	ensure,
 	traits::OriginTrait,
 };
@@ -113,7 +115,7 @@ where
 		}
 	}
 
-	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResult {
+	fn send(&self, sender: Self::Sender, message: Self::Message) -> DispatchResultWithPostInfo {
 		match self {
 			DomainRouter::EthereumXCM(r) => r.do_send(sender, message),
 			DomainRouter::AxelarEVM(r) => r.do_send(sender, message),
@@ -159,12 +161,9 @@ where
 	/// pallet, this EVM address will be converted back into a substrate account
 	/// which will be charged for the transaction. This converted substrate
 	/// account is not the same as the original account.
-	pub fn do_send(&self, sender: T::AccountId, msg: Vec<u8>) -> DispatchResult {
+	pub fn do_send(&self, sender: T::AccountId, msg: Vec<u8>) -> DispatchResultWithPostInfo {
 		let sender_evm_address = H160::from_slice(&sender.as_ref()[0..20]);
 
-		// TODO(cdamian): This returns a `DispatchResultWithPostInfo`. Should we
-		// propagate that to another layer that will eventually charge for the
-		// weight in the PostDispatchInfo?
 		<pallet_ethereum_transaction::Pallet<T> as EthereumTransactor>::call(
 			sender_evm_address,
 			self.evm_domain.target_contract_address,
@@ -173,9 +172,6 @@ where
 			self.evm_domain.fee_values.gas_price,
 			self.evm_domain.fee_values.gas_limit,
 		)
-		.map_err(|e| e.error)?;
-
-		Ok(())
 	}
 }
 
@@ -231,7 +227,7 @@ where
 
 	/// Encodes the message to the required format and executes the
 	/// call via the XCM transactor pallet.
-	pub fn do_send(&self, sender: T::AccountId, msg: Vec<u8>) -> DispatchResult {
+	pub fn do_send(&self, sender: T::AccountId, msg: Vec<u8>) -> DispatchResultWithPostInfo {
 		let ethereum_xcm_call = get_encoded_ethereum_xcm_call::<T>(self.xcm_domain.clone(), msg)
 			.map_err(|_| DispatchError::Other("encoded ethereum xcm call retrieval"))?;
 
@@ -257,7 +253,10 @@ where
 			true,
 		)?;
 
-		Ok(())
+		Ok(PostDispatchInfo {
+			actual_weight: Some(self.xcm_domain.overall_weight),
+			pays_fee: Default::default(),
+		})
 	}
 }
 

pallets/liquidity-pools-gateway/routers/src/routers/axelar_evm.rs

@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 use cfg_traits::liquidity_pools::Codec;
 use ethabi::{Contract, Function, Param, ParamType, Token};
-use frame_support::dispatch::{DispatchError, DispatchResult};
+use frame_support::dispatch::{DispatchError, DispatchResult, DispatchResultWithPostInfo};
 use frame_system::pallet_prelude::OriginFor;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::{
@@ -61,7 +61,7 @@ where
 
 	/// Encodes the message to the required format,
 	/// then executes the EVM call using the generic EVM router.
-	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResult {
+	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResultWithPostInfo {
 		let eth_msg = get_axelar_encoded_msg(
 			msg.serialize(),
 			self.evm_chain.clone().into_inner(),

pallets/liquidity-pools-gateway/routers/src/routers/axelar_xcm.rs

@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 
 use cfg_traits::liquidity_pools::Codec;
-use frame_support::dispatch::DispatchResult;
+use frame_support::dispatch::{DispatchResult, DispatchResultWithPostInfo};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_core::{bounded::BoundedVec, ConstU32, H160};
@@ -53,7 +53,7 @@ where
 
 	/// Encodes the message to the required format,
 	/// then executes the EVM call using the generic XCM router.
-	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResult {
+	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResultWithPostInfo {
 		let contract_call = get_axelar_encoded_msg(
 			msg.serialize(),
 			self.axelar_target_chain.clone().into_inner(),

pallets/liquidity-pools-gateway/routers/src/routers/ethereum_xcm.rs

@@ -11,7 +11,10 @@
 // GNU General Public License for more details.
 use cfg_traits::liquidity_pools::Codec;
 use ethabi::{Bytes, Contract};
-use frame_support::{dispatch::DispatchResult, sp_runtime::DispatchError};
+use frame_support::{
+	dispatch::{DispatchResult, DispatchResultWithPostInfo},
+	sp_runtime::DispatchError,
+};
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData, vec, vec::Vec};
@@ -43,7 +46,7 @@ where
 
 	/// Encodes the message to the required format and executes the
 	/// call via the XCM router.
-	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResult {
+	pub fn do_send(&self, sender: AccountIdOf<T>, msg: MessageOf<T>) -> DispatchResultWithPostInfo {
 		let contract_call = get_encoded_contract_call(msg.serialize())
 			.map_err(|_| DispatchError::Other("encoded contract call retrieval"))?;
 

pallets/liquidity-pools-gateway/routers/src/tests.rs

@@ -169,7 +169,7 @@ mod evm_router {
 				let res = router.do_send(test_data.sender, test_data.msg);
 
 				assert_eq!(
-					res.err().unwrap(),
+					res.err().unwrap().error,
 					pallet_evm::Error::<Runtime>::BalanceLow.into()
 				);
 			});
@@ -483,7 +483,7 @@ mod axelar_evm {
 				let res = domain_router.send(test_data.sender, test_data.msg);
 
 				assert_eq!(
-					res.err().unwrap(),
+					res.err().unwrap().error,
 					pallet_evm::Error::<Runtime>::BalanceLow.into()
 				);
 			});