Merge pull request #10 from bandprotocol/gas-metering

Gas metering

Author: taobun

.github/workflows/ci.yaml

@@ -16,9 +16,9 @@ jobs:
 
       - name: Install Wabt (wat2wasm)
         run: |
-          wget https://github.com/WebAssembly/wabt/releases/download/1.0.17/wabt-1.0.17-ubuntu.tar.gz
-          tar -zxf wabt-1.0.17-ubuntu.tar.gz
-          sudo cp wabt-1.0.17/bin/wat2wasm /usr/local/bin
+          wget https://github.com/WebAssembly/wabt/releases/download/1.0.29/wabt-1.0.29-ubuntu.tar.gz
+          tar -zxf wabt-1.0.29-ubuntu.tar.gz
+          sudo cp wabt-1.0.29/bin/wat2wasm /usr/local/bin
 
       - name: Check cargo cache
         uses: actions/cache@v2

packages/vm/Cargo.toml

@@ -2,7 +2,7 @@
 name = "owasm-vm"
 version = "0.1.12"
 authors = ["Band Protocol <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/bandprotocol/owasm/tree/master/packages/vm"
 description = "Oracle script VM runtime"
@@ -13,8 +13,9 @@ assert_matches = "1.3.0"
 hex = "0.4"
 parity-wasm = "0.41"
 pwasm-utils = "0.12"
-wasmer = { version = "1.0.2", default-features = false, features = ["jit", "singlepass", "compiler"] }
-owasm-crypto = { path = "../crypto", version = "0.1.13" }
+wasmer = { version = "2.3.0", default-features = false, features = ["singlepass", "compiler", "universal"] }
+wasmer-middlewares = "2.3.0"
+# owasm-crypto = { path = "../crypto", version = "0.1.13" }
 tempfile = "3.1.0"
 clru = "0.2.0"
 cosmwasm-vm = "0.13.2"

packages/vm/src/cache.rs

@@ -89,7 +89,7 @@ mod test {
     use std::io::{Read, Write};
     use std::process::Command;
     use tempfile::NamedTempFile;
-    use wasmer::{imports, Singlepass, Store, JIT};
+    use wasmer::{imports, Singlepass, Store, Universal};
 
     fn wat2wasm(wat: impl AsRef<[u8]>) -> Vec<u8> {
         let mut input_file = NamedTempFile::new().unwrap();
@@ -110,7 +110,7 @@ mod test {
 
     fn get_instance_without_err(cache: &mut Cache, wasm: &[u8]) -> wasmer::Instance {
         let compiler = Singlepass::new();
-        let store = Store::new(&JIT::new(compiler).engine());
+        let store = Store::new(&Universal::new(compiler).engine());
         let import_object = imports! {};
 
         match cache.get_instance(&wasm, &store, &import_object) {