diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml new file mode 100644 index 0000000000..0e124cc880 --- /dev/null +++ b/.github/workflows/contracts.yml @@ -0,0 +1,314 @@ +name: contracts + +on: + push: + branches: [ "main" ] + pull_request: + +env: + TOOLCHAIN_STABLE: 1.81.0 # Toolchain for building contracts in stable channel + TOOLCHAIN_NIGHTLY: nightly-2024-07-21 # Toolchain for building contracts in nightly channel + TOOLCHAIN_CHECK: 1.88.0 # Toolchain for building cosmwasm-check tool + +jobs: + stable: + name: ${{ matrix.dir }}-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + dir: [ + burner, + crypto-verify, + cyberpunk, + empty, + hackatom, + ibc-callbacks, + ibc-reflect, + ibc-reflect-send, + nested-contracts, + queue, + reflect, + staking, + virus + ] + defaults: + run: + shell: bash + working-directory: contracts/${{ matrix.dir }} + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + targets: wasm32-unknown-unknown + components: clippy, rustfmt + + - name: Check formatting + run: cargo fmt -- --check + + - name: Run unit tests + run: cargo test --lib --locked + + - name: Build WASM binary + run: cargo build --release --lib --locked --target wasm32-unknown-unknown + + - name: Run linter + run: cargo clippy --all-targets --tests -- -D warnings + + - name: Run integration tests + run: cargo test --test integration --locked + + - name: Run schema generator + run: cargo run --bin schema --locked + + - name: Ensure schemas are up-to-date + run: git diff --quiet ./schema + + - name: Upload WASM binary + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.dir }}-${{ runner.os }} + path: ./contracts/${{ matrix.dir }}/target/wasm32-unknown-unknown/release/*.wasm + + nightly: + name: ${{ matrix.dir }}-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + dir: [ floaty ] + defaults: + run: + shell: bash + working-directory: ./contracts/${{ matrix.dir }} + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust for compiling contracts + uses: dtolnay/rust-toolchain@nightly + with: + toolchain: ${{ env.TOOLCHAIN_NIGHTLY }} + targets: wasm32-unknown-unknown + components: clippy, rustfmt + + - name: Check formatting + run: cargo fmt -- --check + + - name: Run unit tests + run: cargo test --lib --locked + + - name: Build WASM binary + run: RUSTFLAGS="-C target-feature=+nontrapping-fptoint" cargo build --release --lib --locked --target wasm32-unknown-unknown + + - name: Run linter + run: cargo clippy --all-targets --tests -- -D warnings + + - name: Run integration tests + run: cargo test --test integration --locked + + - name: Run schema generator + run: cargo run --bin schema --locked + + - name: Ensure schemas are up-to-date + run: git diff --quiet ./schema + + - name: Upload WASM binary + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.dir }}-${{ runner.os }} + path: ./contracts/${{ matrix.dir }}/target/wasm32-unknown-unknown/release/*.wasm + + chkr: + name: check-rel-${{ matrix.os }} + runs-on: ${{ matrix.os }} + needs: [ stable, nightly ] + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust for compiling cosmwasm-check + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_CHECK }} + + - name: Install recently released cosmwasm-check + run: cargo install cosmwasm-check@3.0.2 + + - uses: actions/download-artifact@v5 + with: + name: burner-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: crypto-verify-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: cyberpunk-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: empty-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: floaty-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: hackatom-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-callbacks-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-reflect-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-reflect-send-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: nested-contracts-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: queue-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: reflect-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: staking-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: virus-${{ runner.os }} + path: . + + - name: Check contracts + shell: bash + run: cosmwasm-check *.wasm + + chkd: + name: check-dev-${{ matrix.os }} + runs-on: ${{ matrix.os }} + needs: [ stable, nightly ] + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust for compiling cosmwasm-check + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_CHECK }} + + - name: Install currently developed cosmwasm-check + run: cargo install --path ./packages/check --force + + - uses: actions/download-artifact@v5 + with: + name: burner-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: crypto-verify-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: cyberpunk-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: empty-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: floaty-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: hackatom-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-callbacks-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-reflect-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: ibc-reflect-send-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: nested-contracts-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: queue-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: reflect-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: staking-${{ runner.os }} + path: . + + - uses: actions/download-artifact@v5 + with: + name: virus-${{ runner.os }} + path: . + + - name: Check contracts + shell: bash + run: cosmwasm-check *.wasm diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml new file mode 100644 index 0000000000..80482fa21b --- /dev/null +++ b/.github/workflows/packages.yml @@ -0,0 +1,251 @@ +name: packages + +on: + push: + branches: [ "main" ] + pull_request: + +env: + TOOLCHAIN_STABLE: 1.81.0 # Toolchain for building packages in stable channel + +jobs: + format: + name: format-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: rustfmt + + - run: cargo fmt -- --check + + package-cosmwasm-core: + name: cosmwasm-core-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + targets: thumbv7em-none-eabi, wasm32-unknown-unknown + components: clippy + + - run: cargo clippy -p cosmwasm-core --all-targets -- -D warnings + - run: cargo clippy -p cosmwasm-core --all-features --all-targets -- -D warnings + - run: cargo build -p cosmwasm-core --locked + - run: cargo build -p cosmwasm-core --locked --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-core --locked --release --lib --target thumbv7em-none-eabi + - run: cargo build -p cosmwasm-core --locked --no-default-features + - run: cargo build -p cosmwasm-core --locked --no-default-features --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-core --locked --no-default-features --release --lib --target thumbv7em-none-eabi + - run: cargo build -p cosmwasm-core --locked --all-features + - run: cargo build -p cosmwasm-core --locked --all-features --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-core --locked --all-features --release --lib --target thumbv7em-none-eabi + - run: cargo test -p cosmwasm-core --locked --no-default-features + - run: cargo test -p cosmwasm-core --locked --all-features + + package-cosmwasm-crypto: + name: cosmwasm-crypto-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-crypto --all-targets -- -D warnings + - run: cargo build -p cosmwasm-crypto --locked + - run: cargo test -p cosmwasm-crypto --locked + + package-cosmwasm-derive: + name: cosmwasm-derive-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-derive --all-targets -- -D warnings + - run: cargo build -p cosmwasm-derive --locked + - run: cargo test -p cosmwasm-derive --locked + + package-cosmwasm-schema: + name: cosmwasm-schema-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-schema --all-targets -- -D warnings + - run: cargo build -p cosmwasm-schema --locked + - run: cargo test -p cosmwasm-schema --locked + + package-cosmwasm-schema-derive: + name: cosmwasm-schema-derive-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-schema-derive --all-targets -- -D warnings + - run: cargo build -p cosmwasm-schema-derive --locked + - run: cargo test -p cosmwasm-schema-derive --locked + + package-cosmwasm-std: + name: cosmwasm-std-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + targets: wasm32-unknown-unknown + components: clippy + + - run: cargo clippy -p cosmwasm-std --all-targets -- -D warnings + - run: cargo clippy -p cosmwasm-std --all-targets --features std,iterator,staking,stargate -- -D warnings + - run: cargo clippy -p cosmwasm-std --all-features --all-targets -- -D warnings + - run: cargo build -p cosmwasm-std --locked + - run: cargo build -p cosmwasm-std --locked --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-std --locked --no-default-features --features std + - run: cargo build -p cosmwasm-std --locked --no-default-features --features std --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-std --locked --features std,iterator,staking,stargate,cosmwasm_1_2 + - run: cargo build -p cosmwasm-std --locked --features std,iterator,staking,stargate,cosmwasm_1_2 --release --lib --target wasm32-unknown-unknown + - run: cargo build -p cosmwasm-std --locked --all-features + - run: cargo build -p cosmwasm-std --locked --all-features --release --lib --target wasm32-unknown-unknown + - run: cargo test -p cosmwasm-std --locked + - run: cargo test -p cosmwasm-std --locked --no-default-features --features std + - run: cargo test -p cosmwasm-std --locked --features std,iterator,staking,stargate,cosmwasm_1_2 + - run: cargo test -p cosmwasm-std --locked --all-features + + package-cosmwasm-vm: + name: cosmwasm-vm-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-vm --all-targets --no-default-features -- -D warnings + - run: cargo clippy -p cosmwasm-vm --all-targets --features iterator,staking,stargate -- -D warnings + - run: cargo build -p cosmwasm-vm --locked + - run: cargo build -p cosmwasm-vm --locked --features iterator,staking,stargate + - run: cargo build -p cosmwasm-vm --locked --all-features + - run: cargo test -p cosmwasm-vm --locked + - run: cargo test -p cosmwasm-vm --locked --features iterator,staking,stargate + - run: cargo test -p cosmwasm-vm --locked --all-features + - run: | + cargo build --locked --example multi_threaded_cache + time target/debug/examples/multi_threaded_cache > /dev/null + if: runner.os == 'Linux' + + package-cosmwasm-vm-derive: + name: cosmwasm-vm-derive-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-vm-derive --all-targets -- -D warnings + - run: cargo build -p cosmwasm-vm-derive --locked + - run: cargo test -p cosmwasm-vm-derive --locked + + package-cosmwasm-check: + name: cosmwasm-check-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-latest ] + steps: + - name: Checkout sources + uses: actions/checkout@v6 + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: ${{ env.TOOLCHAIN_STABLE }} + components: clippy + + - run: cargo clippy -p cosmwasm-check --all-targets -- -D warnings + - run: cargo build -p cosmwasm-check --locked + - run: cargo test -p cosmwasm-check --locked diff --git a/Cargo.lock b/Cargo.lock index c3330dc919..8435b06d60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -552,7 +552,7 @@ dependencies = [ [[package]] name = "cosmwasm-check" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "anyhow", "assert_cmd", @@ -566,11 +566,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -602,16 +602,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "anyhow", "cosmwasm-schema-derive", @@ -625,16 +625,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64 0.22.1", "bech32", @@ -663,7 +663,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -703,12 +703,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -851,7 +851,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -874,7 +874,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -885,7 +885,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -949,7 +949,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -1130,7 +1130,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1247,7 +1247,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "go-gen" -version = "0.1.0" +version = "2.3.0-dev" dependencies = [ "Inflector", "anyhow", @@ -1792,7 +1792,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2086,7 +2086,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2128,10 +2128,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -2155,15 +2156,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2174,18 +2184,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -2284,7 +2296,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2306,9 +2318,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -2362,7 +2374,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2446,7 +2458,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2558,7 +2570,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -2580,7 +2592,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3031,7 +3043,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -3051,5 +3063,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/Cargo.toml b/Cargo.toml index 1cc391a728..a18880581b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,21 +2,21 @@ members = ["packages/*"] exclude = ["contracts"] -# Resolver has to be set explicitly in workspaces -# due to https://github.com/rust-lang/cargo/issues/9956 resolver = "2" [workspace.package] -version = "2.2.2" +version = "2.3.0-dev" [workspace.dependencies] +cosmwasm-core = { path = "./packages/core" } +cosmwasm-crypto = { path = "./packages/crypto" } +cosmwasm-derive = { path = "./packages/derive" } +cosmwasm-schema = { path = "./packages/schema" } +cosmwasm-schema-derive = { path = "./packages/schema-derive" } +cosmwasm-std = { path = "./packages/std", default-features = false } +cosmwasm-vm = { path = "./packages/vm" } +cosmwasm-vm-derive = { path = "./packages/vm-derive" } schemars = "0.8.4" -serde = { version = "1.0.192", default-features = false, features = [ - "alloc", - "derive", -] } - -[workspace.metadata.release] -shared-version = true -tag-message = "chore: Release cosmwasm v{{version}}" -tag-name = "v{{version}}" +serde = { version = "1.0.192", default-features = false } +serde_json = "1.0.140" +thiserror = "1.0.26" diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000000..3ed57e671b --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,218 @@ +version: '3' + +silent: true + +vars: + COSMWASM_CHECK_VERSION: 2.2.2 # The last released version before 2.3.0 + TOOLCHAIN: +1.81.0 # The last Rust compiler version without 'reference-types'. + TOOLCHAIN_CHECK: +1.82.0 # Toolchain for building cosmwasm-check tool + +tasks: + + all: + desc: Runs all checks + summary: | + Runs all viable checks for cosmwasm repository. + Execute this task before pushing any changes. + This task takes a significant amount of time to complete. + cmds: + - task: clean-all + - task: build + - task: test + - task: cov + - task: check-contracts + - task: update-schemas + + build: + desc: Build all crates + cmds: + - cmd: cargo {{.TOOLCHAIN}} build --workspace + + check-contracts: + desc: Performs checks for all contracts + cmds: + - task: install-cosmwasm-check + - cmd: ./devtools/check-contracts.sh + + check-contracts-parallel: + desc: Performs checks in parallel for all contracts + cmds: + - task: install-cosmwasm-check + - cmd: ./devtools/check-contracts.sh parallel + + check-contracts-fast: + desc: Performs checks for all contracts without reinstalling cosmwasm-check tool + cmds: + - cmd: ./devtools/check-contracts.sh + + check-contracts-fast-parallel: + desc: Performs checks in parallel for all contracts without reinstalling cosmwasm-check tool + cmds: + - cmd: ./devtools/check-contracts.sh parallel + + clean: + desc: Removes compiled artifacts for crates + cmds: + - cmd: cargo clean + + clean-all: + desc: Removes all compiled artifacts (crates and contracts) + cmds: + - task: clean + - cmd: ./devtools/clean-contracts.sh + + clippy: + desc: Runs linter + cmds: + - cmd: cargo {{.TOOLCHAIN}} clippy --workspace --all-targets -- -D warnings + - cmd: cargo {{.TOOLCHAIN}} clippy --workspace --all-features --all-targets -- -D warnings + + cov: + desc: Generates code coverage report for all crates in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --workspace --no-cfg-coverage + + cov-cosmwasm-check: + desc: Generates code coverage report for cosmwasm-check in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-check --no-cfg-coverage + + cov-badge-cosmwasm-check: + desc: Generates the detailed code coverage badge for cosmwasm-check + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-check --json --summary-only | coverio + + cov-cosmwasm-core: + desc: Generates code coverage report for cosmwasm-core in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-core --no-cfg-coverage + + cov-badge-cosmwasm-core: + desc: Generates the detailed code coverage badge for cosmwasm-core + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-core --json --summary-only | coverio + + cov-cosmwasm-crypto: + desc: Generates code coverage report for cosmwasm-crypto in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-crypto --no-cfg-coverage + + cov-badge-cosmwasm-crypto: + desc: Generates the detailed code coverage badge for cosmwasm-crypto + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-crypto --json --summary-only | coverio + + cov-cosmwasm-derive: + desc: Generates code coverage report for cosmwasm-derive in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-derive --no-cfg-coverage + + cov-badge-cosmwasm-derive: + desc: Generates the detailed code coverage badge for cosmwasm-derive + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-derive --json --summary-only | coverio + + cov-go-gen: + desc: Generates code coverage report for go-gen in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p go-gen --no-cfg-coverage + + cov-badge-go-gen: + desc: Generates the detailed code coverage badge for go-gen + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p go-gen --json --summary-only | coverio + + cov-cosmwasm-schema: + desc: Generates code coverage report for cosmwasm-schema in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-schema --no-cfg-coverage + + cov-badge-cosmwasm-schema: + desc: Generates the detailed code coverage badge for cosmwasm-schema + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-schema --json --summary-only | coverio + + cov-cosmwasm-schema-derive: + desc: Generates code coverage report for cosmwasm-schema-derive in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-schema-derive --no-cfg-coverage + + cov-badge-cosmwasm-schema-derive: + desc: Generates the detailed code coverage badge for cosmwasm-schema-derive + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-schema-derive --json --summary-only | coverio + + cov-cosmwasm-std: + desc: Generates code coverage report for cosmwasm-std in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-std --no-cfg-coverage + + cov-badge-cosmwasm-std: + desc: Generates the detailed code coverage badge for cosmwasm-std + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-std --json --summary-only | coverio + + cov-cosmwasm-vm: + desc: Generates code coverage report for cosmwasm-vm in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-vm --no-cfg-coverage + + cov-badge-cosmwasm-vm: + desc: Generates the detailed code coverage badge for cosmwasm-vm + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-vm --json --summary-only | coverio + + cov-cosmwasm-vm-derive: + desc: Generates code coverage report for cosmwasm-vm-derive in text format + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov -p cosmwasm-vm-derive --no-cfg-coverage + + cov-badge-cosmwasm-vm-derive: + desc: Generates the detailed code coverage badge for cosmwasm-vm-derive + cmds: + - cmd: cargo llvm-cov clean + - cmd: cargo {{.TOOLCHAIN}} llvm-cov --no-cfg-coverage -p cosmwasm-vm-derive --json --summary-only | coverio + + install-cosmwasm-check: + desc: Installs cosmwasm-check tool (released version and currently developed version) + cmds: + # Install recently released cosmwasm-check and rename it to cosmwasm-check-release + - cmd: cargo {{.TOOLCHAIN_CHECK}} install cosmwasm-check@{{.COSMWASM_CHECK_VERSION}} --locked --force + - cmd: mv ~/.cargo/bin/cosmwasm-check ~/.cargo/bin/cosmwasm-check-release + # Install currently developed version of cosmwasm-check + - cmd: cargo {{.TOOLCHAIN_CHECK}} install --path ./packages/check --force + + test: + desc: Runs all tests + cmds: + - cmd: cargo {{.TOOLCHAIN}} test --workspace + + test-cosmwasm-core: + desc: Runs tests for cosmwasm-core + cmds: + - cmd: cargo {{.TOOLCHAIN}} test -p cosmwasm-core + + update-schemas: + desc: Updates schemas for all contracts + cmds: + - cmd: ./devtools/update-schemas.sh diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index 12efc08966..caf6f7a0b2 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -344,11 +344,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -370,16 +370,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -390,16 +390,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -421,7 +421,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -449,12 +449,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -555,7 +555,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -589,7 +589,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -644,7 +644,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -791,7 +791,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1440,7 +1440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1482,10 +1482,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1509,15 +1510,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1528,18 +1538,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,9 +1650,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1676,7 +1688,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1713,7 +1725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1782,7 +1794,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1804,7 +1816,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2130,7 +2142,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2150,5 +2162,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index 9afa4d28c8..016437297a 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -339,11 +339,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -365,16 +365,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -385,16 +385,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -416,7 +416,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -444,12 +444,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -568,7 +568,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -591,7 +591,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -602,7 +602,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -657,7 +657,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -806,7 +806,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1496,7 +1496,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1539,10 +1539,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1566,15 +1567,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1585,18 +1595,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1693,7 +1705,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1715,9 +1727,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1753,7 +1765,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1790,7 +1802,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1859,7 +1871,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1881,7 +1893,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2207,7 +2219,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2227,5 +2239,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/crypto-verify/tests/integration.rs b/contracts/crypto-verify/tests/integration.rs index 9107228305..f39bfdb425 100644 --- a/contracts/crypto-verify/tests/integration.rs +++ b/contracts/crypto-verify/tests/integration.rs @@ -17,7 +17,7 @@ //! }); //! 4. Anywhere you see init/execute(deps.as_mut(), ...) you must replace it with init/execute(&mut deps, ...) //! 5. Anywhere you see query(deps.as_ref(), ...) you must replace it with query(&mut deps, ...) -//! (Use cosmwasm_vm::testing::{init, execute, query}, instead of the contract variants). +//! 6. Use cosmwasm_vm::testing::{init, execute, query}, instead of the contract variants. use cosmwasm_std::{Binary, Response, Uint128}; use cosmwasm_vm::testing::{ diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index 11590c8d73..a981856019 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -368,11 +368,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -394,16 +394,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -414,16 +414,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64 0.22.1", "bech32", @@ -445,7 +445,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -473,12 +473,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -579,7 +579,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -614,7 +614,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -625,7 +625,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -680,7 +680,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -827,7 +827,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1522,7 +1522,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1564,10 +1564,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1591,15 +1592,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1610,18 +1620,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1698,7 +1710,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1720,9 +1732,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1770,7 +1782,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1807,7 +1819,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1876,7 +1888,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1898,7 +1910,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2224,7 +2236,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2244,5 +2256,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock index 747513373e..c88696266a 100644 --- a/contracts/empty/Cargo.lock +++ b/contracts/empty/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -790,7 +790,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1439,7 +1439,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1481,10 +1481,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1508,15 +1509,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1527,18 +1537,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1615,7 +1627,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1637,9 +1649,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1675,7 +1687,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1712,7 +1724,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1781,7 +1793,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1803,7 +1815,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2129,7 +2141,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2149,5 +2161,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index 29bbe16d16..d61b10788b 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1441,7 +1441,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1483,10 +1483,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1510,15 +1511,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1529,18 +1539,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1617,7 +1629,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1639,9 +1651,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1677,7 +1689,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1714,7 +1726,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1783,7 +1795,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1805,7 +1817,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2131,7 +2143,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2151,5 +2163,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index a1e58ebe4e..b10bc4e9ad 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1442,7 +1442,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1484,10 +1484,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1511,15 +1512,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1530,18 +1540,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1618,7 +1630,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1640,9 +1652,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1678,7 +1690,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1715,7 +1727,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1784,7 +1796,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1806,7 +1818,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2132,7 +2144,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2152,5 +2164,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/hackatom/Cargo.toml b/contracts/hackatom/Cargo.toml index 9876876e83..ab442d41a7 100644 --- a/contracts/hackatom/Cargo.toml +++ b/contracts/hackatom/Cargo.toml @@ -24,10 +24,7 @@ overflow-checks = true [dependencies] cosmwasm-schema = { path = "../../packages/schema" } -cosmwasm-std = { path = "../../packages/std", default-features = false, features = [ - "cosmwasm_2_2", - "std", -] } +cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["cosmwasm_2_2", "std"] } schemars = "0.8.12" serde = { version = "1.0.103", default-features = false, features = ["derive"] } sha2 = "0.10" diff --git a/contracts/ibc-callbacks/Cargo.lock b/contracts/ibc-callbacks/Cargo.lock index 0e6f13a3cf..3ff5217fec 100644 --- a/contracts/ibc-callbacks/Cargo.lock +++ b/contracts/ibc-callbacks/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1440,7 +1440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1482,10 +1482,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1509,15 +1510,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1528,18 +1538,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,9 +1650,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1676,7 +1688,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1713,7 +1725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1782,7 +1794,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1804,7 +1816,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2130,7 +2142,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2150,5 +2162,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index f95bceeba1..5e2f43a5a9 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1440,7 +1440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1482,10 +1482,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1509,15 +1510,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1528,18 +1538,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,9 +1650,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1676,7 +1688,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1713,7 +1725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1782,7 +1794,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1804,7 +1816,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2130,7 +2142,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2150,5 +2162,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 58a352b694..027dc43f37 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1440,7 +1440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1482,10 +1482,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1509,15 +1510,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1528,18 +1538,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,9 +1650,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1676,7 +1688,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1713,7 +1725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1782,7 +1794,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1804,7 +1816,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2130,7 +2142,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2150,5 +2162,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/nested-contracts/tests/integration.rs b/contracts/nested-contracts/tests/integration.rs new file mode 100644 index 0000000000..6a9dbcc41f --- /dev/null +++ b/contracts/nested-contracts/tests/integration.rs @@ -0,0 +1,4 @@ +#[test] +fn empty_test() { + // This is a placeholder for future integration tests if needed. +} diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index 00ad64373a..afc6b2e9ab 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1440,7 +1440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1482,10 +1482,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1509,15 +1510,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1528,18 +1538,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,9 +1650,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1676,7 +1688,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1713,7 +1725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1782,7 +1794,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1804,7 +1816,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2130,7 +2142,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2150,5 +2162,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/queue/Cargo.toml b/contracts/queue/Cargo.toml index accfb6e004..ab0a3f288d 100644 --- a/contracts/queue/Cargo.toml +++ b/contracts/queue/Cargo.toml @@ -28,14 +28,9 @@ overflow-checks = true [dependencies] cosmwasm-schema = { path = "../../packages/schema" } # cosmwasm_1_4 is enabled here for more efficient `range_keys` and `range_values` -cosmwasm-std = { path = "../../packages/std", features = [ - "cosmwasm_1_4", - "iterator", -] } +cosmwasm-std = { path = "../../packages/std", features = ["cosmwasm_1_4", "iterator"] } schemars = "0.8.12" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] -cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = [ - "iterator", -] } +cosmwasm-vm = { path = "../../packages/vm", default-features = false, features = ["iterator"] } diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 0bd14927f0..9bd0c97940 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1441,7 +1441,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1483,10 +1483,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1510,15 +1511,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1529,18 +1539,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1617,7 +1629,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1639,9 +1651,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1677,7 +1689,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1714,7 +1726,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1783,7 +1795,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1805,7 +1817,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2131,7 +2143,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2151,5 +2163,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index 0368863348..89a2222079 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1429,7 +1429,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1471,10 +1471,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1498,15 +1499,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1517,18 +1527,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1592,7 +1604,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1638,7 +1650,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1660,9 +1672,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1698,7 +1710,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1735,7 +1747,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1804,7 +1816,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1826,7 +1838,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2152,7 +2164,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2172,5 +2184,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock index 7ce78ef04d..242387c0f9 100644 --- a/contracts/virus/Cargo.lock +++ b/contracts/virus/Cargo.lock @@ -333,11 +333,11 @@ dependencies = [ [[package]] name = "cosmwasm-core" -version = "2.2.2" +version = "2.3.0-dev" [[package]] name = "cosmwasm-crypto" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,16 +359,16 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-schema" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,16 +379,16 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "cosmwasm-std" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "base64", "bech32", @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "bech32", "blake2", @@ -438,12 +438,12 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" -version = "2.2.2" +version = "2.3.0-dev" dependencies = [ "blake2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -544,7 +544,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -567,7 +567,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -578,7 +578,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -633,7 +633,7 @@ checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "unicode-xid", ] @@ -780,7 +780,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1429,7 +1429,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1471,10 +1471,11 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1498,15 +1499,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1517,18 +1527,20 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", + "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1605,7 +1617,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1627,9 +1639,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -1665,7 +1677,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1702,7 +1714,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1783,7 +1795,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -1805,7 +1817,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2131,7 +2143,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -2151,5 +2163,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.87", ] diff --git a/devtools/check-contracts.sh b/devtools/check-contracts.sh new file mode 100755 index 0000000000..75d2dfc11b --- /dev/null +++ b/devtools/check-contracts.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +if [[ "${1:-}" == "parallel" ]]; then + parallel=1 +else + parallel=0 +fi + +msg() { + if (( !parallel )); then + echo -e "\e[1;34m$1\e[0m \e[1;32m$2\e[0m" + fi +} + +check_contract() { + ( + contract_dir=$1 + contract="$(basename "$contract_dir" | tr - _)" + wasm="./target/wasm32-unknown-unknown/release/$contract.wasm" + + msg "CHANGE DIRECTORY" "$contract_dir" + cd "$contract_dir" || exit 1 + + msg "CHECK FORMATTING" "$contract" + cargo +"$2" fmt -- --check + + msg "RUN UNIT TESTS" "$contract" + cargo +"$2" test --lib --locked + + msg "BUILD WASM" "$contract" + RUSTFLAGS="$3" cargo +"$2" build --release --lib --locked --target wasm32-unknown-unknown + + msg "RUN LINTER" "$contract" + cargo +"$2" clippy --all-targets --tests -- -D warnings + + msg "RUN INTEGRATION TESTS" "$contract" + cargo +"$2" test --test integration --locked + + msg "GENERATE SCHEMA" "$contract" + cargo +"$2" run --bin schema --locked + + msg "ENSURE SCHEMA IS UP-TO-DATE" "$contract" + git diff --quiet ./schema + + msg "cosmwasm-check (release)" "$contract" + cosmwasm-check-release "$wasm" + + msg "cosmwasm-check (develop)" "$contract" + cosmwasm-check "$wasm" + ) +} + +contracts_stable=( + contracts/burner + contracts/crypto-verify + contracts/cyberpunk + contracts/empty + contracts/hackatom + contracts/ibc-callbacks + contracts/ibc-reflect + contracts/ibc-reflect-send + contracts/nested-contracts + contracts/queue + contracts/reflect + contracts/staking + contracts/virus +) + +contracts_nightly=( + contracts/floaty +) + +toolchain_stable=1.81.0 # The last Rust compiler version without 'reference-types'. +rustflags_stable="" + +toolchain_nightly=nightly-2024-07-21 # The last nightly version for 1.81.0 +rustflags_nightly="-C target-feature=+nontrapping-fptoint" + +if (( parallel )); then + for dir in "${contracts_stable[@]}"; do + check_contract "$dir" "$toolchain_stable" "$rustflags_stable" > /dev/null & + done + for dir in "${contracts_nightly[@]}"; do + check_contract "$dir" "$toolchain_nightly" "$rustflags_nightly" > /dev/null & + done + wait +else + for dir in "${contracts_stable[@]}"; do + check_contract "$dir" "$toolchain_stable" "$rustflags_stable" + done + for dir in "${contracts_nightly[@]}"; do + check_contract "$dir" "$toolchain_nightly" "$rustflags_nightly" + done +fi diff --git a/devtools/clean-contracts.sh b/devtools/clean-contracts.sh new file mode 100755 index 0000000000..ffac27d82c --- /dev/null +++ b/devtools/clean-contracts.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +for dir in contracts/*/; do + ( + contract="$(basename "$dir" | tr - _)" + echo -e "\e[1;34mClean contract\e[0m \e[1;32m$contract\e[0m" + cd "$dir" || exit 1 + cargo clean + ) +done diff --git a/devtools/update-schemas.sh b/devtools/update-schemas.sh new file mode 100755 index 0000000000..8641afd3c2 --- /dev/null +++ b/devtools/update-schemas.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +msg() { + echo -e "\e[1;34m$1\e[0m \e[1;32m$2\e[0m" +} + +check_contract() { + ( + contract_dir=$1 + contract="$(basename "$contract_dir" | tr - _)" + + msg "CHANGE DIRECTORY" "$contract_dir" + cd "$contract_dir" || exit 1 + + msg "UPDATE SCHEMA" "$contract" + cargo +"$2" run --bin schema --locked + ) +} + +contracts_stable=( + contracts/burner + contracts/crypto-verify + contracts/cyberpunk + contracts/empty + contracts/hackatom + contracts/ibc-callbacks + contracts/ibc-reflect + contracts/ibc-reflect-send + contracts/nested-contracts + contracts/queue + contracts/reflect + contracts/staking + contracts/virus +) + +contracts_nightly=( + contracts/floaty +) + +toolchain_stable=1.81.0 # The last Rust compiler version without 'reference-types'. +toolchain_nightly=nightly-2024-07-21 # The last nightly version for 1.81.0 + +for dir in "${contracts_stable[@]}"; do + check_contract "$dir" "$toolchain_stable" +done +for dir in "${contracts_nightly[@]}"; do + check_contract "$dir" "$toolchain_nightly" +done diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index 3bcd61b34d..a1064e216b 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-check" -version.workspace = true +version = { workspace = true } authors = ["Mauro Lacy "] edition = "2021" description = "A CLI tool for verifying CosmWasm smart contracts" @@ -11,8 +11,8 @@ license = "Apache-2.0" anyhow = "1.0.57" clap = "4" colored = "2.1.0" -cosmwasm-vm = { path = "../vm", version = "=2.2.2" } -cosmwasm-std = { path = "../std", version = "=2.2.2" } +cosmwasm-vm = { workspace = true } +cosmwasm-std = { workspace = true, default-features = true } [dev-dependencies] assert_cmd = "2.0.12" diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml index f0ed9e8dc4..e1e92a405a 100644 --- a/packages/core/Cargo.toml +++ b/packages/core/Cargo.toml @@ -1,10 +1,8 @@ [package] name = "cosmwasm-core" -version.workspace = true +version = { workspace = true } edition = "2021" description = "Components of cosmwasm-std that can be used in no_std environments" repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/core" license = "Apache-2.0" readme = "README.md" - -[dependencies] diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index b0ae3b2068..eac63e0fc6 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-crypto" -version.workspace = true +version = { workspace = true } authors = ["Mauro Lacy "] edition = "2021" description = "Crypto bindings for cosmwasm contracts" @@ -16,17 +16,17 @@ ark-bls12-381 = "0.4.0" ark-ec = { version = "0.4.2", features = ["parallel"] } ark-ff = { version = "0.4.2", features = ["asm", "parallel"] } ark-serialize = "0.4.2" -cosmwasm-core = { version = "2.2.2", path = "../core" } +cosmwasm-core = { workspace = true } digest = "0.10" -ecdsa = "0.16.2" # Not used directly, but needed to bump transitive dependency, see: https://github.com/CosmWasm/cosmwasm/pull/1899 for details. -ed25519-zebra = { version = "4.0.3", default-features = false } +ecdsa = "0.16.2" # Not used directly, but needed to bump transitive dependency, see: https://github.com/CosmWasm/cosmwasm/pull/1899 for details. +ed25519-zebra = { version = "=4.0.3", default-features = false } k256 = { version = "0.13.3", default-features = false, features = ["ecdsa"] } num-traits = "0.2.18" p256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] } rand_core = "0.6" rayon = "1.9.0" sha2 = "0.10" -thiserror = "1.0.26" +thiserror = { workspace = true } # Not directly used but bumps transitive dependency to avoid curve25519-dalek = "4.1.3" @@ -36,11 +36,8 @@ base64 = "0.22.0" base64-serde = "0.7.0" criterion = "0.5.1" rand_core = { version = "0.6", features = ["getrandom"] } -serde = { version = "1.0.103", default-features = false, features = [ - "alloc", - "derive", -] } -serde_json = "1.0.40" +serde = { workspace = true, features = ["alloc", "derive"] } +serde_json = { workspace = true } sha2 = "0.10" sha3 = "0.10" hex = { version = "0.4", features = ["serde"] } diff --git a/packages/derive/Cargo.toml b/packages/derive/Cargo.toml index fd196c6ee2..7a196ed3ae 100644 --- a/packages/derive/Cargo.toml +++ b/packages/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-derive" -version.workspace = true +version = { workspace = true } authors = ["Simon Warta "] edition = "2021" description = "A package for auto-generated code used for CosmWasm contract development. This is shipped as part of cosmwasm-std. Do not use directly." diff --git a/packages/go-gen/Cargo.toml b/packages/go-gen/Cargo.toml index 9894db256c..ba8357fd6f 100644 --- a/packages/go-gen/Cargo.toml +++ b/packages/go-gen/Cargo.toml @@ -1,20 +1,13 @@ [package] name = "go-gen" +version = { workspace = true } authors = ["Christoph Otter "] -version = "0.1.0" edition = "2021" publish = false -[package.metadata.release] -release = false - [dependencies] -cosmwasm-std = { version = "2.2.2", path = "../std", features = [ - "cosmwasm_2_2", - "staking", - "stargate", -] } -cosmwasm-schema = { version = "2.2.2", path = "../schema" } +cosmwasm-std = { workspace = true, features = ["cosmwasm_2_2", "staking", "stargate"] } +cosmwasm-schema = { workspace = true } anyhow = "1" Inflector = "0.11.4" indenter = "0.3.3" diff --git a/packages/schema-derive/Cargo.toml b/packages/schema-derive/Cargo.toml index 9617a5401d..62c0ce20eb 100644 --- a/packages/schema-derive/Cargo.toml +++ b/packages/schema-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema-derive" -version.workspace = true +version = { workspace = true } authors = ["Tomasz Kurcz "] edition = "2021" description = "Derive macros for cosmwasm-schema" diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml index 9b34e8bfcb..37f7f3d868 100644 --- a/packages/schema/Cargo.toml +++ b/packages/schema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-schema" -version.workspace = true +version = { workspace = true } authors = [ "Ethan Frey ", "Simon Warta ", @@ -11,11 +11,11 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/schema" license = "Apache-2.0" [dependencies] -cosmwasm-schema-derive = { version = "=2.2.2", path = "../schema-derive" } +cosmwasm-schema-derive = { workspace = true } schemars = { workspace = true } serde = { workspace = true } -serde_json = "1.0.40" -thiserror = "1.0.26" +serde_json = { workspace = true } +thiserror = { workspace = true } [dev-dependencies] anyhow = "1.0.57" diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index c1bfe251dd..8db56b1a30 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-std" -version.workspace = true +version = { workspace = true } authors = ["Ethan Frey "] edition = "2021" description = "Standard library for Wasm based smart contracts on Cosmos blockchains" @@ -57,40 +57,30 @@ cosmwasm_2_2 = ["cosmwasm_2_1"] [dependencies] base64 = "0.22.0" bnum = "0.11.0" -cosmwasm-core = { version = "2.2.2", path = "../core" } -cosmwasm-derive = { version = "2.2.2", path = "../derive" } -derive_more = { version = "1.0.0-beta.6", default-features = false, features = [ - "debug", -] } +cosmwasm-core = { workspace = true } +cosmwasm-derive = { workspace = true } +derive_more = { version = "1.0.0-beta.6", default-features = false, features = ["debug"] } hex = "0.4" schemars = { workspace = true } sha2 = "0.10.3" serde = { workspace = true, features = ["std"] } -serde-json-wasm = { version = "1.0.1", default-features = false, features = [ - "std", -] } +serde-json-wasm = { version = "1.0.1", default-features = false, features = ["std"] } static_assertions = "1.1.0" -thiserror = "1.0.26" +thiserror = { workspace = true } rmp-serde = "1.3.0" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] bech32 = "0.11.0" -cosmwasm-crypto = { version = "2.2.2", path = "../crypto" } +cosmwasm-crypto = { workspace = true } rand_core = { version = "0.6.4", features = ["getrandom"] } [dev-dependencies] -cosmwasm-core = { path = "../core", version = "2.2.2" } -cosmwasm-schema = { version = "2.2.2", path = "../schema" } +cosmwasm-core = { workspace = true } +cosmwasm-schema = { workspace = true } # The chrono dependency is only used in an example, which Rust compiles for us. If this causes trouble, remove it. -chrono = { version = "0.4", default-features = false, features = [ - "alloc", - "std", -] } +chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] } crc32fast = "1.3.2" hex-literal = "0.4.1" paste = "1.0.15" -proptest = { version = "1.5.0", default-features = false, features = [ - "attr-macro", - "std", -] } +proptest = { version = "1.5.0", default-features = false, features = ["attr-macro", "std"] } serde_json = "1.0.81" diff --git a/packages/std/src/lib.rs b/packages/std/src/lib.rs index eede5242a0..126eccbfd9 100644 --- a/packages/std/src/lib.rs +++ b/packages/std/src/lib.rs @@ -46,7 +46,7 @@ mod types; /// This module is to simplify no_std imports pub(crate) mod prelude; -/// This modules is very advanced and will not be used directly by the vast majority of users. +/// This module is very advanced and will not be used directly by the vast majority of users. /// We want to offer it to ensure a stable storage key composition system but don't encourage /// contract devs to use it directly. pub mod storage_keys; @@ -125,7 +125,7 @@ mod _warning { #[allow(dead_code)] fn trigger_warning() { - CompileWarning; + let _ = CompileWarning; } } diff --git a/packages/vm-derive/Cargo.toml b/packages/vm-derive/Cargo.toml index 6eb74280e8..1d6381b680 100644 --- a/packages/vm-derive/Cargo.toml +++ b/packages/vm-derive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cosmwasm-vm-derive" edition = "2021" -version.workspace = true +version = { workspace = true } description = "Derive macros for cosmwasm-vm. For internal use only. No stability guarantees." repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/std" license = "Apache-2.0" diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index baa393d9b3..1ed5f75485 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmwasm-vm" -version.workspace = true +version = { workspace = true } authors = ["Ethan Frey "] edition = "2021" description = "VM bindings to run cosmwams contracts" @@ -46,23 +46,19 @@ crc32fast = "1.3.2" bech32 = "0.11.0" blake2 = "0.10.6" # Uses the path when built locally; uses the given version from crates.io when published -cosmwasm-core = { version = "2.2.2", path = "../core" } -cosmwasm-std = { version = "2.2.2", path = "../std", default-features = false, features = [ - "std", -] } -cosmwasm-crypto = { version = "2.2.2", path = "../crypto" } -cosmwasm-vm-derive = { version = "2.2.2", path = "../vm-derive" } +cosmwasm-core = { workspace = true } +cosmwasm-std = { workspace = true, features = ["std"] } +cosmwasm-crypto = { workspace = true } +cosmwasm-vm-derive = { workspace = true } derivative = "2" hex = "0.4" rand_core = { version = "0.6", features = ["getrandom"] } schemars = { workspace = true } serde = { workspace = true } -serde_json = "1.0.40" +serde_json = { workspace = true } sha2 = "0.10.3" -thiserror = "1.0.26" -wasmer = { version = "=4.3.7", default-features = false, features = [ - "singlepass", -] } +thiserror = { workspace = true } +wasmer = { version = "=4.3.7", default-features = false, features = ["singlepass"] } wasmer-middlewares = "=4.3.7" wasmer-types = "=4.3.7" strum = { version = "0.26.2", default-features = false, features = ["derive"] } diff --git a/packages/vm/README.md b/packages/vm/README.md index 3dbcff7e51..dcbca2a660 100644 --- a/packages/vm/README.md +++ b/packages/vm/README.md @@ -15,7 +15,7 @@ version is communicated by the contract via a Wasm import. This is the current compatibility list: | cosmwasm-vm | Supported interface versions | cosmwasm-std | -| ----------- | ---------------------------- | ------------ | +|-------------|------------------------------|--------------| | 1.0 | `interface_version_8` | 1.0 | | 0.16 | `interface_version_7` | 0.16 | | 0.15 | `interface_version_6` | 0.15 |