feat: unified trade events

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.25.1"
+version = "1.26.0"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -41,6 +41,7 @@ pallet-staking = { workspace = true }
 pallet-lbp = { workspace = true }
 pallet-xyk = { workspace = true }
 pallet-evm-accounts = { workspace = true }
+pallet-amm-support = { workspace = true }
 
 pallet-treasury = { workspace = true }
 pallet-democracy = { workspace = true }
@@ -217,6 +218,7 @@ std = [
     "pallet-dynamic-evm-fee/std",
     "precompile-utils/std",
     "pallet-transaction-pause/std",
+    "pallet-amm-support/std",
 ]
 
 # we don't include integration tests when benchmarking feature is enabled

integration-tests/src/dca.rs

@@ -37,7 +37,7 @@ mod omnipool {
 	use super::*;
 	use frame_support::assert_ok;
 	use hydradx_runtime::{DCA, XYK};
-	use hydradx_traits::router::{PoolType, Trade};
+	use hydradx_traits::router::{ExecutionType, PoolType, Trade};
 	use hydradx_traits::AssetKind;
 	use sp_runtime::{FixedU128, TransactionOutcome};
 
@@ -201,6 +201,98 @@ mod omnipool {
 		});
 	}
 
+	#[test]
+	fn buy_schedule_execution_should_emit_swapped_events() {
+		TestNet::reset();
+		Hydra::execute_with(|| {
+			//Arrange
+			init_omnipool_with_oracle_for_block_10();
+
+			let dca_budget = 1000 * UNITS;
+			let amount_out = 100 * UNITS;
+			let schedule1 = schedule_fake_with_buy_order(PoolType::Omnipool, HDX, DAI, amount_out, dca_budget);
+			create_schedule(ALICE, schedule1);
+
+			//Act
+			run_to_block(11, 12);
+
+			//Assert
+			let swapped_events = get_last_swapped_events();
+			let last_two_swapped_events = &get_last_swapped_events()[swapped_events.len() - 2..];
+			pretty_assertions::assert_eq!(
+				last_two_swapped_events,
+				vec![
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactOut,
+						inputs: vec![(AssetType::Fungible(HDX), 140421094367051)],
+						outputs: vec![(AssetType::Fungible(LRNA), 70210545436437)],
+						fees: vec![Fee::new(LRNA, 35105272718, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(0),
+							ExecutionType::Router(1),
+							ExecutionType::Omnipool(2)
+						]
+					}),
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactOut,
+						inputs: vec![(AssetType::Fungible(LRNA), 70175440163719)],
+						outputs: vec![(AssetType::Fungible(DAI), amount_out)],
+						fees: vec![Fee::new(DAI, 250626566417, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(0),
+							ExecutionType::Router(1),
+							ExecutionType::Omnipool(2)
+						],
+					})
+				]
+			);
+
+			run_to_block(13, 17);
+
+			let swapped_events = get_last_swapped_events();
+			let last_two_swapped_events = &get_last_swapped_events()[swapped_events.len() - 2..];
+			pretty_assertions::assert_eq!(
+				last_two_swapped_events,
+				vec![
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactOut,
+						inputs: vec![(AssetType::Fungible(HDX), 140421107716515)],
+						outputs: vec![(AssetType::Fungible(LRNA), 70210548448729)],
+						fees: vec![Fee::new(LRNA, 35105274224, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(3),
+							ExecutionType::Router(4),
+							ExecutionType::Omnipool(5)
+						],
+					}),
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactOut,
+						inputs: vec![(AssetType::Fungible(LRNA), 70175443174505)],
+						outputs: vec![(AssetType::Fungible(DAI), amount_out)],
+						fees: vec![Fee::new(DAI, 250626566417, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(3),
+							ExecutionType::Router(4),
+							ExecutionType::Omnipool(5)
+						],
+					})
+				]
+			);
+		});
+	}
+
 	#[test]
 	fn buy_schedule_execution_should_work_without_route() {
 		TestNet::reset();
@@ -588,6 +680,105 @@ mod omnipool {
 		});
 	}
 
