feat: enable sign ext for wasm generated with rust 1.70 (#344)

* fix: enable sign ext This fix #338. And, this will be replaced with wasmparser in feature version. (CosmWasm/cosmwasm#1786) * Test contract compiled with Rust 1.70.0 * chore: update some contract's lock files * chore: update some contract's lock files --------- Co-authored-by: Simon Warta <[email protected]>
Finschia · Feb 7, 2024 · 62a4a24 · 62a4a24
1 parent b947b68
commit 62a4a24
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
diff --git a/contracts/query-queue/Cargo.lock b/contracts/query-queue/Cargo.lock
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
diff --git a/contracts/voting-with-uuid/Cargo.lock b/contracts/voting-with-uuid/Cargo.lock
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
@@ -44,7 +44,7 @@ clru = "0.4.0"
 cosmwasm-std = { path = "../std", version = "1.1.9+0.8.1", default-features = false }
 cosmwasm-crypto = { path = "../crypto", version = "1.1.9+0.8.1" }
 hex = "0.4"
-parity-wasm = "0.42"
+parity-wasm = { version = "0.45", features = ["sign_ext"] }
 schemars = "0.8.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0.40"

diff --git a/packages/vm/README.md b/packages/vm/README.md
@@ -69,6 +69,17 @@ docker run --rm -v "$(pwd)":/code \
   && cp artifacts/floaty.wasm packages/vm/testdata/floaty_1.0.wasm
 ```
 
+The `cyberpunk_rust170.wasm` for
+https://github.com/CosmWasm/cosmwasm/issues/1727 is built as follows
+(non-reproducible):
+
+```sh
+cd contracts/cyberpunk
+rm -r target
+RUSTFLAGS='-C link-arg=-s' cargo build --release --lib --target wasm32-unknown-unknown --locked
+cp target/wasm32-unknown-unknown/release/cyberpunk.wasm ../../packages/vm/testdata/cyberpunk_rust170.wasm
+```
+
 ## Testing
 
 By default, this repository is built and tested with the singlepass backend. You

diff --git a/packages/vm/src/compatibility.rs b/packages/vm/src/compatibility.rs
@@ -257,6 +257,7 @@ mod tests {
     static CONTRACT_0_14: &[u8] = include_bytes!("../testdata/hackatom_0.14.wasm");
     static CONTRACT_0_15: &[u8] = include_bytes!("../testdata/hackatom_0.15.wasm");
     static CONTRACT: &[u8] = include_bytes!("../testdata/hackatom.wasm");
+    static CONTRACT_RUST_170: &[u8] = include_bytes!("../testdata/cyberpunk_rust170.wasm");
 
     fn default_capabilities() -> HashSet<String> {
         ["staking".to_string()].into_iter().collect()
@@ -268,6 +269,12 @@ mod tests {
         check_wasm(CONTRACT, &default_capabilities()).unwrap();
     }
 
+    #[test]
+    fn check_wasm_allows_sign_ext() {
+        // See https://github.com/CosmWasm/cosmwasm/issues/1727
+        check_wasm(CONTRACT_RUST_170, &default_capabilities()).unwrap();
+    }
+
     #[test]
     fn check_wasm_old_contract() {
         match check_wasm(CONTRACT_0_15, &default_capabilities()) {

diff --git a/packages/vm/testdata/cyberpunk_rust170.wasm b/packages/vm/testdata/cyberpunk_rust170.wasm