Support Wasm compiled with Rust v1.70+

Starting from v1.70, Rust uses the Wasm sign extenstion opcodes when comipling to Wasm. Our Wasm parser for static analysis had to be updated in order to correctly parse these opcodes. Refs: - https://github.com/WebAssembly/sign-extension-ops/blob/master/proposals/sign-extension-ops/Overview.md - CosmWasm/cosmwasm#1727 - CosmWasm/cosmwasm#1743
scrtlabs · Aug 6, 2023 · a9c46f5 · a9c46f5
1 parent de39a8c
commit a9c46f5
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 27 deletions.
diff --git a/cosmwasm/Cargo.lock b/cosmwasm/Cargo.lock
diff --git a/cosmwasm/contracts/v010/compute-tests/test-compute-contract/rust-toolchain b/cosmwasm/contracts/v010/compute-tests/test-compute-contract/rust-toolchain
@@ -1 +1 @@
-1.69
+1.71
diff --git a/cosmwasm/contracts/v1/compute-tests/random-test/rust-toolchain b/cosmwasm/contracts/v1/compute-tests/random-test/rust-toolchain
@@ -1 +1 @@
-1.69
+1.71
diff --git a/cosmwasm/contracts/v1/compute-tests/test-compute-contract-v2/rust-toolchain b/cosmwasm/contracts/v1/compute-tests/test-compute-contract-v2/rust-toolchain
@@ -1 +1 @@
-1.69
+1.71
diff --git a/cosmwasm/contracts/v1/compute-tests/test-compute-contract/rust-toolchain b/cosmwasm/contracts/v1/compute-tests/test-compute-contract/rust-toolchain
@@ -1 +1 @@
-1.69
+1.71
diff --git a/cosmwasm/enclaves/Cargo.lock b/cosmwasm/enclaves/Cargo.lock
diff --git a/cosmwasm/enclaves/execute/Cargo.toml b/cosmwasm/enclaves/execute/Cargo.toml
@@ -69,7 +69,9 @@ serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx" }
 ctor = "0.1.13"
 derive_more = "0.99"
 pwasm-utils = { version = "0.12.0", default-features = false }
-parity-wasm = { version = "0.41.0", default-features = false }
+parity-wasm = { version = "0.45.0", default-features = false, features = [
+  "sign_ext"
+] }
 base64 = { rev = "dc7389e10817b078f289386b3b6a852ab6c4c021", git = "https://github.com/mesalock-linux/rust-base64-sgx" }
 # for attestation
 chrono = { git = "https://github.com/mesalock-linux/chrono-sgx" }

diff --git a/cosmwasm/enclaves/shared/contract-engine/Cargo.toml b/cosmwasm/enclaves/shared/contract-engine/Cargo.toml
@@ -49,7 +49,9 @@ derive_more = "0.99"
 sha2 = "0.8.1"
 bech32 = "0.7.2"
 pwasm-utils = { version = "0.12.0", default-features = false, optional = true }
-parity-wasm = { version = "0.41.0", default-features = false, optional = true }
+parity-wasm = { version = "0.45.0", default-features = false, optional = true, features = [
+  "sign_ext"
+] }
 wasm3 = { git = "https://github.com/scrtlabs/wasm3-rs", rev = "ad1c868" }
 walrus = { version = "0.19.0", git = "https://github.com/scrtlabs/walrus", rev = "c5777d4" }
 lru = { version = "0.7", default-features = false }

diff --git a/cosmwasm/enclaves/test/Cargo.lock b/cosmwasm/enclaves/test/Cargo.lock
diff --git a/cosmwasm/packages/sgx-vm/Cargo.toml b/cosmwasm/packages/sgx-vm/Cargo.toml
@@ -53,7 +53,7 @@ snafu = { version = "0.6.3" }
 sha2 = "0.10.7"
 hex = "0.4"
 memmap = "0.7"
-parity-wasm = "0.41"
+parity-wasm = { version = "0.45", features = ["sign_ext"] }
 # requirements specific to Secret Network
 lazy_static = "1.4"
 enclave-ffi-types = { path = "../../enclaves/ffi-types", features = [

diff --git a/deployment/dockerfiles/base-images/secret-contract-optimizer.Dockerfile b/deployment/dockerfiles/base-images/secret-contract-optimizer.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.69.0-slim-bullseye
+FROM rust:1.71.0-slim-bullseye
 
 RUN rustup target add wasm32-unknown-unknown
 RUN apt update && apt install -y binaryen clang && rm -rf /var/lib/apt/lists/*

diff --git a/go-cosmwasm/Cargo.lock b/go-cosmwasm/Cargo.lock
diff --git a/x/compute/internal/keeper/testdata/contract.wasm b/x/compute/internal/keeper/testdata/contract.wasm
diff --git a/x/compute/internal/keeper/testdata/contract_with_floats.wasm b/x/compute/internal/keeper/testdata/contract_with_floats.wasm
diff --git a/x/compute/internal/keeper/testdata/static-too-high-initial-memory.wasm b/x/compute/internal/keeper/testdata/static-too-high-initial-memory.wasm
diff --git a/x/compute/internal/keeper/testdata/too-high-initial-memory.wasm b/x/compute/internal/keeper/testdata/too-high-initial-memory.wasm
diff --git a/x/compute/internal/keeper/testdata/v1-contract-v2.wasm b/x/compute/internal/keeper/testdata/v1-contract-v2.wasm
diff --git a/x/compute/internal/keeper/testdata/v1-contract.wasm b/x/compute/internal/keeper/testdata/v1-contract.wasm
diff --git a/x/compute/internal/keeper/testdata/v1_random_test.wasm b/x/compute/internal/keeper/testdata/v1_random_test.wasm