From c2ee4b4ae683a2316c3233de3a98b27efcf9c92e Mon Sep 17 00:00:00 2001 From: Jakub Bogucki Date: Mon, 27 Feb 2023 18:41:18 +0100 Subject: [PATCH] Release v1.2.1 --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- contracts/factory/src/contract.rs | 28 ++++++++++++++++------------ packages/wyndex/src/factory.rs | 11 ++++++----- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a3f0b8..713125a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,7 +288,7 @@ dependencies = [ [[package]] name = "cw-placeholder" -version = "1.2.0" +version = "1.2.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -299,7 +299,7 @@ dependencies = [ [[package]] name = "cw-splitter" -version = "1.2.0" +version = "1.2.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -662,7 +662,7 @@ checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] name = "gauge-adapter" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -774,7 +774,7 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "junoswap-staking" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -836,7 +836,7 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "nominated-trader" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1039,7 +1039,7 @@ dependencies = [ [[package]] name = "raw-migration" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1557,7 +1557,7 @@ dependencies = [ [[package]] name = "wyndex" -version = "1.2.0" +version = "1.2.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1572,7 +1572,7 @@ dependencies = [ [[package]] name = "wyndex-factory" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1593,7 +1593,7 @@ dependencies = [ [[package]] name = "wyndex-multi-hop" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1612,7 +1612,7 @@ dependencies = [ [[package]] name = "wyndex-pair" -version = "1.2.0" +version = "1.2.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1630,7 +1630,7 @@ dependencies = [ [[package]] name = "wyndex-pair-stable" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1651,7 +1651,7 @@ dependencies = [ [[package]] name = "wyndex-stake" -version = "1.2.0" +version = "1.2.1" dependencies = [ "anyhow", "cosmwasm-schema", diff --git a/Cargo.toml b/Cargo.toml index 5fafcad..7240e70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = ["packages/*", "contracts/*", "tests"] [workspace.package] -version = "1.2.0" +version = "1.2.1" edition = "2021" license = "GPL 3.0" repository = "https://github.com/cosmorama/wynddex" diff --git a/contracts/factory/src/contract.rs b/contracts/factory/src/contract.rs index 25b37b3..ed9bcaf 100644 --- a/contracts/factory/src/contract.rs +++ b/contracts/factory/src/contract.rs @@ -2,30 +2,31 @@ use cosmwasm_std::{ attr, entry_point, to_binary, Addr, Binary, CosmosMsg, Decimal, Deps, DepsMut, Env, MessageInfo, Order, Reply, ReplyOn, Response, StdError, StdResult, SubMsg, WasmMsg, }; +use cw2::set_contract_version; +use cw_utils::ensure_from_older_version; + +use wyndex::asset::{addr_opt_validate, AssetInfo}; +use wyndex::common::{ + claim_ownership, drop_ownership_proposal, propose_new_owner, validate_addresses, +}; +use wyndex::factory::{ + ConfigResponse, DistributionFlow, ExecuteMsg, FeeInfoResponse, InstantiateMsg, MigrateMsg, + PairConfig, PairType, PairsResponse, PartialDefaultStakeConfig, PartialStakeConfig, QueryMsg, + ROUTE, +}; use wyndex::fee_config::FeeConfig; use wyndex::stake::UnbondingPeriod; +use wyndex_stake::msg::ExecuteMsg as StakeExecuteMsg; use crate::error::ContractError; use crate::querier::query_pair_info; - use crate::state::{ check_asset_infos, pair_key, read_pairs, Config, TmpPairInfo, CONFIG, OWNERSHIP_PROPOSAL, PAIRS, PAIRS_TO_MIGRATE, PAIR_CONFIGS, STAKING_ADDRESSES, TMP_PAIR_INFO, }; -use cw2::set_contract_version; use itertools::Itertools; use std::collections::HashSet; -use wyndex::asset::{addr_opt_validate, AssetInfo}; -use wyndex::common::{ - claim_ownership, drop_ownership_proposal, propose_new_owner, validate_addresses, -}; -use wyndex::factory::{ - ConfigResponse, DistributionFlow, ExecuteMsg, FeeInfoResponse, InstantiateMsg, MigrateMsg, - PairConfig, PairType, PairsResponse, PartialDefaultStakeConfig, PartialStakeConfig, QueryMsg, - ROUTE, -}; -use wyndex_stake::msg::ExecuteMsg as StakeExecuteMsg; use cw_placeholder::contract::CONTRACT_NAME as PLACEHOLDER_CONTRACT_NAME; use wyndex::pair::{ExecuteMsg as PairExecuteMsg, InstantiateMsg as PairInstantiateMsg, PairInfo}; @@ -783,6 +784,9 @@ pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> Result { + ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?; + } }; Ok(Response::new()) diff --git a/packages/wyndex/src/factory.rs b/packages/wyndex/src/factory.rs index 9477b9d..6f4a71b 100644 --- a/packages/wyndex/src/factory.rs +++ b/packages/wyndex/src/factory.rs @@ -352,15 +352,16 @@ pub enum UpdateAddr { pub enum MigrateMsg { /// Used to instantiate from cw-placeholder Init(InstantiateMsg), + Update(), } /// Map which contains a list of all pairs which are able to convert X <> Y assets. /// Example: given 3 pools (X, Y), (X,Y,Z) and (X,Y,Z,W), the map will contain the following entries -/// (pair addresses): -/// `ROUTE[X][Y] = [(X,Y), (X,Y,Z), (X,Y,Z,W)]` -/// `ROUTE[X][Z] = [(X,Y,Z), (X,Y,Z,W)]` -/// `ROUTE[X][W] = [(X,Y,Z,W)]` -/// ... +/// (pair addresses): +/// `ROUTE[X][Y] = [(X,Y), (X,Y,Z), (X,Y,Z,W)]` +/// `ROUTE[X][Z] = [(X,Y,Z), (X,Y,Z,W)]` +/// `ROUTE[X][W] = [(X,Y,Z,W)]` +/// ... /// /// Notice that `ROUTE[X][Y] = ROUTE[Y][X]` pub const ROUTE: Map<(String, String), Vec> = Map::new("routes");