Skip to content

Commit 5b54a0c

Browse files
assafmoassafmo
committed
Support Wasm compiled with Rust v1.70+
Starting from v1.70, Rust uses the Wasm sign extension opcodes when compiling to Wasm. Our Wasm parser for static analysis had to be updated in order to correctly parse these opcodes. Refs: - CosmWasm/cosmwasm#1727 - CosmWasm/cosmwasm#1743 - https://github.com/WebAssembly/sign-extension-ops/blob/master/proposals/sign-extension-ops/Overview.md
1 parent de39a8c commit 5b54a0c

File tree

19 files changed

+37
-27
lines changed

19 files changed

+37
-27
lines changed

β€Žcosmwasm/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcosmwasm/contracts/v010/compute-tests/test-compute-contract/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.69
1+
1.71

β€Žcosmwasm/contracts/v1/compute-tests/random-test/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.69
1+
1.71

β€Žcosmwasm/contracts/v1/compute-tests/test-compute-contract-v2/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.69
1+
1.71

β€Žcosmwasm/contracts/v1/compute-tests/test-compute-contract/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.69
1+
1.71

β€Žcosmwasm/enclaves/Cargo.lock

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcosmwasm/enclaves/execute/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx" }
6969
ctor = "0.1.13"
7070
derive_more = "0.99"
7171
pwasm-utils = { version = "0.12.0", default-features = false }
72-
parity-wasm = { version = "0.41.0", default-features = false }
72+
parity-wasm = { version = "0.45.0", default-features = false, features = [
73+
"sign_ext"
74+
] }
7375
base64 = { rev = "dc7389e10817b078f289386b3b6a852ab6c4c021", git = "https://github.com/mesalock-linux/rust-base64-sgx" }
7476
# for attestation
7577
chrono = { git = "https://github.com/mesalock-linux/chrono-sgx" }

β€Žcosmwasm/enclaves/shared/contract-engine/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ derive_more = "0.99"
4949
sha2 = "0.8.1"
5050
bech32 = "0.7.2"
5151
pwasm-utils = { version = "0.12.0", default-features = false, optional = true }
52-
parity-wasm = { version = "0.41.0", default-features = false, optional = true }
52+
parity-wasm = { version = "0.45.0", default-features = false, optional = true, features = [
53+
"sign_ext"
54+
] }
5355
wasm3 = { git = "https://github.com/scrtlabs/wasm3-rs", rev = "ad1c868" }
5456
walrus = { version = "0.19.0", git = "https://github.com/scrtlabs/walrus", rev = "c5777d4" }
5557
lru = { version = "0.7", default-features = false }

β€Žcosmwasm/enclaves/test/Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcosmwasm/packages/sgx-vm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ snafu = { version = "0.6.3" }
5353
sha2 = "0.10.7"
5454
hex = "0.4"
5555
memmap = "0.7"
56-
parity-wasm = "0.41"
56+
parity-wasm = { version = "0.45", features = ["sign_ext"] }
5757
# requirements specific to Secret Network
5858
lazy_static = "1.4"
5959
enclave-ffi-types = { path = "../../enclaves/ffi-types", features = [

β€Ždeployment/dockerfiles/base-images/secret-contract-optimizer.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.69.0-slim-bullseye
1+
FROM rust:1.71.0-slim-bullseye
22

33
RUN rustup target add wasm32-unknown-unknown
44
RUN apt update && apt install -y binaryen clang && rm -rf /var/lib/apt/lists/*

β€Žgo-cosmwasm/Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žx/compute/internal/keeper/testdata/contract.wasm

-11.8 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/contract_with_floats.wasm

-12.2 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/static-too-high-initial-memory.wasm

-12 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/too-high-initial-memory.wasm

-12 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/v1-contract-v2.wasm

-8.94 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/v1-contract.wasm

-11.5 KB
Binary file not shown.

β€Žx/compute/internal/keeper/testdata/v1_random_test.wasm

1.9 KB
Binary file not shown.

0 commit comments

Comments
Β (0)