Skip to content

Commit cb42c74

Browse files
authoredAug 19, 2024
Bump deps and cleanup migration (#432)
* Bump minor cw version. * Update optimizer and rust version. * Mars ver to 2.1.0, cleanup migrations, fix clippy.
1 parent 3e01592 commit cb42c74

File tree

82 files changed

+148
-1852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+148
-1852
lines changed
 

‎Cargo.lock‎

Lines changed: 75 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ members = [
3838
]
3939

4040
[workspace.package]
41-
version = "2.0.0"
41+
version = "2.1.0"
4242
authors = [
43-
"Gabe R. <gabe.r@delphilabs.io>",
44-
"Larry Engineer <larry@delphidigital.io>",
45-
"Piotr B. <piotr@delphilabs.io>",
43+
"Piotr B. <piotr@marsprotocol.foundation>",
4644
"Bob v.d. H. <bob@marsprotocol.foundation>",
4745
"Mark Watney <mark@marsprotocol.foundation>",
46+
"Gabe R. <gabe.r@delphilabs.io>",
47+
"Larry Engineer <larry@delphidigital.io>",
4848
"Spike Spiegel <spikeonmars@protonmail.com>",
4949
"Brianna M. <brianna@delphilabs.io>",
5050
"Ahmad Kaouk",
@@ -64,8 +64,8 @@ apollo-utils = "0.1.2"
6464
astroport = "2.8.0"
6565
astroport-v5 = { package = "astroport", version = "5.2.0" }
6666
bech32 = "0.11.0"
67-
cosmwasm-schema = "1.5.5"
68-
cosmwasm-std = "1.5.5"
67+
cosmwasm-schema = "1.5.7"
68+
cosmwasm-std = "1.5.7"
6969
cw2 = "1.1.2"
7070
cw721 = { git = "https://github.com/CosmWasm/cw-nfts/", branch = "main" }
7171
cw721-base = { git = "https://github.com/CosmWasm/cw-nfts/", branch = "main", features = ["library"] }

‎Makefile.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ default_to_workspace = false
1010
# Directory with wasm files used by integration tests (another directory can be used instead, for example 'artifacts' from rust-optimizer)
1111
ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release"
1212
# If you bump this version, verify RUST_VERSION correctness
13-
RUST_OPTIMIZER_VERSION = "0.15.1"
14-
# Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/optimizer/blob/v0.15.1/Dockerfile#L1)
13+
RUST_OPTIMIZER_VERSION = "0.16.0"
14+
# Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/optimizer/blob/v0.16.0/Dockerfile#L1)
1515
# to be sure that we compile / test against the same version
16-
RUST_VERSION = "1.75.0"
16+
RUST_VERSION = "1.78.0"
1717

1818
[tasks.install-stable]
1919
script = '''

‎contracts/account-nft/src/contract.rs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ use cosmwasm_std::{
55
};
66
use cw2::set_contract_version;
77
use cw721_base::Cw721Contract;
8-
use mars_types::account_nft::{ExecuteMsg, InstantiateMsg, MigrateV1ToV2, NftConfig, QueryMsg};
8+
use mars_types::account_nft::{ExecuteMsg, InstantiateMsg, NftConfig, QueryMsg};
99

1010
use crate::{
1111
error::ContractError,
1212
execute::{burn, mint, update_config},
13-
migrations::{self},
1413
query::{query_config, query_next_id},
1514
state::{CONFIG, NEXT_ID},
1615
};
@@ -68,11 +67,6 @@ pub fn execute(
6867
ExecuteMsg::Burn {
6968
token_id,
7069
} => burn(deps, env, info, token_id),
71-
ExecuteMsg::Migrate(msg) => match msg {
72-
MigrateV1ToV2::BurnEmptyAccounts {
73-
limit,
74-
} => migrations::v2_0_0::burn_empty_accounts(deps, limit),
75-
},
7670
_ => Parent::default().execute(deps, env, info, msg.try_into()?).map_err(Into::into),
7771
}
7872
}
@@ -85,8 +79,3 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
8579
_ => Parent::default().query(deps, env, msg.try_into()?),
8680
}
8781
}
88-
89-
#[cfg_attr(not(feature = "library"), entry_point)]
90-
pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
91-
migrations::v2_0_0::migrate(deps)
92-
}

0 commit comments

Comments
 (0)
Please sign in to comment.