Skip to content

fix(stableswap)!: fix peg ordering by accepting and co-sorting asset-peg pairs #1424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khuzama98 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix(stableswap)!: fix peg ordering by accepting and co-sorting asset-peg pairs #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
97d701b
test(stableswap): upgrade peg ordering tests to 3-asset pools with ge…
khuzama98 Apr 16, 2026
70e10ef
fix(stableswap): ensure assets and peg sources are co-sorted in pool …
khuzama98 Apr 16, 2026
f69aa38
fix(stableswap)!: fix peg ordering by accepting and co-sorting asset-…
khuzama98 Apr 17, 2026
01f34d5
test(stableswap): add regression test for peg co-sorting and bump the…
khuzama98 Apr 17, 2026
d9cb0c9
docs(stableswap): update documentation for asset-peg pairing and sorting
khuzama98 Apr 17, 2026
033c769
Update pallets/stableswap/src/tests/peg_ordering.rs
khuzama98 Apr 17, 2026
2657587
format(stableswap): tests and hsm benchmarks formatted
khuzama98 Apr 17, 2026
9697cd9
refactor(stableswap): optimize test assertions and benchmark iterators
khuzama98 Apr 17, 2026
c55e0c2
Update pallets weights [ignore benchmarks]
khuzama98 Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.78.0"
version = "1.78.1"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
79 changes: 43 additions & 36 deletions integration-tests/src/hsm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
use orml_traits::MultiCurrency;
use pallet_asset_registry::AssetType;
use pallet_ema_oracle::BIFROST_SOURCE;
use pallet_stableswap::types::BoundedPegSources;
use pallet_stableswap::types::PegSource;
use pretty_assertions::assert_eq;
use primitives::EvmAddress;
Expand Down Expand Up @@ -638,18 +637,19 @@ fn buy_hollar_with_yield_bearing_token_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -747,18 +747,19 @@ fn sell_yield_bearing_token_to_get_hollar_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -871,18 +872,19 @@ fn sell_collateral_to_get_hollar_via_router_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -1003,18 +1005,19 @@ fn sell_collateral_to_get_hollar_via_router_should_work_when_collateral_is_acqui
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -1342,18 +1345,19 @@ fn sell_hollar_to_get_yield_bearing_token_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -1458,18 +1462,19 @@ fn buy_yield_bearing_token_with_hollar_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];
assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down Expand Up @@ -1574,18 +1579,20 @@ fn buy_collateral_with_hollar_via_router_should_work() {
let alice_hollar_balance = balance_of(alice_evm_address);
assert_eq!(alice_hollar_balance, U256::from(1_000_000_000_000_000_000_000u128));

let assets = vec![HOLLAR, COLLATERAL];
let pegs = vec![
PegSource::Value((1, 1)), // aDOT peg
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)), // vDOT peg
let assets = vec![
(HOLLAR, PegSource::Value((1, 1))),
(
COLLATERAL,
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, HOLLAR)),
),
];

assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
POOL_ID,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down
10 changes: 4 additions & 6 deletions integration-tests/src/omnipool_liquidity_mining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ use hydradx_traits::Create;
use orml_traits::MultiCurrency;
use pallet_asset_registry::AssetType;
use pallet_ema_oracle::BIFROST_SOURCE;
use pallet_stableswap::types::BoundedPegSources;
use pallet_stableswap::types::PegSource;
use pallet_stableswap::MAX_ASSETS_IN_POOL;
use pretty_assertions::assert_eq;
Expand Down Expand Up @@ -3400,18 +3399,17 @@ fn price_adjustment_adapter_should_use_routed_oracle() {
FixedU128::from_rational(103158291366950047, 4566210555614178),
)
.execute(|| {
let assets = vec![VDOT, ADOT];
let pegs = vec![
PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, DOT)), // vDOT peg
PegSource::Value((1, 1)), // aDOT peg
let assets = vec![
(VDOT, PegSource::Oracle((BIFROST_SOURCE, OraclePeriod::LastBlock, DOT))),
(ADOT, PegSource::Value((1, 1))),
];

assert_ok!(Stableswap::create_pool_with_pegs(
RuntimeOrigin::root(),
GIGADOT,
BoundedVec::truncate_from(assets),
100,
Permill::from_percent(0),
BoundedPegSources::truncate_from(pegs),
Perbill::from_percent(100),
));

Expand Down
Loading
Loading