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

Adjust contract creation fee #63

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
94 changes: 47 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["contracts/*", "packages/*"]
resolver = "2"

[workspace.package]
version = "1.1.0"
version = "1.1.1"
edition = "2021"
license = "GPL 3.0"
repository = "https://github.com/WHELP-project/whelp-contracts"
Expand Down
32 changes: 27 additions & 5 deletions contracts/factory/src/contract.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use coreum_wasm_sdk::core::{CoreumMsg, CoreumQueries};
use cosmwasm_std::{
attr, entry_point, from_json, to_json_binary, Addr, Binary, CosmosMsg, Decimal, Deps, DepsMut,
Env, MessageInfo, Order, Reply, ReplyOn, StdError, StdResult, WasmMsg,
attr, coin, entry_point, from_json, to_json_binary, Addr, Binary, CosmosMsg, Decimal, Deps,
DepsMut, Env, MessageInfo, Order, Reply, ReplyOn, StdError, StdResult, WasmMsg,
};
use cw2::{ensure_from_older_version, set_contract_version};
use cw20::Cw20ReceiveMsg;
Expand All @@ -24,8 +24,9 @@ use crate::{
error::ContractError,
querier::query_pair_info,
state::{
check_asset_infos, pair_key, read_pairs, Config, TmpPoolInfo, CONFIG, OWNERSHIP_PROPOSAL,
PAIRS, PAIRS_TO_MIGRATE, PAIR_CONFIGS, STAKING_ADDRESSES, TMP_PAIR_INFO,
check_asset_infos, pair_key, read_pairs, Config, TmpPoolInfo, CONFIG, NATIVE_DENOM,
OWNERSHIP_PROPOSAL, PAIRS, PAIRS_TO_MIGRATE, PAIR_CONFIGS, STAKING_ADDRESSES,
TMP_PAIR_INFO,
},
};

Expand Down Expand Up @@ -99,6 +100,7 @@ pub fn instantiate(
PAIR_CONFIGS.save(deps.storage, pc.pool_type.to_string(), pc)?;
}
CONFIG.save(deps.storage, &config)?;
NATIVE_DENOM.save(deps.storage, &msg.native_denom)?;

Ok(Response::new())
}
Expand Down Expand Up @@ -530,8 +532,9 @@ pub fn execute_create_pair(
},
verified,
circuit_breaker: None,
native_denom: NATIVE_DENOM.load(deps.storage)?,
})?,
funds: vec![],
funds: vec![coin(20000000, NATIVE_DENOM.load(deps.storage)?)],
label: "Dex pair".to_string(),
}
.into(),
Expand Down Expand Up @@ -865,6 +868,25 @@ pub fn migrate(
MigrateMsg::Update() => {
ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
}
MigrateMsg::UpdatePoolId {
pool_type,
set_native_denom,
new_pool_id,
} => {
NATIVE_DENOM.save(deps.storage, &set_native_denom)?;
PAIR_CONFIGS.update(
deps.storage,
pool_type.to_string(),
|old_config| -> StdResult<_> {
let new_config: PoolConfig = PoolConfig {
code_id: new_pool_id,
// if this config doesn't exist, we might as well panic and abort the migration
..old_config.unwrap()
};
Ok(new_config)
},
)?;
}
MigrateMsg::AddPermissionlessPoolDeposit(asset) => {
CONFIG.update(deps.storage, |old_config| -> StdResult<_> {
let new_config = Config {
Expand Down
3 changes: 3 additions & 0 deletions contracts/factory/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ pub const TMP_PAIR_INFO: Item<TmpPoolInfo> = Item::new("tmp_pair_info");
/// Saves factory settings
pub const CONFIG: Item<Config> = Item::new("config");

/// Native denom of the chain in order to pay the contract instantiation fees
pub const NATIVE_DENOM: Item<String> = Item::new("native");

/// Saves created pairs (from olders to latest)
pub const PAIRS: Map<&[u8], Addr> = Map::new("pair_info");

Expand Down
Loading
Loading