Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert reference-types support (main) #2318

Merged
merged 4 commits into from
Dec 16, 2024
+7 −11
Merged

Revert reference-types support (main) #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa0f280
Revert "Add changelog entry"
chipshort Dec 16, 2024
d82119e
Revert "Support reference-types proposal"
chipshort Dec 16, 2024
2ea3a7b
Revert "Use upper Rust version to compile hackatom"
chipshort Dec 16, 2024
167fa87
Revert "Update Rust CI version"
chipshort Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -1143,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
Expand Down
3 changes: 0 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/vm/src/parsed_wasm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/vm/src/wasm_backend/gatekeeper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading