Merge branch 'master' into feat/add-weight-comparison-task

Author: dmoka

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.84.0"
+version = "1.85.0"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

integration-tests/Cargo.toml

@@ -449,3 +449,87 @@ fn sequential_trades_accumulate_slip_within_block() {
 		no_slip_drop
 	);
 }
+
+#[test]
+fn buy_succeeds_when_slip_cap_is_binding() {
+	let buy_amount = 100 * UNITS;
+	let tight_cap = Permill::from_parts(1000); // 0.1%
+
+	TestNet::reset();
+	Hydra::execute_with(|| {
+		init_omnipool();
+		assert_ok!(Omnipool::set_slip_fee(
+			RuntimeOrigin::root(),
+			Some(SlipFeeConfig {
+				max_slip_fee: tight_cap
+			}),
+		));
+
+		let trader = AccountId::from(BOB);
+		assert_ok!(Currencies::update_balance(
+			RuntimeOrigin::root(),
+			trader.clone(),
+			DAI,
+			(10_000_000 * UNITS) as i128,
+		));
+
+		let dai_before = Currencies::free_balance(DAI, &trader);
+		let hdx_before = Currencies::free_balance(HDX, &trader);
+
+		assert_ok!(Omnipool::buy(
+			RuntimeOrigin::signed(trader.clone()),
+			HDX,
+			DAI,
+			buy_amount,
+			u128::MAX,
+		));
+
+		let hdx_received = Currencies::free_balance(HDX, &trader) - hdx_before;
+		assert_eq!(hdx_received, buy_amount);
+
+		let dai_spent = dai_before - Currencies::free_balance(DAI, &trader);
+		assert!(dai_spent > 0);
+	});
+}
+
+#[test]
+fn buy_with_lrna_succeeds_when_slip_cap_is_binding() {
+	let buy_amount = 100 * UNITS;
+	let tight_cap = Permill::from_parts(1000); // 0.1%
+
+	TestNet::reset();
+	Hydra::execute_with(|| {
+		init_omnipool();
+		assert_ok!(Omnipool::set_slip_fee(
+			RuntimeOrigin::root(),
+			Some(SlipFeeConfig {
+				max_slip_fee: tight_cap
+			}),
+		));
+
+		let trader = AccountId::from(BOB);
+		assert_ok!(Currencies::update_balance(
+			RuntimeOrigin::root(),
+			trader.clone(),
+			LRNA,
+			(1_000_000 * UNITS) as i128,
+		));
+
+		let lrna_before = Currencies::free_balance(LRNA, &trader);
+		let dai_before = Currencies::free_balance(DAI, &trader);
+
+		assert_ok!(Omnipool::buy(
+			RuntimeOrigin::signed(trader.clone()),
+			DAI,
+			LRNA,
+			buy_amount,
+			u128::MAX,
+		));
+
+		let dai_received = Currencies::free_balance(DAI, &trader) - dai_before;
+		assert_eq!(dai_received, buy_amount);
+
+		let lrna_spent = lrna_before - Currencies::free_balance(LRNA, &trader);
+		assert!(lrna_spent > 0);
+	});
+}

integration-tests/src/omnipool_slip_fees.rs

@@ -2508,7 +2508,7 @@ fn increase_stake_should_work_when_referendum_ongoing_and_votes_processed() {
 }
 
 #[test]
-fn voting_on_next_referenda_should_process_votes() {
+fn removing_vote_should_process_votes() {
 	TestNet::reset();
 	Hydra::execute_with(|| {
 		init_omnipool();
@@ -2569,27 +2569,41 @@ fn voting_on_next_referenda_should_process_votes() {
 
 		end_referendum();
 
+		let alice_position_id = pallet_staking::Pallet::<hydradx_runtime::Runtime>::get_user_position_id(&ALICE.into())
+			.unwrap()
+			.unwrap();
+
+		// Before remove_vote, the finished vote has not been settled: still recorded in Votes,
+		// no points awarded, and not present in VotesRewarded.
+		let position_before =
+			pallet_staking::Pallet::<hydradx_runtime::Runtime>::get_position(alice_position_id).unwrap();
+		assert!(
+			pallet_staking::Pallet::<hydradx_runtime::Runtime>::get_position_votes(alice_position_id)
+				.votes
+				.iter()
+				.any(|(idx, _)| *idx == r)
+		);
 		assert!(
 			pallet_staking::Pallet::<hydradx_runtime::Runtime>::processed_votes::<AccountId, u32>(ALICE.into(), r)
 				.is_none()
 		);
 
-		let r = begin_referendum();
-		assert_ok!(ConvictionVoting::vote(
+		assert_ok!(ConvictionVoting::remove_vote(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			r,
-			AccountVote::Standard {
-				vote: Vote {
-					aye: true,
-					conviction: Conviction::Locked6x,
-				},
-				balance: 1_000_000 * UNITS,
-			}
+			Some(ROOT_TRACK),
+			r
 		));
+
+		// After remove_vote, settlement has happened: vote removed from Votes and points awarded.
 		assert!(
-			pallet_staking::Pallet::<hydradx_runtime::Runtime>::processed_votes::<AccountId, u32>(ALICE.into(), 0)
-				.is_some()
+			!pallet_staking::Pallet::<hydradx_runtime::Runtime>::get_position_votes(alice_position_id)
+				.votes
+				.iter()
+				.any(|(idx, _)| *idx == r)
 		);
+		let position_after =
+			pallet_staking::Pallet::<hydradx_runtime::Runtime>::get_position(alice_position_id).unwrap();
+		assert!(position_after.get_action_points() > position_before.get_action_points());
 	});
 }
 

integration-tests/src/staking.rs

@@ -6,7 +6,7 @@ license = 'Apache-2.0'
 name = "hydra-dx-math"
 description = "A collection of utilities to make performing liquidity pool calculations more convenient."
 repository = 'https://github.com/galacticcouncil/hydradx-math'
-version = "13.2.1"
+version = "13.2.2"
 
 [dependencies]
 primitive-types = {  workspace = true }

math/Cargo.toml

@@ -218,7 +218,7 @@ pub fn calculate_buy_for_hub_asset_state_changes(
 
 	// Invert buy-side slip to find how much hub asset the user must provide
 	let slip_buy_amount = if let Some(slip) = slip {
-		let d_gross = invert_buy_side_slip(d_net, slip.asset_hub_reserve, slip.asset_delta)?;
+		let d_gross = invert_buy_side_slip(d_net, slip.asset_hub_reserve, slip.asset_delta, slip.max_slip_fee)?;
 		d_gross.checked_sub(d_net)?
 	} else {
 		0
@@ -277,14 +277,25 @@ pub fn calculate_buy_state_changes(
 
 	// Step 2: Invert buy-side slip to find D_gross from D_net
 	let d_gross = if let Some(slip) = slip {
-		invert_buy_side_slip(d_net, slip.asset_out_hub_reserve, slip.asset_out_delta)?
+		invert_buy_side_slip(
+			d_net,
+			slip.asset_out_hub_reserve,
+			slip.asset_out_delta,
+			slip.max_slip_fee,
+		)?
 	} else {
 		d_net
 	};
 
 	// Step 3: Invert sell-side fees (protocol_fee + sell slip) to find delta_hub_reserve_in
 	let delta_hub_reserve_in = if let Some(slip) = slip {
-		invert_sell_side_fees(d_gross, protocol_fee, slip.asset_in_hub_reserve, slip.asset_in_delta)?
+		invert_sell_side_fees(
+			d_gross,
+			protocol_fee,
+			slip.asset_in_hub_reserve,
+			slip.asset_in_delta,
+			slip.max_slip_fee,
+		)?
 	} else {
 		// No slip — original inversion
 		FixedU128::from_inner(d_net)