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

Feat/icq refactor #213

Draft
wants to merge 14 commits into
base: dev
Choose a base branch
from
Draft

Feat/icq refactor #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d4f4c5b
feat: factory msg and state to the package
ratik Nov 7, 2024
94ec2a7
feat: contract locator
ratik Nov 7, 2024
5758e7a
feat: make state as HashMap
ratik Nov 7, 2024
94d7d05
feat: macro phonebook
ratik Nov 8, 2024
dfe7c40
fix: review
ratik Nov 11, 2024
25f18ae
fix: review
ratik Nov 11, 2024
5ef7422
fix: review
ratik Nov 11, 2024
2a988e8
wip
ratik Nov 25, 2024
6a8043d
wip
ratik Dec 17, 2024
652da11
wip
ratik Dec 17, 2024
ab5a541
wip
ratik Dec 18, 2024
489d715
wip
ratik Dec 18, 2024
23ffb9a
wip
ratik Dec 18, 2024
5ef738a
wip
ratik Dec 19, 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
36 changes: 36 additions & 0 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: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ members = [
"contracts/mirror",
"contracts/price-provider",
"contracts/validators-stats",
"contracts/icq-adapter-kv",
"contracts/validators-set",
"contracts/redemption-rate-adapter",
"contracts/icq-router",
"packages/base",
"packages/helpers",
"packages/macros",
Expand Down
102 changes: 49 additions & 53 deletions contracts/core/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use cosmwasm_schema::cw_serde;
use cosmwasm_std::{
attr, ensure, ensure_eq, ensure_ne, to_json_binary, Addr, Attribute, BankQuery, Binary, Coin,
CosmosMsg, CustomQuery, Decimal, Deps, DepsMut, Env, MessageInfo, Order, QueryRequest, Reply,
Response, StdError, StdResult, SubMsg, SubMsgResult, Uint128, Uint64, WasmMsg,
Response, StdError, StdResult, SubMsg, SubMsgResult, Uint128, Uint64, WasmMsg, WasmQuery,
};
use cw_storage_plus::Bound;
use drop_helpers::answer::response;
Expand Down Expand Up @@ -50,21 +50,20 @@ pub fn instantiate(
) -> ContractResult<Response<NeutronMsg>> {
cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
let attrs: Vec<Attribute> = vec![
attr("token_contract", &msg.token_contract),
attr("puppeteer_contract", &msg.puppeteer_contract),
attr("strategy_contract", &msg.strategy_contract),
attr("factory_contract", &msg.factory_contract),
attr("base_denom", &msg.base_denom),
attr("owner", &msg.owner),
];
cw_ownable::initialize_owner(deps.storage, deps.api, Some(&msg.owner))?;
let config = msg.into_config(deps.as_ref().into_empty())?;
let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, token_contract);
CONFIG.save(deps.storage, &config)?;
LD_DENOM.save(
deps.storage,
&deps
.querier
.query_wasm_smart::<TokenConfigResponse>(
&config.token_contract,
&addrs.token_contract,
&TokenQueryMsg::Config {},
)?
.denom,
Expand Down Expand Up @@ -141,6 +140,7 @@ fn query_bond_providers(deps: Deps<NeutronQuery>) -> ContractResult<Vec<Addr>> {

fn query_exchange_rate(deps: Deps<NeutronQuery>, config: &Config) -> ContractResult<Decimal> {
let fsm_state = FSM.get_current_state(deps.storage)?;
let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, puppeteer_contract);
if fsm_state != ContractState::Idle {
return Ok(EXCHANGE_RATE
.load(deps.storage)
Expand All @@ -160,7 +160,7 @@ fn query_exchange_rate(deps: Deps<NeutronQuery>, config: &Config) -> ContractRes
let delegations_response = deps
.querier
.query_wasm_smart::<drop_staking_base::msg::puppeteer::DelegationsResponse>(
&config.puppeteer_contract,
&addrs.puppeteer_contract,
&drop_puppeteer_base::msg::QueryMsg::Extension {
msg: drop_staking_base::msg::puppeteer::QueryExtMsg::Delegations {},
},
Expand Down Expand Up @@ -442,7 +442,9 @@ fn execute_update_withdrawn_amount(
withdrawn_amount: Uint128,
) -> ContractResult<Response<NeutronMsg>> {
let config = CONFIG.load(deps.storage)?;
if info.sender != config.withdrawal_manager_contract {
let addrs =
drop_helpers::get_contracts!(deps, config.factory_contract, withdrawal_manager_contract);
if info.sender != addrs.withdrawal_manager_contract {
return Err(ContractError::Unauthorized {});
}

Expand All @@ -469,8 +471,8 @@ fn execute_puppeteer_hook(
msg: drop_puppeteer_base::peripheral_hook::ResponseHookMsg,
) -> ContractResult<Response<NeutronMsg>> {
let config = CONFIG.load(deps.storage)?;

let allowed_senders: Vec<_> = vec![config.puppeteer_contract]
let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, puppeteer_contract);
let allowed_senders: Vec<_> = vec![deps.api.addr_validate(&addrs.puppeteer_contract)?]
.into_iter()
.chain(BOND_PROVIDERS.get_all_providers(deps.as_ref().storage)?)
.collect();
Expand Down Expand Up @@ -522,8 +524,9 @@ fn execute_tick(

let current_state = FSM.get_current_state(deps.storage)?;
let config = CONFIG.load(deps.storage)?;
let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, puppeteer_contract);

check_latest_icq_responses(deps.as_ref(), config.puppeteer_contract.to_string())?;
check_latest_icq_responses(deps.as_ref(), addrs.puppeteer_contract)?;

match current_state {
ContractState::Idle => execute_tick_idle(deps.branch(), env, info, &config),
Expand All @@ -546,6 +549,12 @@ fn execute_tick_idle(
let mut messages = vec![];
let mut sub_msgs = vec![];
cache_exchange_rate(deps.branch(), env.clone(), config)?;
let addrs = drop_helpers::get_contracts!(
deps,
config.factory_contract,
puppeteer_contract,
validators_set_contract
);
attrs.push(attr("knot", "002"));
attrs.push(attr("knot", "003"));
if env.block.time.seconds() - last_idle_call < config.idle_min_interval {
Expand Down Expand Up @@ -599,7 +608,7 @@ fn execute_tick_idle(
.ok_or(ContractError::PumpIcaAddressIsNotSet {})?;
let (ica_balance, _remote_height, ica_balance_local_time) = get_ica_balance_by_denom(
deps.as_ref(),
config.puppeteer_contract.as_ref(),
&addrs.puppeteer_contract,
&config.remote_denom,
true,
)?;
Expand Down Expand Up @@ -698,14 +707,14 @@ fn execute_tick_idle(
};

let validators: Vec<ValidatorInfo> = deps.querier.query_wasm_smart(
config.validators_set_contract.to_string(),
addrs.validators_set_contract.to_string(),
&drop_staking_base::msg::validatorset::QueryMsg::Validators {},
)?;

let delegations_response = deps
.querier
.query_wasm_smart::<drop_staking_base::msg::puppeteer::DelegationsResponse>(
config.puppeteer_contract.to_string(),
addrs.puppeteer_contract.to_string(),
&drop_puppeteer_base::msg::QueryMsg::Extension {
msg: drop_staking_base::msg::puppeteer::QueryExtMsg::Delegations {},
},
Expand Down Expand Up @@ -736,7 +745,7 @@ fn execute_tick_idle(
if !validators_to_claim.is_empty() {
attrs.push(attr("validators_to_claim", validators_to_claim.join(",")));
messages.push(CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.puppeteer_contract.to_string(),
contract_addr: addrs.puppeteer_contract.to_string(),
msg: to_json_binary(
&drop_staking_base::msg::puppeteer::ExecuteMsg::ClaimRewardsAndOptionalyTransfer {
validators: validators_to_claim,
Expand Down Expand Up @@ -766,7 +775,7 @@ fn execute_tick_peripheral(
) -> ContractResult<Response<NeutronMsg>> {
let mut attrs = vec![attr("action", "tick_peripheral")];
let res = get_received_puppeteer_response(deps.as_ref())?;

let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, puppeteer_contract);
if let drop_puppeteer_base::peripheral_hook::ResponseHookMsg::Success(msg) = res {
match msg.transaction {
drop_puppeteer_base::peripheral_hook::Transaction::RedeemShares { .. } => {
Expand All @@ -783,7 +792,7 @@ fn execute_tick_peripheral(

let balances_response: drop_staking_base::msg::puppeteer::BalancesResponse =
deps.querier.query_wasm_smart(
config.puppeteer_contract.to_string(),
addrs.puppeteer_contract.to_string(),
&drop_puppeteer_base::msg::QueryMsg::Extension {
msg: drop_staking_base::msg::puppeteer::QueryExtMsg::Balances {},
},
Expand Down Expand Up @@ -951,6 +960,7 @@ fn execute_bond(

let config = CONFIG.load(deps.storage)?;
let bonded_coin = cw_utils::one_coin(&info)?;
let addrs = drop_helpers::get_contracts!(deps, config.factory_contract, token_contract);
let Coin { amount, denom } = bonded_coin.clone();
if let Some(bond_limit) = config.bond_limit {
if BONDED_AMOUNT.load(deps.storage)? + amount > bond_limit {
Expand Down Expand Up @@ -1012,7 +1022,7 @@ fn execute_bond(
}
}
msgs.push(CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.token_contract.to_string(),
contract_addr: addrs.token_contract.to_string(),
msg: to_json_binary(&TokenExecuteMsg::Mint {
amount: issue_amount,
receiver,
Expand Down Expand Up @@ -1064,33 +1074,9 @@ fn execute_update_config(
let mut config = CONFIG.load(deps.storage)?;
cw_ownable::assert_owner(deps.storage, &info.sender)?;
let mut attrs = vec![attr("action", "update_config")];
if let Some(token_contract) = new_config.token_contract {
config.token_contract = deps.api.addr_validate(&token_contract)?;
attrs.push(attr("token_contract", token_contract));
}
if let Some(puppeteer_contract) = new_config.puppeteer_contract {
config.puppeteer_contract = deps.api.addr_validate(&puppeteer_contract)?;
attrs.push(attr("puppeteer_contract", puppeteer_contract));
}
if let Some(strategy_contract) = new_config.strategy_contract {
config.strategy_contract = deps.api.addr_validate(&strategy_contract)?;
attrs.push(attr("strategy_contract", strategy_contract));
}
if let Some(withdrawal_voucher_contract) = new_config.withdrawal_voucher_contract {
config.withdrawal_voucher_contract =
deps.api.addr_validate(&withdrawal_voucher_contract)?;
attrs.push(attr(
"withdrawal_voucher_contract",
withdrawal_voucher_contract,
));
}
if let Some(withdrawal_manager_contract) = new_config.withdrawal_manager_contract {
config.withdrawal_manager_contract =
deps.api.addr_validate(&withdrawal_manager_contract)?;
attrs.push(attr(
"withdrawal_manager_contract",
withdrawal_manager_contract,
));
if let Some(factory_contract) = new_config.factory_contract {
config.factory_contract = deps.api.addr_validate(&factory_contract)?;
attrs.push(attr("factory_contract", factory_contract));
}
if let Some(pump_ica_address) = new_config.pump_ica_address {
attrs.push(attr("pump_address", &pump_ica_address));
Expand All @@ -1104,10 +1090,6 @@ fn execute_update_config(
attrs.push(attr("remote_denom", &remote_denom));
config.remote_denom = remote_denom;
}
if let Some(validators_set_contract) = new_config.validators_set_contract {
config.validators_set_contract = deps.api.addr_validate(&validators_set_contract)?;
attrs.push(attr("validators_set_contract", validators_set_contract));
}
if let Some(base_denom) = new_config.base_denom {
attrs.push(attr("base_denom", &base_denom));
config.base_denom = base_denom;
Expand Down Expand Up @@ -1168,6 +1150,12 @@ fn execute_unbond(
let config = CONFIG.load(deps.storage)?;
let ld_denom = LD_DENOM.load(deps.storage)?;
let dasset_amount = cw_utils::must_pay(&info, &ld_denom)?;
let addrs = drop_helpers::get_contracts!(
deps,
config.factory_contract,
withdrawal_voucher_contract,
token_contract
);
BONDED_AMOUNT.update(deps.storage, |total| StdResult::Ok(total - dasset_amount))?;
let mut unbond_batch = unbond_batches_map().load(deps.storage, unbond_batch_id)?;
unbond_batch.total_unbond_items += 1;
Expand Down Expand Up @@ -1195,7 +1183,7 @@ fn execute_unbond(

let msgs = vec![
CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.withdrawal_voucher_contract.into_string(),
contract_addr: addrs.withdrawal_voucher_contract,
msg: to_json_binary(&VoucherExecuteMsg::Mint {
owner: info.sender.to_string(),
token_id: unbond_batch_id.to_string()
Expand All @@ -1209,7 +1197,7 @@ fn execute_unbond(
funds: vec![],
}),
CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.token_contract.into_string(),
contract_addr: addrs.token_contract,
msg: to_json_binary(&TokenExecuteMsg::Burn {})?,
funds: vec![Coin {
denom: ld_denom,
Expand Down Expand Up @@ -1268,6 +1256,12 @@ fn get_unbonding_msg<T>(
info: &MessageInfo,
attrs: &mut Vec<cosmwasm_std::Attribute>,
) -> ContractResult<Option<CosmosMsg<T>>> {
let addrs = drop_helpers::get_contracts!(
deps,
config.factory_contract,
strategy_contract,
puppeteer_contract
);
let funds = info.funds.clone();
attrs.push(attr("knot", "024"));
let (batch_id, processing_failed_batch) = match FAILED_BATCH_ID.may_load(deps.storage)? {
Expand All @@ -1292,7 +1286,7 @@ fn get_unbonding_msg<T>(

let calc_withdraw_query_result: Result<Vec<(String, Uint128)>, StdError> =
deps.querier.query_wasm_smart(
config.strategy_contract.to_string(),
addrs.strategy_contract,
&drop_staking_base::msg::strategy::QueryMsg::CalcWithdraw {
withdraw: expected_native_asset_amount,
},
Expand Down Expand Up @@ -1321,7 +1315,7 @@ fn get_unbonding_msg<T>(
)?;
}
Ok(Some(CosmosMsg::Wasm(WasmMsg::Execute {
contract_addr: config.puppeteer_contract.to_string(),
contract_addr: addrs.puppeteer_contract,
msg: to_json_binary(&drop_staking_base::msg::puppeteer::ExecuteMsg::Undelegate {
items: undelegations,
batch_id,
Expand Down Expand Up @@ -1489,6 +1483,8 @@ pub mod check_denom {
if denom == config.base_denom {
return Ok(DenomType::Base);
}
let addrs =
drop_helpers::get_contracts!(deps, config.factory_contract, validators_set_contract);

let trace = query_denom_trace(deps, denom)?.denom_trace;
let (port, channel) = trace
Expand All @@ -1510,7 +1506,7 @@ pub mod check_denom {
let validator_info = deps
.querier
.query_wasm_smart::<drop_staking_base::msg::validatorset::ValidatorResponse>(
&config.validators_set_contract,
&addrs.validators_set_contract,
&drop_staking_base::msg::validatorset::QueryMsg::Validator {
valoper: validator.to_string(),
},
Expand Down
Loading
Loading