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.

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: migrate entrypoints in cl-vault and range-middleware #595

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions smart-contracts/contracts/cl-vault/src/contract.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#[cfg(not(feature = "library"))]
use cosmwasm_std::entry_point;
use cosmwasm_std::{to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response};
use cosmwasm_std::{
to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, Uint128,
};
use cw2::set_contract_version;

use crate::error::{ContractError, ContractResult};
Expand All @@ -16,9 +18,10 @@ use crate::query::{
use crate::reply::Replies;
use crate::rewards::{
execute_collect_rewards, execute_distribute_rewards, handle_collect_incentives_reply,
handle_collect_spread_rewards_reply,
handle_collect_spread_rewards_reply, CoinList,
};

use crate::state::{RewardsStatus, CURRENT_TOTAL_SUPPLY, DISTRIBUTED_REWARDS, REWARDS_STATUS};
use crate::vault::admin::execute_admin;
use crate::vault::claim::execute_claim_user_rewards;
use crate::vault::deposit::{execute_exact_deposit, handle_deposit_create_position_reply};
Expand Down Expand Up @@ -192,6 +195,9 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
}

#[cfg_attr(not(feature = "library"), entry_point)]
pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
Ok(Response::default())
pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
REWARDS_STATUS.save(deps.storage, &RewardsStatus::Ready)?;
DISTRIBUTED_REWARDS.save(deps.storage, &CoinList::new())?;
CURRENT_TOTAL_SUPPLY.save(deps.storage, &Uint128::zero())?;
Ok(Response::new().add_attribute("migrate", "successful"))
}
7 changes: 6 additions & 1 deletion smart-contracts/contracts/range-middleware/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cw2::set_contract_version;
use crate::admin::execute::execute_admin_msg;
use crate::admin::query::query_admin;
use crate::error::ContractError;
use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
use crate::range::execute::execute_range_msg;
use crate::range::query::query_range;
use crate::state::{RANGE_EXECUTOR_ADMIN, RANGE_SUBMITTER_ADMIN};
Expand Down Expand Up @@ -58,5 +58,10 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
}
}

#[cfg_attr(not(feature = "library"), entry_point)]
pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
Ok(Response::default())
}

#[cfg(test)]
mod tests {}
3 changes: 3 additions & 0 deletions smart-contracts/contracts/range-middleware/src/msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ pub enum QueryMsg {
#[returns(Empty)]
AdminQuery(AdminQueryMsg),
}

#[cw_serde]
pub struct MigrateMsg {}
Loading