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

Jump to bottom

Fix Oak no. 6 - incorrect Unstake exact LP #413

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Fix Oak no. 6 - incorrect Unstake exact LP #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1823f97
fix: unstake exact
markonmars Jun 21, 2024
71873f5
naming
markonmars Jun 21, 2024
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
6 changes: 3 additions & 3 deletions contracts/credit-manager/src/unstake_astro_lp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ pub fn unstake_lp(
increment_coin_balance(deps.storage, account_id, reward)?;
}

let new_amount = match lp_coin.amount {
let amount_to_unstake = match lp_coin.amount {
ActionAmount::Exact(amt) => {
if lp_position.lp_coin.amount.lt(&amt) {
return Err(ContractError::InsufficientFunds {
requested: amt,
available: lp_position.lp_coin.amount,
});
} else {
lp_position.lp_coin.amount.checked_sub(amt)?
amt
piobab marked this conversation as resolved.
Show resolved Hide resolved
}
}
ActionAmount::AccountBalance => lp_position.lp_coin.amount,
};

let updated_coin = coin(new_amount.u128(), lp_coin.denom.as_str());
let updated_coin = coin(amount_to_unstake.u128(), lp_coin.denom.as_str());

increment_coin_balance(deps.storage, account_id, &updated_coin)?;

Expand Down
9 changes: 6 additions & 3 deletions contracts/credit-manager/tests/tests/test_unstake_astro_lp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn unstake() {
let mut mock = MockEnv::new()
.fund_account(AccountToFund {
addr: user.clone(),
funds: coins(100, lp_denom),
funds: coins(200, lp_denom),
})
.build()
.unwrap();
Expand All @@ -60,7 +60,7 @@ fn unstake() {

let lp_coin = Coin {
denom: lp_denom.to_string(),
amount: Uint128::new(100),
amount: Uint128::new(200),
};

// stake
Expand Down Expand Up @@ -93,11 +93,14 @@ fn unstake() {

let positions = mock.query_positions(&account_id);
assert_eq!(positions.staked_astro_lps.len(), 1);
assert_eq!(positions.staked_astro_lps[0].denom, lp_denom.to_string());
assert_eq!(positions.staked_astro_lps[0].amount, Uint128::new(150));
assert_eq!(positions.deposits[0].denom, lp_denom.to_string());
assert_eq!(positions.deposits[0].amount, Uint128::new(50));

// Assert correct lp balance in contract
let cm_lp_coin = mock.query_balance(&mock.rover, lp_denom);
assert_eq!(positions.deposits[0].denom, cm_lp_coin.denom);
assert_eq!(positions.deposits[0].amount, cm_lp_coin.amount);

// Entire remaining amount
Expand All @@ -118,7 +121,7 @@ fn unstake() {
assert_eq!(positions.staked_astro_lps.len(), 0);
assert_eq!(positions.deposits.len(), 1);
assert_eq!(positions.deposits[0].denom, lp_denom.to_string());
assert_eq!(positions.deposits[0].amount, Uint128::new(100));
assert_eq!(positions.deposits[0].amount, Uint128::new(200));

// Assert correct lp balance in contract
let cm_lp_coin = mock.query_balance(&mock.rover, lp_denom);
Expand Down
Loading