+	#[test]
+	fn sell_schedule_execution_should_emit_swapped_event() {
+		TestNet::reset();
+		Hydra::execute_with(|| {
+			//Arrange
+			init_omnipool_with_oracle_for_block_10();
+			let alice_init_hdx_balance = 5000 * UNITS;
+			assert_ok!(Balances::force_set_balance(
+				RuntimeOrigin::root(),
+				ALICE.into(),
+				alice_init_hdx_balance,
+			));
+
+			let dca_budget = 1100 * UNITS;
+			let amount_to_sell = 100 * UNITS;
+			let schedule1 =
+				schedule_fake_with_sell_order(ALICE, PoolType::Omnipool, dca_budget, HDX, DAI, amount_to_sell);
+			create_schedule(ALICE, schedule1);
+
+			//Act
+			run_to_block(11, 12);
+
+			//Assert
+			let swapped_events = get_last_swapped_events();
+			let last_two_swapped_events = &get_last_swapped_events()[swapped_events.len() - 2..];
+			pretty_assertions::assert_eq!(
+				last_two_swapped_events,
+				vec![
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactIn,
+						inputs: vec![(AssetType::Fungible(HDX), amount_to_sell)],
+						outputs: vec![(AssetType::Fungible(LRNA), 49999999159957)],
+						fees: vec![Fee::new(LRNA, 24999999579, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(0),
+							ExecutionType::Router(1),
+							ExecutionType::Omnipool(2)
+						],
+					}),
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactIn,
+						inputs: vec![(AssetType::Fungible(LRNA), 49974999160378)],
+						outputs: vec![(AssetType::Fungible(DAI), 71214372624126)],
+						fees: vec![Fee::new(DAI, 178482136903, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(0),
+							ExecutionType::Router(1),
+							ExecutionType::Omnipool(2)
+						],
+					})
+				]
+			);
+
+			run_to_block(13, 17);
+
+			let swapped_events = get_last_swapped_events();
+			let last_two_swapped_events = &get_last_swapped_events()[swapped_events.len() - 2..];
+			pretty_assertions::assert_eq!(
+				last_two_swapped_events,
+				vec![
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactIn,
+						inputs: vec![(AssetType::Fungible(HDX), amount_to_sell)],
+						outputs: vec![(AssetType::Fungible(LRNA), 49999997360044)],
+						fees: vec![Fee::new(LRNA, 24999998680, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(3),
+							ExecutionType::Router(4),
+							ExecutionType::Omnipool(5)
+						],
+					}),
+					RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped {
+						swapper: ALICE.into(),
+						filler: Omnipool::protocol_account(),
+						filler_type: pallet_amm_support::Filler::Omnipool,
+						operation: pallet_amm_support::TradeOperation::ExactIn,
+						inputs: vec![(AssetType::Fungible(LRNA), 49974997361364)],
+						outputs: vec![(AssetType::Fungible(DAI), 71214367826179)],
+						fees: vec![Fee::new(DAI, 178482124878, Omnipool::protocol_account()),],
+						operation_id: vec![
+							ExecutionType::DCA(3),
+							ExecutionType::Router(4),
+							ExecutionType::Omnipool(5)
+						],
+					})
+				]
+			);
+		});
+	}
+
 	#[test]
 	fn sell_schedule_be_retried_when_route_is_invalid() {
 		TestNet::reset();
@@ -4032,7 +4223,6 @@ pub fn run_to_block(from: BlockNumber, to: BlockNumber) {
 	for b in from..=to {
 		do_trade_to_populate_oracle(DAI, HDX, UNITS);
 		set_relaychain_block_number(b);
-		do_trade_to_populate_oracle(DAI, HDX, UNITS);
 	}
 }
 

integration-tests/src/lib.rs

@@ -29,6 +29,7 @@ mod referrals;
 mod router;
 mod staking;
 mod transact_call_filter;
+mod utility;
 pub mod utils;
 mod vesting;
 mod xyk;

integration-tests/src/polkadot_test_net.rs

@@ -15,8 +15,12 @@ use cumulus_primitives_core::ParaId;
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 pub use frame_system::RawOrigin;
 use hex_literal::hex;
-use hydradx_runtime::{evm::WETH_ASSET_LOCATION, Referrals, RuntimeOrigin};
-pub use hydradx_traits::{evm::InspectEvmAccounts, registry::Mutate};
+use hydradx_runtime::{evm::WETH_ASSET_LOCATION, Referrals, RuntimeEvent, RuntimeOrigin};
+pub use hydradx_traits::{
+	evm::InspectEvmAccounts,
+	registry::Mutate,
+	router::{AssetType, ExecutionType, Fee, Filler, TradeOperation},
+};
 use pallet_referrals::{FeeDistribution, Level};
 pub use polkadot_primitives::v7::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
 use polkadot_runtime_parachains::configuration::HostConfiguration;
@@ -893,3 +897,17 @@ pub fn assert_xcm_message_processing_passed() {
 		hydradx_runtime::RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. })
 	)));
 }
+
+pub fn get_last_swapped_events() -> Vec<RuntimeEvent> {
+	let last_events: Vec<RuntimeEvent> = last_hydra_events(1000);
+	let mut swapped_events = vec![];
+
+	for event in last_events {
+		let e = event.clone();
+		if let RuntimeEvent::AmmSupport(pallet_amm_support::Event::Swapped { .. }) = e {
+			swapped_events.push(e);
+		}
+	}
+
+	swapped_events
+}