From 8e646946b4ed7297c1fdcd19b36f9cced3fd70ac Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 12 Dec 2024 23:19:39 +0800 Subject: [PATCH] Revert "Update Rust CI version" This reverts commit 98b2de2e8f7c47dda3a5bbf086e0b62c1de556d2. (cherry picked from commit f04587a1c3d390ee2e0e6d869a1dfd5f7522f94a) # Conflicts: # .circleci/config.yml # CHANGELOG.md # Cargo.lock # Cargo.toml # contracts/burner/Cargo.lock # contracts/crypto-verify/Cargo.lock # contracts/cyberpunk/Cargo.lock # contracts/empty/Cargo.lock # contracts/floaty/Cargo.lock # contracts/hackatom/Cargo.lock # contracts/ibc-callbacks/Cargo.lock # contracts/ibc-reflect-send/Cargo.lock # contracts/ibc-reflect/Cargo.lock # contracts/queue/Cargo.lock # contracts/reflect/Cargo.lock # contracts/staking/Cargo.lock # contracts/virus/Cargo.lock # packages/check/Cargo.toml # packages/crypto/Cargo.toml # packages/go-gen/Cargo.toml # packages/schema/Cargo.toml # packages/std/Cargo.toml # packages/std/src/math/signed_decimal_256.rs # packages/vm/Cargo.toml # packages/vm/src/calls.rs # packages/vm/src/imports.rs # packages/vm/src/modules/file_system_cache.rs --- .circleci/config.yml | 8 +++++ CHANGELOG.md | 4 +++ Cargo.lock | 36 ++++++++++++++++++++ Cargo.toml | 4 +++ contracts/burner/Cargo.lock | 32 +++++++++++++++++ contracts/crypto-verify/Cargo.lock | 32 +++++++++++++++++ contracts/cyberpunk/Cargo.lock | 32 +++++++++++++++++ contracts/empty/Cargo.lock | 32 +++++++++++++++++ contracts/floaty/Cargo.lock | 32 +++++++++++++++++ contracts/hackatom/Cargo.lock | 32 +++++++++++++++++ contracts/ibc-callbacks/Cargo.lock | 32 +++++++++++++++++ contracts/ibc-reflect-send/Cargo.lock | 32 +++++++++++++++++ contracts/ibc-reflect/Cargo.lock | 32 +++++++++++++++++ contracts/queue/Cargo.lock | 32 +++++++++++++++++ contracts/reflect/Cargo.lock | 32 +++++++++++++++++ contracts/staking/Cargo.lock | 32 +++++++++++++++++ contracts/virus/Cargo.lock | 32 +++++++++++++++++ packages/check/Cargo.toml | 5 +++ packages/crypto/Cargo.toml | 4 +++ packages/go-gen/Cargo.toml | 8 +++++ packages/schema/Cargo.toml | 4 +++ packages/std/Cargo.toml | 14 ++++++++ packages/std/src/math/signed_decimal_256.rs | 4 +++ packages/vm/Cargo.toml | 9 +++++ packages/vm/src/calls.rs | 4 +++ packages/vm/src/imports.rs | 4 +++ packages/vm/src/modules/file_system_cache.rs | 12 +++++++ 27 files changed, 536 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 981320634..1dbea6f16 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,11 @@ workflows: matrix: parameters: # Run with MSRV and some modern stable Rust +<<<<<<< HEAD rust-version: ["1.74.0", "1.82.0"] +======= + rust-version: ["1.74.0", "1.78.0"] +>>>>>>> f04587a1 (Revert "Update Rust CI version") - benchmarking: requires: - package_vm @@ -1142,7 +1146,11 @@ jobs: coverage: docker: +<<<<<<< HEAD - image: rust:1.82.0-alpine3.19 +======= + - image: rust:1.78.0-alpine3.19 +>>>>>>> f04587a1 (Revert "Update Rust CI version") environment: # Limit the number of parallel jobs to avoid OOM crashes during doc testing RUST_TEST_THREADS: 8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 051872bba..c360d5551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,12 +49,16 @@ and this project adheres to match the contract address from `mock_env`. ([#2211]) - cosmwasm-derive: Automatically detect whether the package is a dependency or the primary package, only expanding entrypoints for the primary package. This +<<<<<<< HEAD effectively deprecates the usage of the `library` feature pattern. Note: This feature does **NOT** interact well with workspaces due to a cargo bug. If you have multiple contracts in a workspace, you might still want to use the library feature ([#2246]) +======= + effectively deprecates the usage of the `library` feature pattern. ([#2246]) +>>>>>>> f04587a1 (Revert "Update Rust CI version") - cosmwasm-std: Deprecate `BankQuery::AllBalances` and `IbcQuery::ListChannels`. Both are inherently problematic to use because the returned entries are unbounded. ([#2247]) diff --git a/Cargo.lock b/Cargo.lock index a6d809b6f..9dc81d700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -552,7 +552,11 @@ dependencies = [ [[package]] name = "cosmwasm-check" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "anyhow", "assert_cmd", @@ -566,11 +570,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -602,7 +614,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -611,7 +627,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "anyhow", "cosmwasm-schema-derive", @@ -625,7 +645,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -634,7 +658,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64 0.22.1", "bech32", @@ -663,7 +691,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -703,7 +735,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index c94fa1046..f9f7be2e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,11 @@ exclude = ["contracts"] resolver = "2" [workspace.package] +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") [workspace.dependencies] schemars = "0.8.4" diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock index dea863158..3437b0d4f 100644 --- a/contracts/burner/Cargo.lock +++ b/contracts/burner/Cargo.lock @@ -344,11 +344,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -370,7 +378,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -379,7 +391,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -390,7 +406,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -399,7 +419,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -421,7 +445,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -449,7 +477,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock index 64c00bba2..42ba38f26 100644 --- a/contracts/crypto-verify/Cargo.lock +++ b/contracts/crypto-verify/Cargo.lock @@ -339,11 +339,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -365,7 +373,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -374,7 +386,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -385,7 +401,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -394,7 +414,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -416,7 +440,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -444,7 +472,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock index 9e4f30931..40631227d 100644 --- a/contracts/cyberpunk/Cargo.lock +++ b/contracts/cyberpunk/Cargo.lock @@ -368,11 +368,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -394,7 +402,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -403,7 +415,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -414,7 +430,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -423,7 +443,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64 0.22.1", "bech32", @@ -445,7 +469,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -473,7 +501,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/empty/Cargo.lock b/contracts/empty/Cargo.lock index 3e446fabb..83d9758b1 100644 --- a/contracts/empty/Cargo.lock +++ b/contracts/empty/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock index 3d6f40994..8ba41c1cb 100644 --- a/contracts/floaty/Cargo.lock +++ b/contracts/floaty/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock index 1f63fa5c7..6c9824102 100644 --- a/contracts/hackatom/Cargo.lock +++ b/contracts/hackatom/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/ibc-callbacks/Cargo.lock b/contracts/ibc-callbacks/Cargo.lock index b0ac1ccbf..29cf80ebf 100644 --- a/contracts/ibc-callbacks/Cargo.lock +++ b/contracts/ibc-callbacks/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock index 76cce5ccd..4dede330e 100644 --- a/contracts/ibc-reflect-send/Cargo.lock +++ b/contracts/ibc-reflect-send/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock index 6fb821cb7..199a2ebce 100644 --- a/contracts/ibc-reflect/Cargo.lock +++ b/contracts/ibc-reflect/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock index e38620799..f555037ec 100644 --- a/contracts/queue/Cargo.lock +++ b/contracts/queue/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock index 939275d00..7a7970724 100644 --- a/contracts/reflect/Cargo.lock +++ b/contracts/reflect/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock index 411282c26..a9e10e035 100644 --- a/contracts/staking/Cargo.lock +++ b/contracts/staking/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock index 35710351f..4383d47e4 100644 --- a/contracts/virus/Cargo.lock +++ b/contracts/virus/Cargo.lock @@ -333,11 +333,19 @@ dependencies = [ [[package]] name = "cosmwasm-core" +<<<<<<< HEAD version = "2.2.0-rc.1" [[package]] name = "cosmwasm-crypto" version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" + +[[package]] +name = "cosmwasm-crypto" +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "ark-bls12-381", "ark-ec", @@ -359,7 +367,11 @@ dependencies = [ [[package]] name = "cosmwasm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -368,7 +380,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -379,7 +395,11 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "proc-macro2", "quote", @@ -388,7 +408,11 @@ dependencies = [ [[package]] name = "cosmwasm-std" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "base64", "bech32", @@ -410,7 +434,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "bech32", "blake2", @@ -438,7 +466,11 @@ dependencies = [ [[package]] name = "cosmwasm-vm-derive" +<<<<<<< HEAD version = "2.2.0-rc.1" +======= +version = "2.2.0-rc.3" +>>>>>>> f04587a1 (Revert "Update Rust CI version") dependencies = [ "blake2", "proc-macro2", diff --git a/packages/check/Cargo.toml b/packages/check/Cargo.toml index 896afef79..49f8de42f 100644 --- a/packages/check/Cargo.toml +++ b/packages/check/Cargo.toml @@ -11,8 +11,13 @@ license = "Apache-2.0" anyhow = "1.0.57" clap = "4" colored = "2.1.0" +<<<<<<< HEAD cosmwasm-vm = { path = "../vm", version = "=2.2.0-rc.1" } cosmwasm-std = { path = "../std", version = "=2.2.0-rc.1" } +======= +cosmwasm-vm = { path = "../vm", version = "=2.2.0-rc.3" } +cosmwasm-std = { path = "../std", version = "=2.2.0-rc.3" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") [dev-dependencies] assert_cmd = "2.0.12" diff --git a/packages/crypto/Cargo.toml b/packages/crypto/Cargo.toml index 87cae0dd1..08e93619d 100644 --- a/packages/crypto/Cargo.toml +++ b/packages/crypto/Cargo.toml @@ -16,7 +16,11 @@ 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" +<<<<<<< HEAD cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" } +======= +cosmwasm-core = { version = "2.2.0-rc.3", path = "../core" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") 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 } diff --git a/packages/go-gen/Cargo.toml b/packages/go-gen/Cargo.toml index 8f24c3d8a..e38b18458 100644 --- a/packages/go-gen/Cargo.toml +++ b/packages/go-gen/Cargo.toml @@ -9,12 +9,20 @@ publish = false release = false [dependencies] +<<<<<<< HEAD cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", features = [ +======= +cosmwasm-std = { version = "2.2.0-rc.3", path = "../std", features = [ +>>>>>>> f04587a1 (Revert "Update Rust CI version") "cosmwasm_2_2", "staking", "stargate", ] } +<<<<<<< HEAD cosmwasm-schema = { version = "2.2.0-rc.1", path = "../schema" } +======= +cosmwasm-schema = { version = "2.2.0-rc.3", path = "../schema" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") anyhow = "1" Inflector = "0.11.4" indenter = "0.3.3" diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml index 0ea8618e7..aee852d25 100644 --- a/packages/schema/Cargo.toml +++ b/packages/schema/Cargo.toml @@ -11,7 +11,11 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/schema" license = "Apache-2.0" [dependencies] +<<<<<<< HEAD cosmwasm-schema-derive = { version = "=2.2.0-rc.1", path = "../schema-derive" } +======= +cosmwasm-schema-derive = { version = "=2.2.0-rc.3", path = "../schema-derive" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") schemars = { workspace = true } serde = { workspace = true } serde_json = "1.0.40" diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index 408ea72fb..a12f483f0 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -55,8 +55,13 @@ cosmwasm_2_2 = ["cosmwasm_2_1"] [dependencies] base64 = "0.22.0" bnum = "0.11.0" +<<<<<<< HEAD cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" } cosmwasm-derive = { version = "2.2.0-rc.1", path = "../derive" } +======= +cosmwasm-core = { version = "2.2.0-rc.3", path = "../core" } +cosmwasm-derive = { version = "2.2.0-rc.3", path = "../derive" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") derive_more = { version = "1.0.0-beta.6", default-features = false, features = [ "debug", ] } @@ -73,12 +78,21 @@ rmp-serde = "1.3.0" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] bech32 = "0.11.0" +<<<<<<< HEAD cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" } rand_core = { version = "0.6.4", features = ["getrandom"] } [dev-dependencies] cosmwasm-core = { path = "../core", version = "2.2.0-rc.1" } cosmwasm-schema = { version = "2.2.0-rc.1", path = "../schema" } +======= +cosmwasm-crypto = { version = "2.2.0-rc.3", path = "../crypto" } +rand_core = { version = "0.6.4", features = ["getrandom"] } + +[dev-dependencies] +cosmwasm-core = { path = "../core", version = "2.2.0-rc.3" } +cosmwasm-schema = { version = "2.2.0-rc.3", path = "../schema" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") # 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", diff --git a/packages/std/src/math/signed_decimal_256.rs b/packages/std/src/math/signed_decimal_256.rs index 3266c0b18..3efed7b0d 100644 --- a/packages/std/src/math/signed_decimal_256.rs +++ b/packages/std/src/math/signed_decimal_256.rs @@ -106,7 +106,11 @@ impl SignedDecimal256 { /// Create a -1.0 SignedDecimal256 #[inline] pub const fn negative_one() -> Self { +<<<<<<< HEAD // -DECIMAL_FRACTIONAL +======= + // -DECIMAL_FRATIONAL +>>>>>>> f04587a1 (Revert "Update Rust CI version") Self(Int256::from_i128(-1_000_000_000_000_000_000)) } diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index cdb659a7a..e8204f009 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -46,12 +46,21 @@ 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 +<<<<<<< HEAD cosmwasm-core = { version = "2.2.0-rc.1", path = "../core" } cosmwasm-std = { version = "2.2.0-rc.1", path = "../std", default-features = false, features = [ "std", ] } cosmwasm-crypto = { version = "2.2.0-rc.1", path = "../crypto" } cosmwasm-vm-derive = { version = "2.2.0-rc.1", path = "../vm-derive" } +======= +cosmwasm-core = { version = "2.2.0-rc.3", path = "../core" } +cosmwasm-std = { version = "2.2.0-rc.3", path = "../std", default-features = false, features = [ + "std", +] } +cosmwasm-crypto = { version = "2.2.0-rc.3", path = "../crypto" } +cosmwasm-vm-derive = { version = "2.2.0-rc.3", path = "../vm-derive" } +>>>>>>> f04587a1 (Revert "Update Rust CI version") derivative = "2" hex = "0.4" rand_core = { version = "0.6", features = ["getrandom"] } diff --git a/packages/vm/src/calls.rs b/packages/vm/src/calls.rs index e2021c9ff..6dad77f49 100644 --- a/packages/vm/src/calls.rs +++ b/packages/vm/src/calls.rs @@ -24,7 +24,11 @@ use crate::serde::{from_slice, to_vec}; /// deserializing JSON is more expensive. As a consequence, any sane contract should hit /// the deserializer limit before the read limit. mod read_limits { +<<<<<<< HEAD /// A mebi (mega binary) +======= + /// A mibi (mega binary) +>>>>>>> f04587a1 (Revert "Update Rust CI version") const MI: usize = 1024 * 1024; /// Max length (in bytes) of the result data from an instantiate call. pub const RESULT_INSTANTIATE: usize = 64 * MI; diff --git a/packages/vm/src/imports.rs b/packages/vm/src/imports.rs index 609a3062c..449c582a2 100644 --- a/packages/vm/src/imports.rs +++ b/packages/vm/src/imports.rs @@ -32,7 +32,11 @@ use crate::GasInfo; /// A kibi (kilo binary) const KI: usize = 1024; +<<<<<<< HEAD /// A mebi (mega binary) +======= +/// A mibi (mega binary) +>>>>>>> f04587a1 (Revert "Update Rust CI version") const MI: usize = 1024 * 1024; /// Max key length for db_write/db_read/db_remove/db_scan (when VM reads the key argument from Wasm memory) const MAX_LENGTH_DB_KEY: usize = 64 * KI; diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs index 004e48e09..63179e2d6 100644 --- a/packages/vm/src/modules/file_system_cache.rs +++ b/packages/vm/src/modules/file_system_cache.rs @@ -448,17 +448,29 @@ mod tests { }; let target = Target::new(triple, wasmer::CpuFeature::POPCNT.into()); let p = modules_path(&base, 17, &target); +<<<<<<< HEAD let discriminator = raw_module_version_discriminator(); +======= + let descriminator = raw_module_version_discriminator(); +>>>>>>> f04587a1 (Revert "Update Rust CI version") assert_eq!( p.as_os_str(), if cfg!(windows) { format!( +<<<<<<< HEAD "modules\\{discriminator}-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" ) } else { format!( "modules/{discriminator}-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" +======= + "modules\\{descriminator}-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" + ) + } else { + format!( + "modules/{descriminator}-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE" +>>>>>>> f04587a1 (Revert "Update Rust CI version") ) } .as_str()