Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
218 changes: 101 additions & 117 deletions Cargo.lock

Large diffs are not rendered by default.

29 changes: 24 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,29 @@ lto = true
opt-level = 3

[dependencies]
wasmtime = "=27.0.0"
wasmtime-wasi = "=27.0.0"
wasi-common = "=27.0.0"
deterministic-wasi-ctx = "=0.1.27"
wasmtime = { version = "=28.0.0", default-features = false, features = [
"addr2line",
"all-arch",
"async",
"cache",
"component-model",
"coredump",
"cranelift",
"debug-builtins",
"demangle",
"parallel-compilation",
"pooling-allocator",
"profiling",
"runtime",
"signals-based-traps",
"std",
"threads",
"wat",
"winch",
] }
wasmtime-wasi = "=28.0.0"
wasi-common = "=28.0.0"
deterministic-wasi-ctx = "=0.1.28"
anyhow = "1.0"
clap = { version = "4.5", features = ["derive"] }
serde_json = "1.0"
Expand All @@ -34,7 +53,7 @@ serde = "1.0"
rust-embed = "8.5.0"
rmp-serde = "1.3"
is-terminal = "0.4.13"
wasmprof = "0.8.0"
wasmprof = "0.9.0"
bluejay-core = { version = "=0.2.0" }
bluejay-parser = { version = "=0.2.0", features = ["format-errors"] }
bluejay-validator = { version = "=0.2.0" }
Expand Down
3 changes: 2 additions & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[toolchain]
channel = "1.80.0"
channel = "1.84.0"
targets = [ "wasm32-wasip1" ]
components = [ "rustc", "rust-std", "cargo", "rust-docs", "rustfmt", "clippy" ]
1 change: 0 additions & 1 deletion src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ pub fn run(params: FunctionRunParams) -> Result<FunctionRunResult> {
Config::new()
.wasm_multi_memory(true)
.wasm_threads(false)
.wasm_reference_types(false)
.consume_fuel(true)
.epoch_interruption(true),
)?;
Expand Down
2 changes: 1 addition & 1 deletion src/scale_limits_analyzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl<'a>
}
}

impl<'a> ScaleLimits<'a> {
impl ScaleLimits<'_> {
const MIN_SCALE_FACTOR: f64 = 1.0;
const MAX_SCALE_FACTOR: f64 = 10.0;

Expand Down
6 changes: 3 additions & 3 deletions tests/fixtures/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ Example Functions used as test fixtures.
## Recompiling

**Prereqs:**
- Cargo WASI: `cargo install cargo-wasi`
- wasm-opt from [binaryen](https://github.com/WebAssembly/binaryen)
- wat2wasm from [WABT](https://github.com/WebAssembly/wabt)


**Rust examples:**
```
cargo wasi build --profile=wasm -p exit_code -p exports -p log_truncation_function -p noop &&
cp target/wasm32-wasi/wasm/{exit_code.wasm,exports.wasm,log_truncation_function.wasm,noop.wasm} tests/fixtures/build
cargo build --target wasm32-wasip1 --profile=wasm -p exit_code -p exports -p log_truncation_function -p noop &&
find target/wasm32-wasip1/wasm/{exit_code.wasm,exports.wasm,log_truncation_function.wasm,noop.wasm} | xargs -I {} sh -c 'name=$(basename {}); wasm-opt {} -Oz --enable-bulk-memory --strip-debug -o "tests/fixtures/build/$name"'
```

**JS examples:**
Expand Down
Binary file modified tests/fixtures/build/exit_code.wasm
Binary file not shown.
Binary file modified tests/fixtures/build/exports.wasm
Binary file not shown.
Binary file modified tests/fixtures/build/log_truncation_function.wasm
Binary file not shown.
Binary file modified tests/fixtures/build/noop.wasm
Binary file not shown.
Loading