SLPx mint support commission id (#1261)

bifrost-finance · Jun 11, 2024 · 5b892b4 · 5b892b4
1 parent 08aa1c2
commit 5b892b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/pallets/slpx/src/benchmarking.rs b/pallets/slpx/src/benchmarking.rs
@@ -107,6 +107,7 @@ mod benchmarks {
 			KSM,
 			TargetChain::Astar(receiver),
 			BoundedVec::default(),
+			None,
 		);
 	}
 

diff --git a/pallets/slpx/src/lib.rs b/pallets/slpx/src/lib.rs
@@ -442,6 +442,7 @@ pub mod pallet {
 			currency_id: CurrencyIdOf<T>,
 			target_chain: TargetChain<AccountIdOf<T>>,
 			remark: BoundedVec<u8, ConstU32<32>>,
+			channel_id: Option<u32>,
 		) -> DispatchResultWithPostInfo {
 			let (source_chain_caller, derivative_account, bifrost_chain_caller) =
 				Self::ensure_singer_on_whitelist(origin.clone(), evm_caller, &target_chain)?;
@@ -456,6 +457,7 @@ pub mod pallet {
 				currency_id,
 				remark,
 				target_chain,
+				channel_id,
 			};
 
 			OrderQueue::<T>::mutate(|order_queue| -> DispatchResultWithPostInfo {
@@ -515,6 +517,7 @@ pub mod pallet {
 				bifrost_chain_caller,
 				derivative_account,
 				target_chain,
+				channel_id: None,
 			};
 
 			OrderQueue::<T>::mutate(|order_queue| -> DispatchResultWithPostInfo {
@@ -738,6 +741,7 @@ pub mod pallet {
 				currency_id,
 				remark,
 				target_chain,
+				channel_id: None,
 			};
 
 			OrderQueue::<T>::mutate(|order_queue| -> DispatchResultWithPostInfo {
@@ -1000,7 +1004,7 @@ impl<T: Config> Pallet<T> {
 					order.currency_id,
 					currency_amount,
 					order.remark.clone(),
-					None,
+					order.channel_id,
 				)
 				.map_err(|_| Error::<T>::ArgumentsError)?;
 				let vtoken_id = T::VtokenMintingInterface::vtoken_id(order.currency_id)

diff --git a/pallets/slpx/src/tests.rs b/pallets/slpx/src/tests.rs
@@ -354,7 +354,8 @@ fn test_add_order() {
 			source_chain_caller,
 			DOT,
 			TargetChain::Astar(source_chain_caller),
-			BoundedVec::default()
+			BoundedVec::default(),
+			None
 		));
 		assert_eq!(OrderQueue::<Test>::get().len(), 1usize);
 		assert_ok!(Slpx::redeem(
@@ -389,7 +390,8 @@ fn test_hook() {
 			source_chain_caller,
 			DOT,
 			TargetChain::Astar(source_chain_caller),
-			BoundedVec::default()
+			BoundedVec::default(),
+			None
 		));
 		assert_eq!(OrderQueue::<Test>::get().len(), 1usize);
 		<frame_system::Pallet<Test>>::set_block_number(2u32.into());

diff --git a/pallets/slpx/src/types.rs b/pallets/slpx/src/types.rs
@@ -130,4 +130,5 @@ pub struct Order<AccountId, CurrencyId, Balance, BlockNumber> {
 	pub order_type: OrderType,
 	pub remark: BoundedVec<u8, ConstU32<32>>,
 	pub target_chain: TargetChain<AccountId>,
+	pub channel_id: Option<u32>,
 }