diff --git a/.circleci/config.yml b/.circleci/config.yml index 99cd4ebba..8e48328df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ workflows: jobs: contract_cw721_base: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 working_directory: ~/project/contracts/cw721-base steps: - checkout: @@ -31,7 +31,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -53,12 +53,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw721-base-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} - + key: cargocache-cw721-base-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} contract_cw721_metadata_onchain: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 working_directory: ~/project/contracts/cw721-metadata-onchain steps: - checkout: @@ -68,7 +67,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw721-metadata-onchain-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -90,12 +89,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw721-metadata-onchain-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} - + key: cargocache-cw721-metadata-onchain-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} contract_cw721_fixed_price: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 working_directory: ~/project/contracts/cw721-fixed-price steps: - checkout: @@ -105,7 +103,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-cw721-fixed-price-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -127,12 +125,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-cw721-fixed-price-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} - + key: cargocache-cw721-fixed-price-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} package_cw721: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 working_directory: ~/project/packages/cw721 steps: - checkout: @@ -142,7 +139,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-cw721:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -165,11 +162,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-cw721:1.55.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-cw721:1.58.1-{{ checksum "~/project/Cargo.lock" }} lint: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 steps: - checkout - run: @@ -177,7 +174,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }} - run: name: Add rustfmt component command: rustup component add rustfmt @@ -196,7 +193,7 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-lint-rust:1.55.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-lint-rust:1.58.1-{{ checksum "Cargo.lock" }} # This runs one time on the top level to ensure all contracts compile properly into wasm. # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time @@ -204,7 +201,7 @@ jobs: # We also sanity-check the resultant wasm files. wasm-build: docker: - - image: rust:1.55.0 + - image: rust:1.58.1 steps: - checkout: path: ~/project @@ -213,7 +210,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown @@ -228,12 +225,12 @@ jobs: - run: name: Install check_contract # Uses --debug for compilation speed - command: cargo install --debug --version 1.0.0-beta2 --features iterator --example check_contract --locked -- cosmwasm-vm + command: cargo install --debug --version 1.0.0-beta8 --features iterator --example check_contract --locked -- cosmwasm-vm - save_cache: paths: - /usr/local/cargo/registry - target - key: cargocache-wasm-rust:1.55.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-wasm-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Check wasm contracts command: | diff --git a/Cargo.lock b/Cargo.lock index 90b1ec163..4cd2a9432 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,9 +49,9 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" [[package]] name = "cosmwasm-crypto" -version = "1.0.0-beta7" +version = "1.0.0-beta8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c2565b1e73a816fb659ef4838fc356143fbd35f43c48a51d2d7d4e5d6679d3" +checksum = "37e70111e9701c3ec43bfbff0e523cd4cb115876b4d3433813436dd0934ee962" dependencies = [ "digest", "ed25519-zebra", @@ -62,18 +62,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.0.0-beta7" +version = "1.0.0-beta8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa89fcdf8dbbe0088e663d0a814aa7368e7ebe8fb045a3a150fb5fdc2ffe3b45" +checksum = "58bc2ad5d86be5f6068833f63e20786768db6890019c095dd7775232184fb7b3" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.0.0-beta7" +version = "1.0.0-beta8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f79866e7b2190b6b6cb06959e308183c8d9511a8530f7292073f3cddc963db" +checksum = "0d75f6a05667d8613b24171ef2c77a8bf6fb9c14f9e3aaa39aa10e0c6416ed67" dependencies = [ "schemars", "serde_json", @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.0.0-beta7" +version = "1.0.0-beta8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb8f99a61d0b9069e1afc80a4ffea87dcc3523edd992080923870b13a677da0" +checksum = "915ca82bd944f116f3a9717481f3fa657e4a73f28c4887288761ebb24e6fbe10" dependencies = [ "base64", "cosmwasm-crypto", @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.0.0-beta7" +version = "1.0.0-beta8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f856099c824aa8f2488e62d1da3fc06383d3fdbc764573595f451be43441a2" +checksum = "1c4be9fd8c9d3ae7d0c32a925ecbc20707007ce0cba1f7538c0d78b7a2d3729b" dependencies = [ "cosmwasm-std", "serde", @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "cw-storage-plus" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e8b7f9a758c030d375520df947323c052704f784561fc28dcaab4f988c50a30" +checksum = "9336ecef1e19d56cf6e3e932475fc6a3dee35eec5a386e07917a1d1ba6bb0e35" dependencies = [ "cosmwasm-std", "schemars", @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "cw-utils" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa10861dc5d74400eaf0ed920b6f8fdbc36ce53840ffee1688d9757dfc9fc9f" +checksum = "babd2c090f39d07ce5bf2556962305e795daa048ce20a93709eb591476e4a29e" dependencies = [ "cosmwasm-std", "schemars", @@ -181,9 +181,9 @@ dependencies = [ [[package]] name = "cw2" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686da2d2b3b646bea15d448dc25c3e132097a7c40ef9ba7b4db741375b6181f" +checksum = "993df11574f29574dd443eb0c189484bb91bc0638b6de3e32ab7f9319c92122d" dependencies = [ "cosmwasm-std", "cw-storage-plus", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "cw20" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c18f816c73fcbb0897d2be4efeb6f1277602cc5b7acd5949a7ead20db0e682" +checksum = "356d364602c5fe763544ea00d485b825d6ef519a2fc6a3145528d7df3a603f40" dependencies = [ "cosmwasm-std", "cw-utils", @@ -205,7 +205,7 @@ dependencies = [ [[package]] name = "cw2981-royalties" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -218,9 +218,9 @@ dependencies = [ [[package]] name = "cw3" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7c7a87aed0637432c9ec39a691e533e18006dd400c67bce9f0ad643de7d52c" +checksum = "f871854338a54c7bb094d16ffe17212b93b146d9659dbce4c9402a9b77e240ef" dependencies = [ "cosmwasm-std", "cw-utils", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "cw721" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "cw721-base" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -256,7 +256,7 @@ dependencies = [ [[package]] name = "cw721-fixed-price" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -275,7 +275,7 @@ dependencies = [ [[package]] name = "cw721-metadata-onchain" -version = "0.13.1" +version = "0.13.2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -706,9 +706,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" dependencies = [ "byteorder", "crunchy", diff --git a/contracts/cw2981-royalties/Cargo.toml b/contracts/cw2981-royalties/Cargo.toml index b23f941c3..3416cda34 100644 --- a/contracts/cw2981-royalties/Cargo.toml +++ b/contracts/cw2981-royalties/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw2981-royalties" -version = "0.13.1" +version = "0.13.2" 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.13.1" } -cw721-base = { path = "../cw721-base", version = "0.13.1", features = [ +cw721 = { path = "../../packages/cw721", version = "0.13.2" } +cw721-base = { path = "../cw721-base", version = "0.13.2", features = [ "library", ] } -cosmwasm-std = { version = "1.0.0-beta7" } +cosmwasm-std = { version = "1.0.0-beta8" } 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-beta7" } +cosmwasm-schema = { version = "1.0.0-beta8" } diff --git a/contracts/cw2981-royalties/src/lib.rs b/contracts/cw2981-royalties/src/lib.rs index be2b5d6d1..c474003cc 100644 --- a/contracts/cw2981-royalties/src/lib.rs +++ b/contracts/cw2981-royalties/src/lib.rs @@ -186,12 +186,12 @@ mod tests { let token_id = "Enterprise"; let mint_msg = MintMsg { token_id: token_id.to_string(), - owner: "JeanLuc".to_string(), + owner: "jeanluc".to_string(), token_uri: Some("https://starships.example.com/Starship/Enterprise.json".into()), extension: Some(Metadata { description: Some("Spaceship with Warp Drive".into()), name: Some("Starship USS Enterprise".to_string()), - royalty_payment_address: Some("JeanLuc".to_string()), + royalty_payment_address: Some("jeanluc".to_string()), royalty_percentage: Some(10), ..Metadata::default() }), @@ -221,12 +221,12 @@ mod tests { let voyager_token_id = "Voyager"; let second_mint_msg = MintMsg { token_id: voyager_token_id.to_string(), - owner: "Janeway".to_string(), + owner: "janeway".to_string(), token_uri: Some("https://starships.example.com/Starship/Voyager.json".into()), extension: Some(Metadata { description: Some("Spaceship with Warp Drive".into()), name: Some("Starship USS Voyager".to_string()), - royalty_payment_address: Some("Janeway".to_string()), + royalty_payment_address: Some("janeway".to_string()), royalty_percentage: Some(4), ..Metadata::default() }), diff --git a/contracts/cw721-base/Cargo.toml b/contracts/cw721-base/Cargo.toml index 10438c2d0..76a6d97aa 100644 --- a/contracts/cw721-base/Cargo.toml +++ b/contracts/cw721-base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721-base" -version = "0.13.1" +version = "0.13.2" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -28,14 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -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" } +cw-utils = "0.13.2" +cw2 = "0.13.2" +cw721 = { path = "../../packages/cw721", version = "0.13.2" } +cw-storage-plus = "0.13.2" +cosmwasm-std = { version = "1.0.0-beta8" } schemars = "0.8" serde = { version = "1.0", default-features = false, features = ["derive"] } thiserror = { version = "1.0" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta7" } +cosmwasm-schema = { version = "1.0.0-beta8" } diff --git a/contracts/cw721-base/src/contract_tests.rs b/contracts/cw721-base/src/contract_tests.rs index 2b840249c..c578921b0 100644 --- a/contracts/cw721-base/src/contract_tests.rs +++ b/contracts/cw721-base/src/contract_tests.rs @@ -681,9 +681,9 @@ fn query_tokens_by_owner() { // Mint a couple tokens (from the same owner) let token_id1 = "grow1".to_string(); - let demeter = String::from("Demeter"); + let demeter = String::from("demeter"); let token_id2 = "grow2".to_string(); - let ceres = String::from("Ceres"); + let ceres = String::from("ceres"); let token_id3 = "sing".to_string(); let mint_msg = ExecuteMsg::Mint(MintMsg:: { diff --git a/contracts/cw721-fixed-price/Cargo.toml b/contracts/cw721-fixed-price/Cargo.toml index a8319c9a4..c44de8250 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.13.1" +version = "0.13.2" authors = ["Vernon Johnson "] edition = "2018" @@ -40,20 +40,20 @@ optimize = """docker run --rm -v "$(pwd)":/code \ """ [dependencies] -cosmwasm-std = { version = "1.0.0-beta7" } -cosmwasm-storage = { version = "1.0.0-beta7" } -cw-storage-plus = "0.13.1" -cw2 = "0.13.1" +cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-storage = { version = "1.0.0-beta8" } +cw-storage-plus = "0.13.2" +cw2 = "0.13.2" schemars = "0.8.3" -cw721-base = { path = "../cw721-base", version = "0.13.1", features = [ +cw721-base = { path = "../cw721-base", version = "0.13.2", features = [ "library", ] } -cw20 = "0.13.1" +cw20 = "0.13.2" serde = { version = "1.0.127", default-features = false, features = ["derive"] } thiserror = { version = "1.0.26" } -cw-utils = "0.13.1" +cw-utils = "0.13.2" prost = "0.9.0" -cw3 = "0.13.1" +cw3 = "0.13.2" [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta7" } +cosmwasm-schema = { version = "1.0.0-beta8" } diff --git a/contracts/cw721-metadata-onchain/Cargo.toml b/contracts/cw721-metadata-onchain/Cargo.toml index 71c58224a..48a5cd345 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.13.1" +version = "0.13.2" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -28,14 +28,14 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw721 = { path = "../../packages/cw721", version = "0.13.1" } -cw721-base = { path = "../cw721-base", version = "0.13.1", features = [ +cw721 = { path = "../../packages/cw721", version = "0.13.2" } +cw721-base = { path = "../cw721-base", version = "0.13.2", features = [ "library", ] } -cosmwasm-std = { version = "1.0.0-beta7" } +cosmwasm-std = { version = "1.0.0-beta8" } 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-beta7" } +cosmwasm-schema = { version = "1.0.0-beta8" } diff --git a/packages/cw721/Cargo.toml b/packages/cw721/Cargo.toml index fb501281f..60358b207 100644 --- a/packages/cw721/Cargo.toml +++ b/packages/cw721/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cw721" -version = "0.13.1" +version = "0.13.2" authors = [ "Ethan Frey ", "Orkun Külçe ", @@ -13,10 +13,10 @@ homepage = "https://cosmwasm.com" documentation = "https://docs.cosmwasm.com" [dependencies] -cw-utils = "0.13.1" -cosmwasm-std = { version = "1.0.0-beta7" } +cw-utils = "0.13.2" +cosmwasm-std = { version = "1.0.0-beta8" } schemars = "0.8" serde = { version = "1.0", default-features = false, features = ["derive"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta7" } +cosmwasm-schema = { version = "1.0.0-beta8" }