Skip to content

Commit

Permalink
Merge pull request CosmWasm#672 from CosmWasm/update-cosmwasm
Browse files Browse the repository at this point in the history 
Update cosmwasm to 1.0.0-beta6
  • Loading branch information
@webmaster128
webmaster128 authored Mar 7, 2022
2 parents 33be660 + 45a2776 commit 1fa92d7
Show file tree
Hide file tree
Showing 25 changed files with 72 additions and 65 deletions.
27 changes: 17 additions & 10 deletions Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions contracts/cw1-subkeys/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw1 = { path = "../../packages/cw1", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.12.1", features = ["library"] }
cosmwasm-std = { version = "1.0.0-beta5", features = ["staking"] }
cosmwasm-std = { version = "1.0.0-beta6", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = "1.0.23"
semver = "1"

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
cw1-whitelist = { path = "../cw1-whitelist", version = "0.12.1", features = ["library", "test-utils"] }
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist-ng/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ multitest = ["cw-multi-test", "anyhow"]
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw1 = { path = "../../packages/cw1", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5", features = ["staking"] }
cosmwasm-std = { version = "1.0.0-beta6", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand All @@ -36,6 +36,6 @@ anyhow = { version = "1", optional = true }
[dev-dependencies]
anyhow = "1"
assert_matches = "1"
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.12.1" }
derivative = "2"
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test-utils = []
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw1 = { path = "../../packages/cw1", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5", features = ["staking"] }
cosmwasm-std = { version = "1.0.0-beta6", features = ["staking"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand All @@ -31,6 +31,6 @@ thiserror = { version = "1.0.23" }
[dev-dependencies]
anyhow = "1"
assert_matches = "1"
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.12.1" }
derivative = "2"
4 changes: 2 additions & 2 deletions contracts/cw1155-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw1155 = { path = "../../packages/cw1155", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.20" }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
4 changes: 2 additions & 2 deletions contracts/cw20-base/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw20 = { path = "../../packages/cw20", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
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-beta6" }
4 changes: 2 additions & 2 deletions contracts/cw20-ics20/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ library = []
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw20 = { path = "../../packages/cw20", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5", features = ["stargate"] }
cosmwasm-std = { version = "1.0.0-beta6", features = ["stargate"] }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cw-controllers = { path = "../../packages/controllers", version = "0.12.1" }
schemars = "0.8.1"
Expand All @@ -30,4 +30,4 @@ 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-beta6" }
16 changes: 8 additions & 8 deletions contracts/cw20-ics20/src/ibc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

use cosmwasm_std::{
attr, entry_point, from_binary, to_binary, BankMsg, Binary, ContractResult, CosmosMsg, Deps,
DepsMut, Env, IbcBasicResponse, IbcChannel, IbcChannelCloseMsg, IbcChannelConnectMsg,
IbcChannelOpenMsg, IbcEndpoint, IbcOrder, IbcPacket, IbcPacketAckMsg, IbcPacketReceiveMsg,
IbcPacketTimeoutMsg, IbcReceiveResponse, Reply, Response, SubMsg, Uint128, WasmMsg,
attr, entry_point, from_binary, to_binary, BankMsg, Binary, CosmosMsg, Deps, DepsMut, Env,
IbcBasicResponse, IbcChannel, IbcChannelCloseMsg, IbcChannelConnectMsg, IbcChannelOpenMsg,
IbcEndpoint, IbcOrder, IbcPacket, IbcPacketAckMsg, IbcPacketReceiveMsg, IbcPacketTimeoutMsg,
IbcReceiveResponse, Reply, Response, SubMsg, SubMsgResult, Uint128, WasmMsg,
};

use crate::amount::Amount;
Expand Down Expand Up @@ -87,8 +87,8 @@ const ACK_FAILURE_ID: u64 = 0xfa17;
pub fn reply(deps: DepsMut, _env: Env, reply: Reply) -> Result<Response, ContractError> {
match reply.id {
RECEIVE_ID => match reply.result {
ContractResult::Ok(_) => Ok(Response::new()),
ContractResult::Err(err) => {
SubMsgResult::Ok(_) => Ok(Response::new()),
SubMsgResult::Err(err) => {
// Important design note: with ibcv2 and wasmd 0.22 we can implement this all much easier.
// No reply needed... the receive function and submessage should return error on failure and all
// state gets reverted with a proper app-level message auto-generated
Expand All @@ -113,8 +113,8 @@ pub fn reply(deps: DepsMut, _env: Env, reply: Reply) -> Result<Response, Contrac
}
},
ACK_FAILURE_ID => match reply.result {
ContractResult::Ok(_) => Ok(Response::new()),
ContractResult::Err(err) => Ok(Response::new().set_data(ack_fail(err))),
SubMsgResult::Ok(_) => Ok(Response::new()),
SubMsgResult::Err(err) => Ok(Response::new().set_data(ack_fail(err))),
},
_ => Err(ContractError::UnknownReplyId { id: reply.id }),
}
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw3-fixed-multisig/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw3 = { path = "../../packages/cw3", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
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-beta6" }
cw20 = { path = "../../packages/cw20", version = "0.12.1" }
cw20-base = { path = "../cw20-base", version = "0.12.1", features = ["library"] }
cw-multi-test = { path = "../../packages/multi-test", version = "0.12.1" }
4 changes: 2 additions & 2 deletions contracts/cw3-flex-multisig/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ cw3 = { path = "../../packages/cw3", version = "0.12.1" }
cw3-fixed-multisig = { path = "../cw3-fixed-multisig", version = "0.12.1", features = ["library"] }
cw4 = { path = "../../packages/cw4", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
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-beta6" }
cw4-group = { path = "../cw4-group", version = "0.12.1" }
cw-multi-test = { path = "../../packages/multi-test", version = "0.12.1" }
4 changes: 2 additions & 2 deletions contracts/cw4-group/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ cw2 = { path = "../../packages/cw2", version = "0.12.1" }
cw4 = { path = "../../packages/cw4", version = "0.12.1" }
cw-controllers = { path = "../../packages/controllers", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
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-beta6" }
4 changes: 2 additions & 2 deletions contracts/cw4-stake/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ cw4 = { path = "../../packages/cw4", version = "0.12.1" }
cw20 = { path = "../../packages/cw20", version = "0.12.1" }
cw-controllers = { path = "../../packages/controllers", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
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-beta6" }
2 changes: 1 addition & 1 deletion packages/controllers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.cosmwasm.com"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
cw-utils = { path = "../utils", version = "0.12.1" }
cw-storage-plus = { path = "../storage-plus", version = "0.12.1" }
schemars = "0.8.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/cw1/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[dependencies]
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
4 changes: 2 additions & 2 deletions packages/cw1155/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
2 changes: 1 addition & 1 deletion packages/cw2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage = "https://cosmwasm.com"
documentation = "https://docs.cosmwasm.com"

[dependencies]
cosmwasm-std = { version = "1.0.0-beta5", default-features = false }
cosmwasm-std = { version = "1.0.0-beta6", default-features = false }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
4 changes: 2 additions & 2 deletions packages/cw20/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
4 changes: 2 additions & 2 deletions packages/cw3/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
4 changes: 2 additions & 2 deletions packages/cw4/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ documentation = "https://docs.cosmwasm.com"

[dependencies]
cw-storage-plus = { path = "../storage-plus", version = "0.12.1" }
cosmwasm-std = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6" }
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0-beta5" }
cosmwasm-schema = { version = "1.0.0-beta6" }
4 changes: 2 additions & 2 deletions packages/multi-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ backtrace = ["anyhow/backtrace"]
[dependencies]
cw-utils = { path = "../../packages/utils", version = "0.12.1" }
cw-storage-plus = { path = "../../packages/storage-plus", version = "0.12.1"}
cosmwasm-std = { version = "1.0.0-beta5", features = ["staking"] }
cosmwasm-storage = { version = "1.0.0-beta5" }
cosmwasm-std = { version = "1.0.0-beta6", features = ["staking"] }
cosmwasm-storage = { version = "1.0.0-beta6" }
itertools = "0.10.1"
schemars = "0.8.1"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions packages/multi-test/src/test_helpers/contracts/echo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
//! Additionally it bypass all events and attributes send to it
use cosmwasm_std::{
to_binary, Attribute, Binary, ContractResult, Deps, DepsMut, Empty, Env, Event, MessageInfo,
Reply, Response, StdError, SubMsg, SubMsgExecutionResponse,
to_binary, Attribute, Binary, Deps, DepsMut, Empty, Env, Event, MessageInfo, Reply, Response,
StdError, SubMsg, SubMsgExecutionResponse, SubMsgResult,
};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

Expand Down Expand Up @@ -98,7 +98,7 @@ where
if let Reply {
id,
result:
ContractResult::Ok(SubMsgExecutionResponse {
SubMsgResult::Ok(SubMsgExecutionResponse {
data: Some(data), ..
}),
} = msg
Expand Down
Loading

0 comments on commit 1fa92d7

Please sign in to comment.