diff --git a/Cargo.lock b/Cargo.lock index 7ed402f8a..90b1ec163 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,31 +49,31 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" [[package]] name = "cosmwasm-crypto" -version = "1.0.0-beta5" +version = "1.0.0-beta7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8904127a5b9e325ef5d6b2b3f997dcd74943cd35097139b1a4d15b1b6bccae66" +checksum = "88c2565b1e73a816fb659ef4838fc356143fbd35f43c48a51d2d7d4e5d6679d3" dependencies = [ "digest", "ed25519-zebra", "k256", - "rand_core 0.5.1", + "rand_core 0.6.3", "thiserror", ] [[package]] name = "cosmwasm-derive" -version = "1.0.0-beta5" +version = "1.0.0-beta7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14364ac4d9d085867929d0cf3e94b1d2100121ce02c33c72961406830002613" +checksum = "fa89fcdf8dbbe0088e663d0a814aa7368e7ebe8fb045a3a150fb5fdc2ffe3b45" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.0.0-beta5" +version = "1.0.0-beta7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2941b87c42620d348e96ed05876bfda0dc1d5454a646d780d32f114c04921d" +checksum = "63f79866e7b2190b6b6cb06959e308183c8d9511a8530f7292073f3cddc963db" dependencies = [ "schemars", "serde_json", @@ -81,13 +81,14 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.0.0-beta5" +version = "1.0.0-beta7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ece12e5bbde434b93937d7b2107e6291f11d69ffa72398c50e8bab41d451d3" +checksum = "bcb8f99a61d0b9069e1afc80a4ffea87dcc3523edd992080923870b13a677da0" dependencies = [ "base64", "cosmwasm-crypto", "cosmwasm-derive", + "forward_ref", "schemars", "serde", "serde-json-wasm", @@ -97,9 +98,9 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.0.0-beta5" +version = "1.0.0-beta7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e4338d8e9934effa4594f139ce4e5f4b426796b70e2d53bb7e8605e9adf68c" +checksum = "07f856099c824aa8f2488e62d1da3fc06383d3fdbc764573595f451be43441a2" dependencies = [ "cosmwasm-std", "serde", @@ -157,9 +158,9 @@ dependencies = [ [[package]] name = "cw-storage-plus" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c087ff98fb0475db4c2b5298a5fd12b2848d2854b39d1115d930ee6da24d1eed" +checksum = "5e8b7f9a758c030d375520df947323c052704f784561fc28dcaab4f988c50a30" dependencies = [ "cosmwasm-std", "schemars", @@ -168,9 +169,9 @@ dependencies = [ [[package]] name = "cw-utils" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3396c7aff5a0e3fb6dcc6cc89f56862c1d212b40d93ed725a6962955b1887ff" +checksum = "2aa10861dc5d74400eaf0ed920b6f8fdbc36ce53840ffee1688d9757dfc9fc9f" dependencies = [ "cosmwasm-std", "schemars", @@ -180,9 +181,9 @@ dependencies = [ [[package]] name = "cw2" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f8a6500c396e33f6a7b05d35a5124eb3e394cdb6ca901f7e88332870407896c" +checksum = "d686da2d2b3b646bea15d448dc25c3e132097a7c40ef9ba7b4db741375b6181f" dependencies = [ "cosmwasm-std", "cw-storage-plus", @@ -192,9 +193,9 @@ dependencies = [ [[package]] name = "cw20" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413911037f6b0106ae37ca82352f9131939ccc995aade435df47a5baf2c815f2" +checksum = "a8c18f816c73fcbb0897d2be4efeb6f1277602cc5b7acd5949a7ead20db0e682" dependencies = [ "cosmwasm-std", "cw-utils", @@ -204,7 +205,7 @@ dependencies = [ [[package]] name = "cw2981-royalties" -version = "0.12.0" +version = "0.13.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -217,9 +218,9 @@ dependencies = [ [[package]] name = "cw3" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017b6263414c58081cea97626f4d8da2dc8f7267337bba0eb5770260d26251e0" +checksum = "7b7c7a87aed0637432c9ec39a691e533e18006dd400c67bce9f0ad643de7d52c" dependencies = [ "cosmwasm-std", "cw-utils", @@ -229,7 +230,7 @@ dependencies = [ [[package]] name = "cw721" -version = "0.12.0" +version = "0.13.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -240,7 +241,7 @@ dependencies = [ [[package]] name = "cw721-base" -version = "0.12.0" +version = "0.13.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -255,7 +256,7 @@ dependencies = [ [[package]] name = "cw721-fixed-price" -version = "0.12.0" +version = "0.13.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -274,7 +275,7 @@ dependencies = [ [[package]] name = "cw721-metadata-onchain" -version = "0.12.0" +version = "0.13.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -323,16 +324,17 @@ dependencies = [ [[package]] name = "ed25519-zebra" -version = "2.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a128b76af6dd4b427e34a6fd43dc78dbfe73672ec41ff615a2414c1a0ad0409" +checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" dependencies = [ "curve25519-dalek", "hex", - "rand_core 0.5.1", + "rand_core 0.6.3", "serde", "sha2", "thiserror", + "zeroize", ] [[package]] @@ -367,6 +369,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "forward_ref" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" + [[package]] name = "generic-array" version = "0.14.5" diff --git a/contracts/cw2981-royalties/Cargo.toml b/contracts/cw2981-royalties/Cargo.toml index 5bb2f5561..b23f941c3 100644 --- a/contracts/cw2981-royalties/Cargo.toml +++ b/contracts/cw2981-royalties/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw2981-royalties" -version = "0.12.0" +version = "0.13.1" authors = ["Alex Lynham "] edition = "2018" description = "Basic implementation of royalties for cw721 NFTs with token level royalties" @@ -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" } diff --git a/contracts/cw721-base/Cargo.toml b/contracts/cw721-base/Cargo.toml index 339b845f0..10438c2d0 100644 --- a/contracts/cw721-base/Cargo.toml +++ b/contracts/cw721-base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721-base" -version = "0.12.0" +version = "0.13.1" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -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" } diff --git a/contracts/cw721-fixed-price/Cargo.toml b/contracts/cw721-fixed-price/Cargo.toml index ff367cbaa..a8319c9a4 100644 --- a/contracts/cw721-fixed-price/Cargo.toml +++ b/contracts/cw721-fixed-price/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721-fixed-price" -version = "0.12.0" +version = "0.13.1" authors = ["Vernon Johnson "] edition = "2018" @@ -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" } diff --git a/contracts/cw721-fixed-price/src/contract.rs b/contracts/cw721-fixed-price/src/contract.rs index 83b88b007..570361046 100644 --- a/contracts/cw721-fixed-price/src/contract.rs +++ b/contracts/cw721-fixed-price/src/contract.rs @@ -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 @@ -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()), }), @@ -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()), }), @@ -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()), }), @@ -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()), }), @@ -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()), }), @@ -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()), }), @@ -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()), }), diff --git a/contracts/cw721-metadata-onchain/Cargo.toml b/contracts/cw721-metadata-onchain/Cargo.toml index 1a5963239..71c58224a 100644 --- a/contracts/cw721-metadata-onchain/Cargo.toml +++ b/contracts/cw721-metadata-onchain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721-metadata-onchain" -version = "0.12.0" +version = "0.13.1" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -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" } diff --git a/packages/cw721/Cargo.toml b/packages/cw721/Cargo.toml index 6bc7200cb..fb501281f 100644 --- a/packages/cw721/Cargo.toml +++ b/packages/cw721/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721" -version = "0.12.0" +version = "0.13.1" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -13,10 +13,10 @@ homepage = "https://cosmwasm.com" documentation = "https://docs.cosmwasm.com" [dependencies] -cw-utils = "0.12.1" -cosmwasm-std = { version = "1.0.0-beta5" } +cw-utils = "0.13.1" +cosmwasm-std = { version = "1.0.0-beta7" } schemars = "0.8" serde = { version = "1.0", default-features = false, features = ["derive"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta5" } +cosmwasm-schema = { version = "1.0.0-beta7" }