Skip to content

Commit

Permalink
Upgrade to lastest versions of cw-plus and CosmWasm (#59)
Browse files Browse the repository at this point in the history 
* Upgraded to latest CosmWasm libs

* Renamed ContractResult to SubMsgResult
  • Loading branch information
@shanev
shanev authored Mar 26, 2022
1 parent ca27f72 commit cbbdbff
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 68 deletions.
66 changes: 37 additions & 29 deletions Cargo.lock
View file

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

10 changes: 5 additions & 5 deletions contracts/cw2981-royalties/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cw2981-royalties"
version = "0.12.0"
version = "0.13.1"
authors = ["Alex Lynham <alex@lynh.am>"]
edition = "2018"
description = "Basic implementation of royalties for cw721 NFTs with token level royalties"
Expand All @@ -25,14 +25,14 @@ backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
cw721 = { path = "../../packages/cw721", version = "0.12.0" }
cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
cw721 = { path = "../../packages/cw721", version = "0.13.1" }
cw721-base = { path = "../cw721-base", version = "0.13.1", features = [
"library",
] }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta7" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.23" }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta7" }
14 changes: 7 additions & 7 deletions contracts/cw721-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cw721-base"
version = "0.12.0"
version = "0.13.1"
authors = [
"Ethan Frey <ethanfrey@users.noreply.github.com>",
"Orkun Külçe <orkun@deuslabs.fi>",
Expand Down Expand Up @@ -28,14 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
cw-utils = "0.12.1"
cw2 = "0.12.1"
cw721 = { path = "../../packages/cw721", version = "0.12.0" }
cw-storage-plus = "0.12.1"
cosmwasm-std = { version = "1.0.0-beta5" }
cw-utils = "0.13.1"
cw2 = "0.13.1"
cw721 = { path = "../../packages/cw721", version = "0.13.1" }
cw-storage-plus = "0.13.1"
cosmwasm-std = { version = "1.0.0-beta7" }
schemars = "0.8"
serde = { version = "1.0", default-features = false, features = ["derive"] }
thiserror = { version = "1.0" }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta7" }
20 changes: 10 additions & 10 deletions contracts/cw721-fixed-price/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cw721-fixed-price"
version = "0.12.0"
version = "0.13.1"
authors = ["Vernon Johnson <vtj2105@columbia.edu>"]
edition = "2018"

Expand Down Expand Up @@ -40,20 +40,20 @@ optimize = """docker run --rm -v "$(pwd)":/code \
"""

[dependencies]
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-storage = { version = "1.0.0-beta5" }
cw-storage-plus = "0.12.1"
cw2 = "0.12.1"
cosmwasm-std = { version = "1.0.0-beta7" }
cosmwasm-storage = { version = "1.0.0-beta7" }
cw-storage-plus = "0.13.1"
cw2 = "0.13.1"
schemars = "0.8.3"
cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
cw721-base = { path = "../cw721-base", version = "0.13.1", features = [
"library",
] }
cw20 = "0.12.1"
cw20 = "0.13.1"
serde = { version = "1.0.127", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.26" }
cw-utils = "0.12.1"
cw-utils = "0.13.1"
prost = "0.9.0"
cw3 = "0.12.1"
cw3 = "0.13.1"

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta7" }
16 changes: 8 additions & 8 deletions contracts/cw721-fixed-price/src/contract.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ pub fn execute_receive(
mod tests {
use super::*;
use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MOCK_CONTRACT_ADDR};
use cosmwasm_std::{from_binary, to_binary, ContractResult, SubMsgExecutionResponse};
use cosmwasm_std::{from_binary, to_binary, SubMsgExecutionResponse, SubMsgResult};
use prost::Message;

// Type for replies to contract instantiate messes
Expand Down Expand Up @@ -242,7 +242,7 @@ mod tests {

let reply_msg = Reply {
id: INSTANTIATE_TOKEN_REPLY_ID,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -346,7 +346,7 @@ mod tests {

let reply_msg = Reply {
id: INSTANTIATE_TOKEN_REPLY_ID,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -412,7 +412,7 @@ mod tests {

let reply_msg = Reply {
id: 10,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -453,7 +453,7 @@ mod tests {

let reply_msg = Reply {
id: 1,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -496,7 +496,7 @@ mod tests {

let reply_msg = Reply {
id: INSTANTIATE_TOKEN_REPLY_ID,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -585,7 +585,7 @@ mod tests {

let reply_msg = Reply {
id: INSTANTIATE_TOKEN_REPLY_ID,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down Expand Up @@ -638,7 +638,7 @@ mod tests {

let reply_msg = Reply {
id: INSTANTIATE_TOKEN_REPLY_ID,
result: ContractResult::Ok(SubMsgExecutionResponse {
result: SubMsgResult::Ok(SubMsgExecutionResponse {
events: vec![],
data: Some(encoded_instantiate_reply.into()),
}),
Expand Down
10 changes: 5 additions & 5 deletions contracts/cw721-metadata-onchain/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cw721-metadata-onchain"
version = "0.12.0"
version = "0.13.1"
authors = [
"Ethan Frey <ethanfrey@users.noreply.github.com>",
"Orkun Külçe <orkun@deuslabs.fi>",
Expand Down Expand Up @@ -28,14 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
cw721 = { path = "../../packages/cw721", version = "0.12.0" }
cw721-base = { path = "../cw721-base", version = "0.12.0", features = [
cw721 = { path = "../../packages/cw721", version = "0.13.1" }
cw721-base = { path = "../cw721-base", version = "0.13.1", features = [
"library",
] }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta7" }
schemars = "0.8"
serde = { version = "1.0.130", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.30" }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta7" }
Loading

0 comments on commit cbbdbff

Please sign in to comment.