Skip to content
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

Fix rooch dex #3215

Merged
merged 4 commits into from
Jan 21, 2025
Merged

Fix rooch dex #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab7ce2c
fix: move lp balance function to route
mx819812523 Jan 21, 2025
971b1ed
fix: change token pair from resource to object
mx819812523 Jan 21, 2025
e79b420
rename router file
mx819812523 Jan 21, 2025
edb55af
fix build
mx819812523 Jan 21, 2025
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
28 changes: 17 additions & 11 deletions apps/rooch_dex/sources/route.move → apps/rooch_dex/sources/router.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module rooch_dex::router {
use rooch_dex::swap;
use std::signer;
use std::signer::address_of;
use rooch_dex::swap::LPToken;
use rooch_framework::account_coin_store;
use moveos_std::object::ObjectID;
use rooch_framework::coin;
use rooch_dex::swap_utils;

Expand All @@ -26,11 +26,11 @@ module rooch_dex::router {
) {
assert!(!(swap::is_pair_created<X, Y>() || swap::is_pair_created<Y, X>()), ErrorTokenPairAlreadyExist);
if (swap_utils::sort_token_type<X, Y>()) {
let coin_info_id = swap::create_pair<X, Y>(sender);
add_liquidity<X, Y>(sender, amount_x_desired, amount_y_desired, amount_x_min, amount_y_min, coin_info_id);
swap::create_pair<X, Y>(sender);
add_liquidity<X, Y>(sender, amount_x_desired, amount_y_desired, amount_x_min, amount_y_min);
} else {
let coin_info_id = swap::create_pair<Y, X>(sender);
add_liquidity<Y, X>(sender, amount_x_desired, amount_y_desired, amount_x_min, amount_y_min, coin_info_id);
swap::create_pair<Y, X>(sender);
add_liquidity<Y, X>(sender, amount_x_desired, amount_y_desired, amount_x_min, amount_y_min);
};

}
Expand All @@ -42,23 +42,30 @@ module rooch_dex::router {
amount_y_desired: u64,
amount_x_min: u64,
amount_y_min: u64,
coin_info: ObjectID,
) {

let amount_x;
let amount_y;
let _lp_amount;
if (swap_utils::sort_token_type<X, Y>()) {
(amount_x, amount_y, _lp_amount) = swap::add_liquidity<X, Y>(sender, amount_x_desired, amount_y_desired, coin_info);
(amount_x, amount_y, _lp_amount) = swap::add_liquidity<X, Y>(sender, amount_x_desired, amount_y_desired);
assert!(amount_x >= amount_x_min, ErrorInsufficientXAmount);
assert!(amount_y >= amount_y_min, ErrorInsufficientYAmount);
} else {
(amount_y, amount_x, _lp_amount) = swap::add_liquidity<Y, X>(sender, amount_y_desired, amount_x_desired, coin_info);
(amount_y, amount_x, _lp_amount) = swap::add_liquidity<Y, X>(sender, amount_y_desired, amount_x_desired);
assert!(amount_x >= amount_x_min, ErrorInsufficientXAmount);
assert!(amount_y >= amount_y_min, ErrorInsufficientYAmount);
};
}

public fun lp_balance<X:key+store, Y:key+store>(addr: address): u256 {
if (swap_utils::sort_token_type<X, Y>()) {
account_coin_store::balance<LPToken<X, Y>>(addr)
} else {
account_coin_store::balance<LPToken<Y, X>>(addr)
}
}

fun assert_token_pair_created<X:key+store, Y:key+store>(){
assert!(swap::is_pair_created<X, Y>() || swap::is_pair_created<Y, X>(), ErrorTokenPairNotExist);
}
Expand All @@ -69,17 +76,16 @@ module rooch_dex::router {
liquidity: u64,
amount_x_min: u64,
amount_y_min: u64,
coin_info: ObjectID
) {
assert_token_pair_created<X, Y>();
let amount_x;
let amount_y;
if (swap_utils::sort_token_type<X, Y>()) {
(amount_x, amount_y) = swap::remove_liquidity<X, Y>(sender, liquidity, coin_info);
(amount_x, amount_y) = swap::remove_liquidity<X, Y>(sender, liquidity);
assert!(amount_x >= amount_x_min, ErrorInsufficientXAmount);
assert!(amount_y >= amount_y_min, ErrorInsufficientYAmount);
} else {
(amount_y, amount_x) = swap::remove_liquidity<Y, X>(sender, liquidity, coin_info);
(amount_y, amount_x) = swap::remove_liquidity<Y, X>(sender, liquidity);
assert!(amount_x >= amount_x_min, ErrorInsufficientXAmount);
assert!(amount_y >= amount_y_min, ErrorInsufficientYAmount);
}
Expand Down
Loading
Loading