Direct Deposit/Withdrawal

pallets/liquidity-mining/src/mock.rs

@@ -145,6 +145,7 @@ impl ocex::Config for Test {
 	type CrowdSourceLiqudityMining = LiqudityMining;
 	type OBWithdrawalLimit = OBWithdrawalLimit;
 	type WeightInfo = ocex::weights::WeightInfo<Test>;
+	type CrossChainGadget = ();
 }
 
 parameter_types! {

pallets/ocex/Cargo.toml

@@ -44,6 +44,7 @@ sp-io = { workspace = true }
 pallet-lmp = { path = "../liquidity-mining", default-features = false }
 lazy_static = "1.4.0"
 sequential-test = "0.2.4"
+hex = "0.4.3"
 
 [features]
 default = ["std"]

pallets/ocex/src/benchmarking.rs

@@ -222,14 +222,9 @@ benchmarks! {
 		let proxy = account::<T::AccountId>("proxy", x, 0);
 		Ocex::<T>::register_main_account(RawOrigin::Signed(user.clone()).into(), proxy)?;
 		let call = Call::<T>::deposit { asset, amount };
+		let id = H160::zero();
 	}: { call.dispatch_bypass_filter(RawOrigin::Signed(user.clone()).into())? }
-	verify {
-		assert_last_event::<T>(Event::DepositSuccessful {
-			user,
-			asset,
-			amount
-		}.into());
-	}
+
 
 	remove_proxy_account {
 		let x in 1 .. 255; // should not overflow u8
@@ -285,12 +280,13 @@ benchmarks! {
 		let mut vec_withdrawals = Vec::with_capacity(1);
 		let fees = Decimal::new(100, 5);
 		vec_withdrawals.push(Withdrawal {
+			id: Default::default(),
 			amount: Decimal::new(x.into(), 0),
 			stid:0,
 			asset,
 			main_account: main.clone(),
 			fees,
-		});
+		destination: None,});
 		let mut wm = sp_std::collections::btree_map::BTreeMap::new();
 		wm.insert(main.clone(), vec_withdrawals.clone());
 		<Withdrawals<T>>::insert(x as u64, wm);
@@ -580,11 +576,13 @@ fn get_dummy_snapshot<T: Config>() -> SnapshotSummary<T::AccountId> {
 	);
 	for _ in 0..50 {
 		withdrawals.push(Withdrawal {
+			id: Default::default(),
 			main_account: T::AccountId::decode(&mut &[0u8; 32][..]).unwrap(),
 			amount: Decimal::one(),
 			asset: AssetId::Polkadex,
 			fees: Decimal::one(),
 			stid: 1,
+			destination: None,
 		});
 	}
 	SnapshotSummary {

pallets/ocex/src/integration_tests.rs

@@ -43,7 +43,7 @@ use rust_decimal::Decimal;
 use sequential_test::sequential;
 use sp_core::crypto::AccountId32;
 use sp_core::sr25519::Signature;
-use sp_core::{Pair, H256};
+use sp_core::{Pair, H160, H256};
 use sp_runtime::offchain::storage::StorageValueRef;
 use std::collections::BTreeMap;
 
@@ -321,10 +321,18 @@ fn push_trade_user_actions(stid: u64, snapshot_id: u64, block_no: u64) {
 fn get_block_import(block_no: u64) -> u64 {
 	let block_no = block_no;
 	let (maker_account, taker_account) = get_maker_and_taker_account();
-	let maker_ingress_message =
-		IngressMessages::Deposit(maker_account, AssetId::Asset(1), Decimal::from(100));
-	let taker_ingress_message =
-		IngressMessages::Deposit(taker_account, AssetId::Polkadex, Decimal::from(100));
+	let maker_ingress_message = IngressMessages::Deposit(
+		H160::zero(),
+		maker_account,
+		AssetId::Asset(1),
+		Decimal::from(100),
+	);
+	let taker_ingress_message = IngressMessages::Deposit(
+		H160::zero(),
+		taker_account,
+		AssetId::Polkadex,
+		Decimal::from(100),
+	);
 	<IngressMessagesStorage<Test>>::insert(
 		block_no,
 		vec![maker_ingress_message, taker_ingress_message],

pallets/ocex/src/lib.rs

@@ -55,10 +55,12 @@ use frame_support::traits::fungible::Inspect as InspectNative;
 use frame_system::pallet_prelude::BlockNumberFor;
 use orderbook_primitives::lmp::LMPMarketConfig;
 use orderbook_primitives::ocex::TradingPairConfig;
+use orderbook_primitives::traits::OrderbookOperations;
 use orderbook_primitives::{
 	types::{AccountAsset, TradingPair},
 	SnapshotSummary, ValidatorSet, GENESIS_AUTHORITY_SET_ID,
 };
+use sp_core::H160;
 use sp_std::vec::Vec;
 
 #[cfg(test)]
@@ -144,6 +146,7 @@ pub trait OcexWeightInfo {
 #[frame_support::pallet]
 pub mod pallet {
 	use orderbook_primitives::traits::LiquidityMiningCrowdSourcePallet;
+	use polkadex_primitives::withdrawal::WithdrawalDestination;
 	use sp_std::collections::btree_map::BTreeMap;
 	// Import various types used to declare pallet in scope.
 	use super::*;
@@ -168,6 +171,7 @@ pub mod pallet {
 	};
 	use parity_scale_codec::Compact;
 	use polkadex_primitives::auction::AuctionInfo;
+	use polkadex_primitives::traits::CrossChainWithdraw;
 	use polkadex_primitives::{assets::AssetId, withdrawal::Withdrawal, ProxyLimit, UNIT_BALANCE};
 	use rust_decimal::{prelude::ToPrimitive, Decimal};
 	use sp_application_crypto::RuntimeAppPublic;
@@ -278,6 +282,9 @@ pub mod pallet {
 			<Self as frame_system::Config>::AccountId,
 		>;
 
+		/// CrossChain Withdrawal
+		type CrossChainGadget: CrossChainWithdraw<Self::AccountId>;
+
 		/// Type representing the weight of this pallet
 		type WeightInfo: OcexWeightInfo;
 	}
@@ -729,7 +736,7 @@ pub mod pallet {
 			#[pallet::compact] amount: BalanceOf<T>,
 		) -> DispatchResult {
 			let user = ensure_signed(origin)?;
-			Self::do_deposit(user, asset, amount)?;
+			Self::do_deposit(Self::new_random_id(None), user, asset, amount)?;
 			Ok(())
 		}
 
@@ -1082,6 +1089,7 @@ pub mod pallet {
 			quote: AssetId,
 		},
 		DepositSuccessful {
+			id: H160,
 			user: T::AccountId,
 			asset: AssetId,
 			amount: BalanceOf<T>,
@@ -1114,7 +1122,7 @@ pub mod pallet {
 		/// AllowlistedTokenRemoved
 		AllowlistedTokenRemoved(AssetId),
 		/// Withdrawal ready to claim
-		WithdrawalReady(u64, Withdrawal<T::AccountId>),
+		WithdrawalReady(u64, Box<Withdrawal<T::AccountId>>),
 		/// Exchange state has been updated
 		ExchangeStateUpdated(bool),
 		/// DisputePeriod has been updated
@@ -1313,6 +1321,16 @@ pub mod pallet {
 		StorageValue<_, AuctionInfo<T::AccountId, BalanceOf<T>>, OptionQuery>;
 
 	impl<T: crate::pallet::Config> crate::pallet::Pallet<T> {
+		pub fn new_random_id(prefix: Option<[u8; 4]>) -> H160 {
+			let mut entropy: [u8; 20] = [0u8; 20];
+			if let Some(prefix) = prefix {
+				entropy[0..4].copy_from_slice(&prefix);
+			}
+			let current_blk = frame_system::Pallet::<T>::current_block_number();
+			entropy[4..].copy_from_slice(&sp_io::hashing::blake2_128(&((current_blk).encode())));
+			H160::from(entropy)
+		}
+
 		pub fn do_withdraw(
 			snapshot_id: u64,
 			mut withdrawal_vector: Vec<Withdrawal<T::AccountId>>,
@@ -1323,14 +1341,14 @@ pub mod pallet {
 				// Perform pop operation to ensure we do not leave any withdrawal left
 				// for a double spend
 				if let Some(withdrawal) = withdrawal_vector.pop() {
-					if Self::on_idle_withdrawal_processor(withdrawal.clone()) {
+					if Self::on_idle_withdrawal_processor(withdrawal.clone()).is_ok() {
 						processed_withdrawals.push(withdrawal.to_owned());
 					} else {
 						// Storing the failed withdrawals back into the storage item
 						failed_withdrawals.push(withdrawal.to_owned());
 						Self::deposit_event(Event::WithdrawalReady(
 							snapshot_id,
-							withdrawal.to_owned(),
+							Box::from(withdrawal.to_owned()),
 						));
 					}
 				}
@@ -1700,6 +1718,7 @@ pub mod pallet {
 		}
 
 		pub fn do_deposit(
+			id: H160,
 			user: T::AccountId,
 			asset: AssetId,
 			amount: BalanceOf<T>,
@@ -1728,12 +1747,13 @@ pub mod pallet {
 			let current_blk = frame_system::Pallet::<T>::current_block_number();
 			<IngressMessages<T>>::mutate(current_blk, |ingress_messages| {
 				ingress_messages.push(orderbook_primitives::ingress::IngressMessages::Deposit(
+					id,
 					user.clone(),
 					asset,
 					converted_amount,
 				));
 			});
-			Self::deposit_event(Event::DepositSuccessful { user, asset, amount });
+			Self::deposit_event(Event::DepositSuccessful { id, user, asset, amount });
 			Ok(())
 		}
 
@@ -1812,22 +1832,52 @@ pub mod pallet {
 
 		/// Performs actual transfer of assets from pallet account to target destination
 		/// Used to finalize withdrawals in extrinsic or on_idle
+		#[transactional]
 		fn on_idle_withdrawal_processor(
 			withdrawal: Withdrawal<<T as frame_system::Config>::AccountId>,
-		) -> bool {
-			if let Some(converted_withdrawal) =
-				withdrawal.amount.saturating_mul(Decimal::from(UNIT_BALANCE)).to_u128()
-			{
-				Self::transfer_asset(
-					&Self::get_pallet_account(),
-					&withdrawal.main_account,
-					converted_withdrawal.saturated_into(),
-					withdrawal.asset,
-				)
-				.is_ok()
-			} else {
-				false
+		) -> DispatchResult {
+			let converted_withdrawal = withdrawal
+				.amount
+				.saturating_mul(Decimal::from(UNIT_BALANCE))
+				.to_u128()
+				.ok_or(Error::<T>::FailedToConvertDecimaltoBalance)?;
+
+			Self::transfer_asset(
+				&Self::get_pallet_account(),
+				&withdrawal.main_account,
+				converted_withdrawal.saturated_into(),
+				withdrawal.asset,
+			)?;
+
+			// on_idle_withdrawal_processor is called in a transacitonal manner so it is okay.
+			if let Some(destination) = withdrawal.destination {
+				match destination {
+					WithdrawalDestination::Polkadot(multi_location, None) => {
+						T::CrossChainGadget::parachain_withdraw(
+							withdrawal.main_account,
+							withdrawal.asset,
+							converted_withdrawal,
+							multi_location,
+							None,
+							None,
+							withdrawal.id,
+						)?
+					},
+					WithdrawalDestination::Polkadot(
+						multi_location,
+						Some((fee_asset_id, fee_amount)),
+					) => T::CrossChainGadget::parachain_withdraw(
+						withdrawal.main_account,
+						withdrawal.asset,
+						converted_withdrawal,
+						multi_location,
+						Some(fee_asset_id),
+						Some(fee_amount),
+						withdrawal.id,
+					)?,
+				}
 			}
+			Ok(())
 		}
 
 		/// Collects onchain registered main and proxy accounts
@@ -2395,3 +2445,9 @@ impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
 
 	fn on_disabled(_i: u32) {}
 }
+
+impl<T: Config> OrderbookOperations<T::AccountId> for Pallet<T> {
+	fn deposit(id: H160, main: T::AccountId, asset: AssetId, amount: u128) -> DispatchResult {
+		Self::do_deposit(id, main, asset, amount.saturated_into())
+	}
+}

pallets/ocex/src/lmp.rs

@@ -482,12 +482,22 @@ impl<T: Config> LiquidityMining<T::AccountId, BalanceOf<T>> for Pallet<T> {
 			.saturating_mul(unit)
 			.to_u128()
 			.ok_or(Error::<T>::FailedToConvertDecimaltoBalance)?;
-		Self::do_deposit(pool.clone(), market.base, base_amount_in_u128.saturated_into())?;
+		Self::do_deposit(
+			Self::new_random_id(None),
+			pool.clone(),
+			market.base,
+			base_amount_in_u128.saturated_into(),
+		)?;
 		let quote_amount_in_u128 = quote_amount
 			.saturating_mul(unit)
 			.to_u128()
 			.ok_or(Error::<T>::FailedToConvertDecimaltoBalance)?;
-		Self::do_deposit(pool.clone(), market.quote, quote_amount_in_u128.saturated_into())?;
+		Self::do_deposit(
+			Self::new_random_id(None),
+			pool.clone(),
+			market.quote,
+			quote_amount_in_u128.saturated_into(),
+		)?;
 		let current_blk = frame_system::Pallet::<T>::current_block_number();
 		<IngressMessages<T>>::mutate(current_blk, |messages| {
 			messages.push(orderbook_primitives::ingress::IngressMessages::AddLiquidity(

pallets/ocex/src/mock.rs

@@ -149,6 +149,7 @@ impl Config for Test {
 	type CrowdSourceLiqudityMining = LiqudityMining;
 	type WeightInfo = crate::weights::WeightInfo<Test>;
 	type OBWithdrawalLimit = OBWithdrawalLimit;
+	type CrossChainGadget = ();
 }
 
 parameter_types! {

pallets/ocex/src/rpc.rs

@@ -127,8 +127,12 @@ impl<T: Config> Pallet<T> {
 				let ingress_msgs =
 					<IngressMessages<T>>::get(blk.saturated_into::<BlockNumberFor<T>>());
 				for msg in ingress_msgs {
-					if let orderbook_primitives::ingress::IngressMessages::Deposit(_, asset, amt) =
-						msg
+					if let orderbook_primitives::ingress::IngressMessages::Deposit(
+						_,
+						_,
+						asset,
+						amt,
+					) = msg
 					{
 						onchain_inventory
 							.entry(asset)

pallets/ocex/src/tests.rs

@@ -1548,16 +1548,12 @@ fn test_deposit() {
 			9999999999999999999900
 		);
 		assert_eq!(<Test as Config>::NativeCurrency::free_balance(custodian_account.clone()), 100);
-		assert_last_event::<Test>(
-			crate::Event::DepositSuccessful {
-				user: account_id.clone(),
-				asset: AssetId::Polkadex,
-				amount: 100_u128,
-			}
-			.into(),
+		let event: IngressMessages<AccountId32> = IngressMessages::Deposit(
+			H160::from_slice(&hex::decode("000000009ea2d098b5f70192f96c06f38d3fbc97").unwrap()),
+			account_id,
+			AssetId::Polkadex,
+			Decimal::new(10, 11),
 		);
-		let event: IngressMessages<AccountId32> =
-			IngressMessages::Deposit(account_id, AssetId::Polkadex, Decimal::new(10, 11));
 		let blk = frame_system::Pallet::<Test>::current_block_number();
 		assert_eq!(OCEX::ingress_messages(blk)[2], event);
 	});
@@ -1998,11 +1994,13 @@ fn get_dummy_snapshot(
 	let mut withdrawals = vec![];
 	for _ in 0..withdrawals_len {
 		withdrawals.push(Withdrawal {
+			id: Default::default(),
 			main_account: main.clone(),
 			amount: Decimal::one(),
 			asset: AssetId::Polkadex,
 			fees: Default::default(),
 			stid: 0,
+			destination: None,
 		})
 	}
 

pallets/ocex/src/validator.rs

@@ -309,7 +309,7 @@ impl<T: Config> Pallet<T> {
 
 		for message in messages {
 			match message {
-				IngressMessages::Deposit(main, asset, amt) => add_balance(
+				IngressMessages::Deposit(_, main, asset, amt) => add_balance(
 					state,
 					&Decode::decode(&mut &main.encode()[..])
 						.map_err(|_| "account id decode error")?,