Skip to content

[codex] Move swap router empty-list guards before folds #16

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
caydyan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[codex] Move swap router empty-list guards before folds #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 28 additions & 22 deletions clarity/contracts/dlmm-swap-router-v-1-1.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,14 @@
(swaps (list 350 {pool-trait: <dlmm-pool-trait>, x-token-trait: <sip-010-trait>, y-token-trait: <sip-010-trait>, expected-bin-id: int, amount: uint, min-received: uint, x-for-y: bool}))
(max-unfavorable-bins uint)
)
(let (
(swap-result (try! (fold fold-swap-multi swaps (ok {results: (list ), unfavorable: u0}))))
)
(begin
(asserts! (> (len swaps) u0) ERR_EMPTY_SWAPS_LIST)
(asserts! (<= (get unfavorable swap-result) max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(ok swap-result)
(let (
(swap-result (try! (fold fold-swap-multi swaps (ok {results: (list ), unfavorable: u0}))))
)
(asserts! (<= (get unfavorable swap-result) max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(ok swap-result)
)
)
)

Expand All @@ -59,15 +61,17 @@
(x-token-trait <sip-010-trait>) (y-token-trait <sip-010-trait>)
(amount uint) (min-y-amount-total uint) (max-unfavorable-bins uint)
)
(let (
(swap-result (try! (fold fold-swap-x-for-y-same-multi swaps (ok {x-token-trait: x-token-trait, y-token-trait: y-token-trait, results: (list ), x-amount-for-swap: amount, y-amount: u0, unfavorable: u0}))))
(y-amount-total (get y-amount swap-result))
(unfavorable (get unfavorable swap-result))
)
(begin
(asserts! (> (len swaps) u0) ERR_EMPTY_SWAPS_LIST)
(asserts! (<= unfavorable max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(asserts! (>= y-amount-total min-y-amount-total) ERR_MINIMUM_Y_AMOUNT)
(ok {results: (get results swap-result), y-amount: y-amount-total, unfavorable: unfavorable})
(let (
(swap-result (try! (fold fold-swap-x-for-y-same-multi swaps (ok {x-token-trait: x-token-trait, y-token-trait: y-token-trait, results: (list ), x-amount-for-swap: amount, y-amount: u0, unfavorable: u0}))))
(y-amount-total (get y-amount swap-result))
(unfavorable (get unfavorable swap-result))
)
(asserts! (<= unfavorable max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(asserts! (>= y-amount-total min-y-amount-total) ERR_MINIMUM_Y_AMOUNT)
(ok {results: (get results swap-result), y-amount: y-amount-total, unfavorable: unfavorable})
)
)
)

Expand All @@ -77,15 +81,17 @@
(x-token-trait <sip-010-trait>) (y-token-trait <sip-010-trait>)
(amount uint) (min-x-amount-total uint) (max-unfavorable-bins uint)
)
(let (
(swap-result (try! (fold fold-swap-y-for-x-same-multi swaps (ok {x-token-trait: x-token-trait, y-token-trait: y-token-trait, results: (list ), y-amount-for-swap: amount, x-amount: u0, unfavorable: u0}))))
(x-amount-total (get x-amount swap-result))
(unfavorable (get unfavorable swap-result))
)
(begin
(asserts! (> (len swaps) u0) ERR_EMPTY_SWAPS_LIST)
(asserts! (<= unfavorable max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(asserts! (>= x-amount-total min-x-amount-total) ERR_MINIMUM_X_AMOUNT)
(ok {results: (get results swap-result), x-amount: x-amount-total, unfavorable: unfavorable})
(let (
(swap-result (try! (fold fold-swap-y-for-x-same-multi swaps (ok {x-token-trait: x-token-trait, y-token-trait: y-token-trait, results: (list ), y-amount-for-swap: amount, x-amount: u0, unfavorable: u0}))))
(x-amount-total (get x-amount swap-result))
(unfavorable (get unfavorable swap-result))
)
(asserts! (<= unfavorable max-unfavorable-bins) ERR_BIN_SLIPPAGE)
(asserts! (>= x-amount-total min-x-amount-total) ERR_MINIMUM_X_AMOUNT)
(ok {results: (get results swap-result), x-amount: x-amount-total, unfavorable: unfavorable})
)
)
)

Expand Down Expand Up @@ -289,4 +295,4 @@
;; Get absolute value of a signed int as uint
(define-private (abs-int (value int))
(to-uint (if (>= value 0) value (- value)))
)
)
36 changes: 32 additions & 4 deletions clarity/tests/routers/swap-router.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ describe('DLMM Swap Helper Functions', () => {
});

it('should revert on empty swap list', async () => {
// test will fail
const swaps: any[] = [];
const maxUnfavorableBins = 5n;

Expand All @@ -270,8 +269,37 @@ describe('DLMM Swap Helper Functions', () => {
maxUnfavorableBins
), alice);

// will be changed with specific error code once set
expect(cvToValue(response.result)).toBeGreaterThan(0n);
expect(cvToValue(response.result)).toBe(errors.dlmmSwapRouter.ERR_EMPTY_SWAPS_LIST);
});

it('should revert on empty X-for-Y same-multi swap list', async () => {
const swaps: any[] = [];

const response = txErr(dlmmSwapRouter.swapXForYSameMulti(
swaps,
mockSbtcToken.identifier,
mockUsdcToken.identifier,
1000000n,
1n,
5n
), alice);

expect(cvToValue(response.result)).toBe(errors.dlmmSwapRouter.ERR_EMPTY_SWAPS_LIST);
});

it('should revert on empty Y-for-X same-multi swap list', async () => {
const swaps: any[] = [];

const response = txErr(dlmmSwapRouter.swapYForXSameMulti(
swaps,
mockSbtcToken.identifier,
mockUsdcToken.identifier,
50000000n,
1n,
5n
), alice);

expect(cvToValue(response.result)).toBe(errors.dlmmSwapRouter.ERR_EMPTY_SWAPS_LIST);
});

it('should handle swaps with zero amounts', async () => {
Expand Down Expand Up @@ -544,4 +572,4 @@ describe('DLMM Swap Helper Functions', () => {
expect(cvToValue(response.result)).toBe(errors.dlmmCore.ERR_INVALID_Y_TOKEN);
});
});
});
});