Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(tooling): Use wasmer instead of wasmi #4261

Merged
merged 6 commits into from
Sep 29, 2024
Merged

chore(tooling): Use wasmer instead of wasmi #4261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
158824e
Remove `sandbox-wasmer-*` crates
ark0f Sep 26, 2024
766afc1
Use wasmer instead of wasmi in tooling
ark0f Sep 26, 2024
e6bcbee
Return error instead of unwrap in gcli
ark0f Sep 26, 2024
527adf5
Remove garbage comments
ark0f Sep 28, 2024
6441259
Fix `crates-io` table parsing
ark0f Sep 28, 2024
aac9c76
Minor fixes
ark0f Sep 29, 2024
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
90 changes: 17 additions & 73 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ wabt = "0.10.0"
wasmer = "4.3.4"
wasmer-cache = "4.3.4"
wasmer-types = "4.3.4"
wasmi = { version = "0.14.0", default-features = false }
wasmtime = "8.0.1"
wasmparser = { package = "wasmparser-nostd", version = "0.100.1", default-features = false }
which = "4.4.2"
Expand Down Expand Up @@ -303,11 +302,7 @@ ethexe-validator = { path = "ethexe/validator", default-features = false }
ethexe-rpc = { path = "ethexe/rpc", default-features = false }
ethexe-common = { path = "ethexe/common" }

# Common executors between `sandbox-host` and `calc-stack-height`
sandbox-wasmer = { package = "wasmer", version = "4.3.4", features = [
"singlepass",
] }
sandbox-wasmer-types = { package = "wasmer-types", version = "4.3.4" }
# Common executor between `sandbox-host` and `lazy-pages-fuzzer`
sandbox-wasmi = { package = "wasmi", git = "https://github.com/gear-tech/wasmi", branch = "v0.13.2-sign-ext", features = [
clearloop marked this conversation as resolved.
Show resolved Hide resolved
"virtual_memory",
] }
Expand Down Expand Up @@ -542,11 +537,6 @@ num-traits = { version = "0.2", default-features = false } # gear-core
glob = "0.3.1" # cargo-gbuild
smallvec = "1.13.2" # utils/node-wrapper

# TODO: remove after wasmer bug is fixed:
# `misaligned pointer dereference: address must be a multiple of 0x8 but is...`
[profile.dev.package."wasmer-vm"]
debug-assertions = false

[profile.release]
panic = "unwind"

Expand Down
4 changes: 2 additions & 2 deletions gcli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ etc.workspace = true
runtime-primitives.workspace = true
url = { workspace = true, features = ["serde"] }
toml.workspace = true
# TODO: use wasmi from workspace (#3214)
wasmi = { version = "0.30.0", features = ["std"] }
wasmer = { workspace = true, features = ["std"] }
wasmer-types.workspace = true

[dev-dependencies]
rand.workspace = true
Expand Down
Loading
Loading