Rewrite Rust bindings and use wasm3 0.5.0

Author: kostko

.github/workflows/ci-audit.yml

@@ -0,0 +1,25 @@
+# NOTE: This name appears in GitHub's Checks API and in workflow's status badge.
+name: ci-audit
+
+# Trigger the workflow when:
+on:
+  # A push modifies one of the matches files.
+  push:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+
+jobs:
+
+  audit:
+    # NOTE: This name appears in GitHub's Checks API.
+    name: audit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-lint.yml

@@ -0,0 +1,45 @@
+# NOTE: This name appears in GitHub's Checks API and in workflow's status badge.
+name: ci-lint
+
+# Trigger the workflow when:
+on:
+  # A push occurs to one of the matched branches.
+  push:
+    branches:
+      - master
+  # Or when a pull request event occurs for a pull request against one of the
+  # matched branches.
+  pull_request:
+    branches:
+      - master
+
+jobs:
+
+  lint-rust:
+    # NOTE: This name appears in GitHub's Checks API.
+    name: lint-rust
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          components: rustfmt, clippy
+          override: true
+
+      - name: Clippy check
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features -- -D warnings -D clippy::dbg_macro
+
+      - name: Formatting check
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: -- --check

.github/workflows/ci-test.yaml

@@ -0,0 +1,77 @@
+# NOTE: This name appears in GitHub's Checks API and in workflow's status badge.
+name: ci-test
+
+# Trigger the workflow when:
+on:
+  # A push occurs to one of the matched branches.
+  push:
+    branches:
+      - master
+  # Or when a pull request event occurs for a pull request against one of the
+  # matched branches.
+  pull_request:
+    branches:
+      - master
+
+jobs:
+
+  test-rust:
+    # NOTE: This name appears in GitHub's Checks API.
+    name: test-rust
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          components: rustfmt # rustfmt is required for macros tests.
+          override: true
+
+      - name: Unit tests with coverage
+        uses: actions-rs/[email protected]
+        with:
+          version: '0.18.0'
+          args: '--avoid-cfg-tarpaulin -- --test-threads 1'
+
+      - name: Upload to codecov.io
+        uses: codecov/[email protected]
+
+      - name: Archive code coverage results
+        uses: actions/[email protected]
+        with:
+          name: code-coverage-report
+          path: cobertura.xml
+
+  test-rust-sgx:
+    # NOTE: This name appears in GitHub's Checks API.
+    name: test-rust-sgx
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-multilib
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          components: rustfmt # rustfmt is required for macros tests.
+          target: x86_64-fortanix-unknown-sgx
+          override: true
+
+      - name: Build for SGX
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --target x86_64-fortanix-unknown-sgx

.github/workflows/rust.yml

@@ -1,3 +1,4 @@
 **/target
 Cargo.lock
 wasm3-sys/wrapper.h
+rust-toolchain

.gitignore

@@ -1,35 +1,28 @@
 [package]
 name = "wasm3"
-version = "0.1.3"
-authors = ["Lukas Tobias Wirth <[email protected]>"]
+version = "0.2.0"
+authors = [
+    "Oasis Protocol Foundation <[email protected]>",
+    "Lukas Tobias Wirth <[email protected]>"
+]
 edition = "2018"
 description = "Rust bindings for wasm3"
-homepage = "https://github.com/Veykril/wasm3-rs"
-repository = "https://github.com/Veykril/wasm3-rs"
 license = "MIT"
-readme = "README.md"
 categories = ["api-bindings"]
-exclude = ["examples/*", "tests/*"]
-
-[features]
-default = ["wasi", "std", "use-32bit-slots"]
-
-wasi = ["ffi/wasi"]
-std = []
-use-32bit-slots = ["ffi/use-32bit-slots"]
 
 [dependencies]
 cty = "0.2"
+thiserror = "1.0"
+impl-trait-for-tuples = "0.2.1"
 
 [dependencies.ffi]
 path = "wasm3-sys"
 package = "wasm3-sys"
+default-features = false
 
-[dev-dependencies]
-trybuild = "1.0"
+[target.x86_64-fortanix-unknown-sgx.dependencies]
+rs-libc = "0.2.3"
 
-[package.metadata.docs.rs]
-all-features = true
-
-[workspace]
-members = ["wasm3-sys"]
+[features]
+default = []
+floats = ["ffi/floats"]

CHANGELOG.md

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2020 Lukas Tobias Wirth
+Copyright (c) 2021 Oasis Protocol Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

Cargo.toml

@@ -1,44 +1 @@
 # wasm3-rs 
-
-![Build](https://github.com/Veykril/wasm3-rs/workflows/Rust/badge.svg?branch=master) ![Tokei](https://tokei.rs/b1/github/veykril/wasm3-rs)
-[![Crates.io](https://img.shields.io/crates/v/wasm3.svg)](https://crates.io/crates/wasm3)
-[![Docs.rs](https://docs.rs/wasm3/badge.svg)](https://docs.rs/wasm3)
-
-## > wasm3-rs is looking for a maintainer <
-
-Rust wrapper for [WASM3](https://github.com/wasm3/wasm3).
-
-This is currently work in progress and may or may not be entirely sound.
-
-## Sample
-
-A simple [example](./examples/call_wasm.rs) that loads a wasm module and executes an exported function to add two `i64`s together.
-
-```rust
-use wasm3::Environment;
-use wasm3::Module;
-
-fn main() {
-    let env = Environment::new().expect("Unable to create environment");
-    let rt = env
-        .create_runtime(1024 * 60)
-        .expect("Unable to create runtime");
-    let module = Module::parse(&env, &include_bytes!("wasm/wasm_add/wasm_add.wasm")[..])
-        .expect("Unable to parse module");
-
-    let module = rt.load_module(module).expect("Unable to load module");
-    let func = module
-        .find_function::<(i64, i64), i64>("add")
-        .expect("Unable to find function");
-    println!("Wasm says that 3 + 6 is {}", func.call(3, 6).unwrap())
-}
-```
-
-## Building
-
-This crate currently does not make use of the cmake project of wasm3, meaning cmake is not required to built this for the time being.
-It does however require [Clang 9](https://releases.llvm.org/download.html#9.0.0) to be installed as well as [Bindgen](https://github.com/rust-lang/rust-bindgen), should the `build-bindgen` feature not be set.
-
-## License
-
-Licensed under the MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)