diff --git a/.circleci/config.yml b/.circleci/config.yml index 93362ee5b5..866f07aeb7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ workflows: matrix: parameters: # Run with MSRV and some modern stable Rust - rust-version: ["1.54.0", "1.59.0"] + rust-version: ["1.56.1", "1.59.0"] - benchmarking: requires: - package_vm @@ -64,7 +64,7 @@ jobs: command: | wget https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init chmod +x rustup-init - ./rustup-init -y --default-toolchain 1.54.0 --profile minimal + ./rustup-init -y --default-toolchain 1.56.1 --profile minimal - run: name: Version information command: rustc --version; cargo --version; rustup --version; rustup target list --installed @@ -73,7 +73,7 @@ jobs: command: rustup target add wasm32-unknown-unknown && rustup target list --installed - restore_cache: keys: - - cargocache-v2-arm64-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-arm64-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: "contracts/crypto-verify: integration-test" working_directory: ~/project/contracts/crypto-verify @@ -113,11 +113,11 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-arm64-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-arm64-rust:1.56.1-{{ checksum "Cargo.lock" }} package_crypto: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 steps: - checkout - run: @@ -125,7 +125,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-package_crypto-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-package_crypto-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Build working_directory: ~/project/packages/crypto @@ -140,11 +140,11 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-package_crypto-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-package_crypto-rust:1.56.1-{{ checksum "Cargo.lock" }} package_schema: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 steps: - checkout - run: @@ -152,7 +152,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-package_schema-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-package_schema-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Build working_directory: ~/project/packages/schema @@ -167,11 +167,14 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-package_schema-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-package_schema-rust:1.56.1-{{ checksum "Cargo.lock" }} package_std: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 + environment: + # Limit the number of parallel jobs to avoid OOM crashes during doc testing + RUST_TEST_THREADS: 8 steps: - checkout - run: @@ -179,7 +182,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-package_std-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-package_std-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -226,11 +229,11 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-package_std-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-package_std-rust:1.56.1-{{ checksum "Cargo.lock" }} package_storage: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 steps: - checkout - run: @@ -238,7 +241,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-package_storage-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-package_storage-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Build library for native target working_directory: ~/project/packages/storage @@ -257,11 +260,11 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-package_storage-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-package_storage-rust:1.56.1-{{ checksum "Cargo.lock" }} package_vm: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 steps: - checkout - run: @@ -269,7 +272,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-package_vm-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-package_vm-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Build working_directory: ~/project/packages/vm @@ -292,11 +295,11 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-package_vm-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-package_vm-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_burner: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/burner @@ -308,7 +311,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_burner-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_burner-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -342,11 +345,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_burner-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_burner-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_crypto_verify: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/crypto-verify @@ -358,7 +361,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_crypto_verify-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_crypto_verify-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -392,11 +395,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_crypto_verify-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_crypto_verify-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_hackatom: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/hackatom @@ -408,7 +411,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_hackatom-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_hackatom-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -442,11 +445,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_hackatom-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_hackatom-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_ibc_reflect: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/ibc-reflect @@ -458,7 +461,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_ibc_reflect-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_ibc_reflect-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -492,11 +495,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_ibc_reflect-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_ibc_reflect-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_ibc_reflect_send: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/ibc-reflect-send @@ -508,7 +511,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_ibc_reflect_send-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_ibc_reflect_send-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -542,11 +545,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_ibc_reflect_send-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_ibc_reflect_send-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_floaty: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/floaty @@ -558,7 +561,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_floaty-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_floaty-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -568,6 +571,9 @@ jobs: - run: name: Unit tests command: cargo unit-test --locked + - run: + name: Integration tests (singlepass backend) + command: cargo integration-test --locked --no-default-features - run: name: Build and run schema generator command: cargo schema --locked @@ -589,11 +595,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_floaty-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_floaty-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_queue: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/queue @@ -605,7 +611,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_queue-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_queue-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -639,11 +645,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_queue-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_queue-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_reflect: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/reflect @@ -655,7 +661,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_reflect-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_reflect-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -689,11 +695,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_reflect-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_reflect-rust:1.56.1-{{ checksum "Cargo.lock" }} contract_staking: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/staking @@ -705,7 +711,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_staking-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_staking-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown && rustup target list --installed @@ -739,11 +745,11 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_staking-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_staking-rust:1.56.1-{{ checksum "Cargo.lock" }} fmt: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 steps: - checkout - run: @@ -751,7 +757,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-fmt-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-fmt-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Add rustfmt component command: rustup component add rustfmt @@ -792,7 +798,7 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-fmt-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-fmt-rust:1.56.1-{{ checksum "Cargo.lock" }} fmt_extra: docker: @@ -966,7 +972,7 @@ jobs: benchmarking: docker: - - image: rust:1.54.0 + - image: rust:1.56.1 environment: RUST_BACKTRACE: 1 steps: @@ -976,7 +982,7 @@ jobs: command: rustc --version && cargo --version - restore_cache: keys: - - cargocache-v2-benchmarking-rust:1.54.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-benchmarking-rust:1.56.1-{{ checksum "Cargo.lock" }} - run: name: Run vm benchmarks (Singlepass) working_directory: ~/project/packages/vm @@ -994,7 +1000,7 @@ jobs: - target/release/.fingerprint - target/release/build - target/release/deps - key: cargocache-v2-benchmarking-rust:1.54.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-benchmarking-rust:1.56.1-{{ checksum "Cargo.lock" }} # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/ build_and_upload_devcontracts: @@ -1027,7 +1033,7 @@ jobs: name: Check development contracts command: | echo "Checking all contracts under ./artifacts" - docker run --volumes-from with_code rust:1.54.0 \ + docker run --volumes-from with_code rust:1.56.1 \ /bin/bash -e -c 'export GLOBIGNORE="../../artifacts/floaty.wasm"; cd ./code/packages/vm; ./examples/check_contract.sh ../../artifacts/*.wasm' docker cp with_code:/code/artifacts . - run: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c23cc2e143..53e11d7cb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.54.0 + toolchain: 1.56.1 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e3ee30f8..4d10f69646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to [#1226]: https://github.com/CosmWasm/cosmwasm/issues/1226 +### Changed + +- all: Drop support for Rust versions lower than 1.56.1. + ## [0.16.6] - 2022-03-21 ### Added diff --git a/Cargo.lock b/Cargo.lock index 98cc98d671..5c425b3e68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -787,6 +787,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -831,7 +840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -1032,7 +1041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1320,12 +1329,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1334,9 +1343,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1686,9 +1695,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/burner/Cargo.lock b/contracts/burner/Cargo.lock index 0c73537248..2ef7e4efc6 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -632,6 +632,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -670,7 +679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -834,7 +843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1067,12 +1076,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1081,9 +1090,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1364,9 +1373,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index 7f1f60d88c..c12d00ed53 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -659,6 +659,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -703,7 +712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -873,7 +882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1106,12 +1115,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1120,9 +1129,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1431,9 +1440,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index c9f8c36fdc..a4794f103e 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -643,6 +643,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -681,7 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -845,7 +854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1078,12 +1087,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1092,9 +1101,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1375,9 +1384,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/floaty/Cargo.toml b/contracts/floaty/Cargo.toml index 0ef1a58beb..66ae2e52ad 100644 --- a/contracts/floaty/Cargo.toml +++ b/contracts/floaty/Cargo.toml @@ -39,4 +39,4 @@ thiserror = "1.0" [dev-dependencies] cosmwasm-schema = { path = "../../packages/schema" } cosmwasm-storage = { path = "../../packages/storage" } -cosmwasm-vm = { path = "../../packages/vm", default-features = false } +cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["iterator"] } diff --git a/contracts/floaty/tests/integration.rs b/contracts/floaty/tests/integration.rs new file mode 100644 index 0000000000..5d3de04e58 --- /dev/null +++ b/contracts/floaty/tests/integration.rs @@ -0,0 +1,12 @@ +use cosmwasm_vm::testing::mock_instance; + +// This line will test the output of cargo wasm +static WASM: &[u8] = include_bytes!("../target/wasm32-unknown-unknown/release/floaty.wasm"); +// You can uncomment this line instead to test productionified build from rust-optimizer +// static WASM: &[u8] = include_bytes!("../contract.wasm"); + +#[test] +#[should_panic(expected = "Float operator detected")] +fn instantiate_fails() { + let mut _deps = mock_instance(WASM, &[]); +} diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index c55cc875a5..6762976894 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -643,6 +643,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -681,7 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -845,7 +854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1078,12 +1087,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1092,9 +1101,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1375,9 +1384,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index dfc0607209..8b40a13a9c 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -629,6 +629,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -679,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -843,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1076,12 +1085,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1090,9 +1099,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1373,9 +1382,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 06281c781f..a05df69ce1 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -629,6 +629,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -679,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -843,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1076,12 +1085,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1090,9 +1099,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1373,9 +1382,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/queue/Cargo.lock b/contracts/queue/Cargo.lock index c3824b43a4..b7a5d0c133 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -621,6 +621,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -659,7 +668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -823,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1067,12 +1076,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1081,9 +1090,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1364,9 +1373,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/queue/src/contract.rs b/contracts/queue/src/contract.rs index 9b8c45f3fa..a6875cfaee 100644 --- a/contracts/queue/src/contract.rs +++ b/contracts/queue/src/contract.rs @@ -117,10 +117,8 @@ fn handle_dequeue(deps: DepsMut) -> StdResult { // remove from storage and return old value deps.storage.remove(&key); res.data = Some(Binary(value)); - Ok(res) - } else { - Ok(res) } + Ok(res) } #[cfg_attr(not(feature = "library"), entry_point)] diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 47158776e7..551898b703 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -629,6 +629,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -667,7 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -831,7 +840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1077,12 +1086,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1091,9 +1100,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1374,9 +1383,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/staking/Cargo.lock b/contracts/staking/Cargo.lock index 45c828d9bf..07eed28215 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -635,6 +635,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "hermit-abi" version = "0.1.19" @@ -673,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "serde", ] @@ -837,7 +846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "crc32fast", - "hashbrown", + "hashbrown 0.11.2", "indexmap", "memchr", ] @@ -1070,12 +1079,12 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" +checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" dependencies = [ "bytecheck", - "hashbrown", + "hashbrown 0.12.0", "ptr_meta", "rend", "rkyv_derive", @@ -1084,9 +1093,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.31" +version = "0.7.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" +checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2", "quote", @@ -1401,9 +1410,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[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/docs/MSRV.md b/docs/MSRV.md index f370278442..ca8292dd35 100644 --- a/docs/MSRV.md +++ b/docs/MSRV.md @@ -1,53 +1,11 @@ # Minimum Supported Rust Version (MSRV) -This repository has two independent MSRVs, one for the standard library that is -compiled into contracts (cosmwasm-std MSRV) and one for the virtual machine -executing contracts (cosmwasm-vm MSRV). The other packages belong to one of the -two: - -| Crate | MSRV | -| ---------------- | ----------------- | -| cosmwasm-crypto | cosmwasm-std MSRV | -| cosmwasm-derive | cosmwasm-std MSRV | -| cosmwasm-schema | cosmwasm-std MSRV | -| cosmwasm-std | cosmwasm-std MSRV | -| cosmwasm-storage | cosmwasm-std MSRV | -| cosmwasm-vm | cosmwasm-vm MSRV | - -The reason for this is that cosmwasm-std has a wider audience than cosmwasm-vm -and we try to change the MSRV less frequently, allowing contract developers to -pick their favourite compiler version without getting disrupted. Another reason -is that cosmwasm-vm depends on [Wasmer], which bump their MSRV frequently. -Please note that as soon as you start using integration tests for contract -development, you will depends on the cosmwasm-vm MSRV. - -[wasmer]: https://github.com/wasmerio/wasmer - -## Latest changes - -| Version | cosmwasm-std MSRV | cosmwasm-vm MSRV | Notes | -| ------- | ----------------- | ---------------- | -------------------------------- | -| 0.16.4 | 1.54.0 | 1.54.0 | | -| 0.14.0 | 1.51.0 | 1.51.0 | Added support for const generics | -| 0.13.2 | 1.47.0 | 1.48.0 | Through [Wasmer 1.0.1] | -| 0.13.0 | 1.47.0 | 1.47.0 | | -| 0.11.0 | 1.45.2 | 1.45.2 | | - -[wasmer 1.0.1]: - https://github.com/wasmerio/wasmer/blob/master/CHANGELOG.md#101---2021-01-12 - -## Policy - -**cosmwasm-std MSRV** - -- It must always be at least one minor version behind latest stable. E.g. with - stable Rust 1.33.3 it must not exceed 1.32.0. -- It can be bumped without a semver major release of the crates. However, a - minor version bump is required. - -**cosmwasm-vm MSRV** - -- It can be bumped without a semver major release of the crate. However, a minor - version bump is required. -- It is always higher or equal to cosmwasm-std MSRV because the VM depends on - cosmwasm-std and related packages. +We try to keep the range of supported Rust compiler versions as wide as possible +to avoid unnecessary inconvenience for contract developers. However, we give up +all strong MSRV guarantees as the Rust ecosystem currently makes it impossible +to do so. See e.g. + +- https://github.com/rust-lang/api-guidelines/issues/252 +- https://github.com/CosmWasm/cosmwasm/issues/1244 +- https://github.com/wasmerio/wasmer/issues/2819 +- https://github.com/CosmWasm/cosmwasm/issues/1204 diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 6454da4e22..6f694c2bb9 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -33,9 +33,7 @@ stargate = [] [dependencies] base64 = "0.13.0" cosmwasm-derive = { path = "../derive", version = "0.16.6" } -# uint 0.9.2 uses edition2021 for no reason but we don't want to upgrade MSRV that much right now -# See https://github.com/CosmWasm/cosmwasm/issues/1204 -uint = "=0.9.1" +uint = "0.9.3" serde-json-wasm = { version = "0.3.1" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }