Fix

CosmWasm · Sep 23, 2024 · f5bf24f · f5bf24f
1 parent 6f61673
commit f5bf24f
Show file tree

Hide file tree

Showing 20 changed files with 298 additions and 20 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/empty/Cargo.lock b/contracts/empty/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-callbacks/Cargo.lock b/contracts/ibc-callbacks/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
@@ -58,6 +58,7 @@ sha2 = "0.10.3"
 thiserror = "1.0.26"
 wasmer = { version = "=4.3.3", default-features = false, features = ["singlepass"] }
 wasmer-middlewares = "=4.3.3"
+wasmer-types = "=4.3.3"
 strum = { version = "0.26.2", default-features = false, features = ["derive"] }
 # For heap profiling. Only used in the "heap_profiling" example. This has to be a non-dev dependency
 # because cargo currently does not support optional dev-dependencies.

diff --git a/packages/vm/src/instance.rs b/packages/vm/src/instance.rs
@@ -914,7 +914,7 @@ mod tests {
 
         let report2 = instance.create_gas_report();
         assert_eq!(report2.used_externally, 251);
-        assert_eq!(report2.used_internally, 16995280);
+        assert_eq!(report2.used_internally, 21059380);
         assert_eq!(report2.limit, LIMIT);
         assert_eq!(
             report2.remaining,
@@ -1105,7 +1105,7 @@ mod tests {
             .unwrap();
 
         let init_used = orig_gas - instance.get_gas_left();
-        assert_eq!(init_used, 16995531);
+        assert_eq!(init_used, 21059631);
     }
 
     #[test]
@@ -1130,7 +1130,7 @@ mod tests {
             .unwrap();
 
         let execute_used = gas_before_execute - instance.get_gas_left();
-        assert_eq!(execute_used, 19589666);
+        assert_eq!(execute_used, 25160611);
     }
 
     #[test]
@@ -1173,6 +1173,6 @@ mod tests {
         );
 
         let query_used = gas_before_query - instance.get_gas_left();
-        assert_eq!(query_used, 11942871);
+        assert_eq!(query_used, 15106521);
     }
 }
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
@@ -63,7 +63,13 @@ use super::CachedModule;
 ///   Module compatibility between Wasmer versions is not guaranteed.
 /// - **v10**:<br>
 ///   New version because of Metering middleware change.
-const MODULE_SERIALIZATION_VERSION: &str = "v10";
+/// - **v11**:<br>
+///   Reserved for 1.5.x branch.
+/// - **v12**:<br>
+///   Reserved for 2.0.x branch.
+/// - **v13**:<br>
+///   New version because of Metering middleware change.
+const MODULE_SERIALIZATION_VERSION: &str = "v13";
 
 /// Representation of a directory that contains compiled Wasm artifacts.
 pub struct FileSystemCache {
@@ -315,7 +321,7 @@ mod tests {
         cache.store(&checksum, &module).unwrap();
 
         let mut globber = glob::glob(&format!(
-            "{}/v10-wasmer7/**/{}.module",
+            "{}/v13-wasmer7/**/{}.module",
             tmp_dir.path().to_string_lossy(),
             checksum
         ))
@@ -398,9 +404,9 @@ mod tests {
         assert_eq!(
             p.as_os_str(),
             if cfg!(windows) {
-                "modules\\v10-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
+                "modules\\v13-wasmer17\\x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
             } else {
-                "modules/v10-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
+                "modules/v13-wasmer17/x86_64-nintendo-fuchsia-gnu-coff-01E9F9FE"
             }
         );
     }

diff --git a/packages/vm/src/wasm_backend/engine.rs b/packages/vm/src/wasm_backend/engine.rs
@@ -3,12 +3,12 @@ use wasmer::NativeEngineExt;
 use wasmer::{
     sys::BaseTunables, wasmparser::Operator, CompilerConfig, Engine, Pages, Target, WASM_PAGE_SIZE,
 };
-use wasmer_middlewares::Metering;
 
 use crate::size::Size;
 
 use super::gatekeeper::Gatekeeper;
 use super::limiting_tunables::LimitingTunables;
+use super::metering::{is_accounting, Metering};
 
 /// WebAssembly linear memory objects have sizes measured in pages. Each page
 /// is 65536 (2^16) bytes. In WebAssembly version 1, a linear memory can have at
@@ -25,17 +25,10 @@ fn cost(operator: &Operator) -> u64 {
     // precise enough to derive insights from it.
     const GAS_PER_OPERATION: u64 = 115;
 
-    match operator {
-        Operator::Loop { .. }
-        | Operator::End
-        | Operator::Else
-        | Operator::Br { .. }
-        | Operator::BrTable { .. }
-        | Operator::BrIf { .. }
-        | Operator::Call { .. }
-        | Operator::CallIndirect { .. }
-        | Operator::Return => GAS_PER_OPERATION * 14,
-        _ => GAS_PER_OPERATION,
+    if is_accounting(operator) {
+        GAS_PER_OPERATION * 14
+    } else {
+        GAS_PER_OPERATION
     }
 }