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

[NTRN-483] fix: claim generator rewards #49

Merged
merged 2 commits into from
Jun 8, 2023
Merged

[NTRN-483] fix: claim generator rewards #49

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0be1a4
replace cw20 queries and sends with native queries and sends for base…
sotnikov-s Jun 2, 2023
ade40a0
replace unsafe operations with safe ones in lockdrop
sotnikov-s Jun 8, 2023
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
54 changes: 26 additions & 28 deletions contracts/lockdrop/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ use astroport::restricted_vector::RestrictedVector;
use astroport::DecimalCheckedOps;
use astroport_periphery::utils::Decimal256CheckedOps;
use cosmwasm_std::{
attr, coins, entry_point, from_binary, to_binary, Addr, BankMsg, Binary, CosmosMsg, Decimal,
Decimal256, Deps, DepsMut, Env, MessageInfo, Order, Response, StdError, StdResult, Uint128,
Uint256, WasmMsg,
attr, coins, entry_point, from_binary, to_binary, Addr, BankMsg, Binary, Coin, CosmosMsg,
Decimal, Decimal256, Deps, DepsMut, Env, MessageInfo, Order, Response, StdError, StdResult,
Uint128, Uint256, WasmMsg,
};
use cw2::set_contract_version;
use cw20::{BalanceResponse, Cw20ExecuteMsg, Cw20QueryMsg, Cw20ReceiveMsg};
Expand Down Expand Up @@ -1011,15 +1011,13 @@ pub fn handle_claim_rewards_and_unlock_for_lockup(
},
)?;

let astro_balance = {
let res: BalanceResponse = deps.querier.query_wasm_smart(
let reward_token_balance = deps
.querier
.query_balance(
env.contract.address.clone(),
rwi.base_reward_token.to_string(),
&Cw20QueryMsg::Balance {
address: env.contract.address.to_string(),
},
)?;
res.balance
};
)?
.amount;

let prev_proxy_reward_balances: Vec<Asset> = pending_on_proxy
.iter()
Expand Down Expand Up @@ -1047,7 +1045,7 @@ pub fn handle_claim_rewards_and_unlock_for_lockup(
cosmos_msgs.push(
CallbackMsg::UpdatePoolOnDualRewardsClaim {
pool_type,
prev_ntrn_balance: astro_balance,
prev_ntrn_balance: reward_token_balance,
prev_proxy_reward_balances,
}
.to_cosmos_msg(&env)?,
Expand Down Expand Up @@ -1164,15 +1162,16 @@ pub fn update_pool_on_dual_rewards_claim(
)?;

let base_reward_received;
// Increment claimed Astro rewards per LP share
// Increment claimed rewards per LP share
pool_info.generator_ntrn_per_share += {
let res: BalanceResponse = deps.querier.query_wasm_smart(
rwi.base_reward_token.to_string(),
&Cw20QueryMsg::Balance {
address: env.contract.address.to_string(),
},
)?;
base_reward_received = res.balance - prev_ntrn_balance;
let reward_token_balance = deps
.querier
.query_balance(
env.contract.address.clone(),
rwi.base_reward_token.to_string(),
)?
.amount;
base_reward_received = reward_token_balance - prev_ntrn_balance;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we are here, let's use checked_sub to feel 🦀 extra safe 🦀?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

contract: becomes extra safe after single minus-to-checked_sub replacement
also contract: still has dozens of unsafe sub and sum operations

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@foxpy @swelf19 @oopcode you want it — you got it ;) please review

Decimal::from_ratio(base_reward_received, lp_balance)
};

Expand Down Expand Up @@ -1284,21 +1283,20 @@ pub fn callback_withdraw_user_rewards_for_lockup_optional_withdraw(
},
)?;

// Calculate claimable Astro staking rewards for this lockup
// Calculate claimable staking rewards for this lockup
let total_lockup_astro_rewards = pool_info.generator_ntrn_per_share * astroport_lp_amount;
let pending_astro_rewards =
total_lockup_astro_rewards.checked_sub(lockup_info.generator_ntrn_debt)?;
lockup_info.generator_ntrn_debt = total_lockup_astro_rewards;

// If claimable Astro staking rewards > 0, claim them
// If claimable staking rewards > 0, claim them
if pending_astro_rewards > Uint128::zero() {
cosmos_msgs.push(CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: rwi.base_reward_token.to_string(),
funds: vec![],
msg: to_binary(&Cw20ExecuteMsg::Transfer {
recipient: user_address.to_string(),
cosmos_msgs.push(CosmosMsg::Bank(BankMsg::Send {
to_address: user_address.to_string(),
amount: vec![Coin {
denom: rwi.base_reward_token.to_string(),
amount: pending_astro_rewards,
})?,
}],
}));
}
attributes.push(attr("generator_astro_reward", pending_astro_rewards));
Expand Down