From a5633c4438b76287b2d848eff0b787befb610b88 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 12 Dec 2024 23:18:20 +0800 Subject: [PATCH 1/4] Revert "Add changelog entry" This reverts commit 60129670f06f0e2113eef86681106309bbbc8eb4. --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac4b27b41..7285cdaaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,15 +26,12 @@ and this project adheres to - cosmwasm-vm: Export a new `migrate_with_info` function ([#2212]) - cosmwasm-derive: Add support for migrate method with `migrate_info: MigrateInfo` argument. ([#2212]) -- cosmwasm-vm: Enable support for reference-types proposal, required since Rust - 1.82 ([#2288]) - cosmwasm-vm: Add `Cache::store_code` [#2118]: https://github.com/CosmWasm/cosmwasm/pull/2118 [#2196]: https://github.com/CosmWasm/cosmwasm/pull/2196 [#2220]: https://github.com/CosmWasm/cosmwasm/pull/2220 [#2212]: https://github.com/CosmWasm/cosmwasm/pull/2212 -[#2288]: https://github.com/CosmWasm/cosmwasm/pull/2288 ### Changed From 2ae98fb880e2caa00e97125d28b75766a782334e Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 12 Dec 2024 23:18:36 +0800 Subject: [PATCH 2/4] Revert "Support reference-types proposal" This reverts commit 434df659561e1f770015de2b7fbfba8dd6d4e25d. --- packages/vm/src/parsed_wasm.rs | 2 +- packages/vm/src/wasm_backend/gatekeeper.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vm/src/parsed_wasm.rs b/packages/vm/src/parsed_wasm.rs index 5de6de318..11c67210d 100644 --- a/packages/vm/src/parsed_wasm.rs +++ b/packages/vm/src/parsed_wasm.rs @@ -79,7 +79,7 @@ impl<'a> ParsedWasm<'a> { multi_value: true, floats: true, - reference_types: true, + reference_types: false, bulk_memory: false, simd: false, relaxed_simd: false, diff --git a/packages/vm/src/wasm_backend/gatekeeper.rs b/packages/vm/src/wasm_backend/gatekeeper.rs index 407261604..ba0433b67 100644 --- a/packages/vm/src/wasm_backend/gatekeeper.rs +++ b/packages/vm/src/wasm_backend/gatekeeper.rs @@ -59,7 +59,7 @@ impl Default for Gatekeeper { Self::new(GatekeeperConfig { allow_floats: true, allow_feature_bulk_memory_operations: false, - allow_feature_reference_types: true, + allow_feature_reference_types: false, allow_feature_simd: false, allow_feature_exception_handling: false, allow_feature_threads: false, From 719afdb3306762296089e596b714f2aaaf331bf4 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 12 Dec 2024 23:19:30 +0800 Subject: [PATCH 3/4] Revert "Use upper Rust version to compile hackatom" This reverts commit ced790e8068ba0283a19f2ae4e526ee9761cc3a0. --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a4701e4b..981320634 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -655,8 +655,7 @@ jobs: contract_hackatom: docker: - # We compile this contract with the upper bound to detect issues with new Rust versions early - - image: rust:1.82 + - image: rust:1.74 environment: RUST_BACKTRACE: 1 working_directory: ~/cosmwasm/contracts/hackatom @@ -668,7 +667,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }} + - cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }} - check_contract: min_version: "2.2" - save_cache: @@ -680,7 +679,7 @@ jobs: - target/wasm32-unknown-unknown/release/.fingerprint - target/wasm32-unknown-unknown/release/build - target/wasm32-unknown-unknown/release/deps - key: cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }} + key: cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }} contract_ibc_callbacks: docker: From f04587a1c3d390ee2e0e6d869a1dfd5f7522f94a Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Thu, 12 Dec 2024 23:19:39 +0800 Subject: [PATCH 4/4] Revert "Update Rust CI version" This reverts commit 98b2de2e8f7c47dda3a5bbf086e0b62c1de556d2. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 981320634..780665783 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,7 @@ workflows: matrix: parameters: # Run with MSRV and some modern stable Rust - rust-version: ["1.74.0", "1.82.0"] + rust-version: ["1.74.0", "1.78.0"] - benchmarking: requires: - package_vm @@ -1142,7 +1142,7 @@ jobs: coverage: docker: - - image: rust:1.82.0-alpine3.19 + - image: rust:1.78.0-alpine3.19 environment: # Limit the number of parallel jobs to avoid OOM crashes during doc testing RUST_TEST_THREADS: 8