Merge pull request #1664 from CosmWasm/hash-Target

Hash target (triple + CPU features) into module cache directory
CosmWasm · Apr 24, 2023 · 94e1eb4 · 94e1eb4
2 parents e40146a + f7d2546
commit 94e1eb4
Show file tree

Hide file tree

Showing 15 changed files with 149 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,10 +22,14 @@ and this project adheres to
   [cosmwasm-check](https://crates.io/crates/cosmwasm-check) instead ([#1511]).
 - cosmwasm-vm: Avoid using loupe for getting the `Module` size in the file
   system cache to prepare for the Wasmer 3 upgrade.
+- cosmwasm-vm: Add target (triple + CPU features) into the module cache
+  directory to avoid using modules compiled for a different system. Bump
+  `MODULE_SERIALIZATION_VERSION` to "v5". ([#1664])
 
 [#1511]: https://github.com/CosmWasm/cosmwasm/issues/1511
 [#1629]: https://github.com/CosmWasm/cosmwasm/pull/1629
 [#1631]: https://github.com/CosmWasm/cosmwasm/pull/1631
+[#1664]: https://github.com/CosmWasm/cosmwasm/pull/1664
 
 ## [1.2.4] - 2023-04-17
 

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/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/virus/Cargo.lock b/contracts/virus/Cargo.lock
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
@@ -36,6 +36,7 @@ bench = false
 
 [dependencies]
 clru = "0.4.0"
+crc32fast = "1.3.2"
 # Uses the path when built locally; uses the given version from crates.io when published
 cosmwasm-std = { path = "../std", version = "1.2.4", default-features = false }
 cosmwasm-crypto = { path = "../crypto", version = "1.2.4" }
@@ -64,12 +65,14 @@ bitflags = "1.1.0" # https://github.com/CensoredUsername/dynasm-rs/pull/74
 
 [dev-dependencies]
 criterion = { version = "0.4", features = [ "html_reports" ] }
+glob = "0.3.1"
 hex-literal = "0.3.1"
 tempfile = "3.1.0"
 wat = "1.0"
 clap = "2.33.3"
 rand = "0.8"
 leb128 = "0.2"
+target-lexicon = "0.12"
 
 [[bench]]
 name = "main"