Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Bump wasmtime to 0.38.0 and zstd to 0.11.2 #11720

Merged
merged 2 commits into from
Jun 24, 2022
Merged

Bump wasmtime to 0.38.0 and zstd to 0.11.2 #11720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dd45ae
Bump `wasmtime` to 0.37.0 and `zstd` to 0.11.2
koute Jun 21, 2022
7f0993b
Bump `wasmtime` to 0.38.0
koute Jun 22, 2022
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
180 changes: 102 additions & 78 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/executor/wasmtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
libc = "0.2.121"
log = "0.4.17"
parity-wasm = "0.42.0"
wasmtime = { version = "0.35.3", default-features = false, features = [
wasmtime = { version = "0.38.0", default-features = false, features = [
"cache",
"cranelift",
"jitdump",
Expand Down
12 changes: 1 addition & 11 deletions client/executor/wasmtime/src/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ where
{
let mut pending_func_imports = HashMap::new();
for import_ty in module.imports() {
let name = import_name(&import_ty)?;
let name = import_ty.name();

if import_ty.module() != "env" {
return Err(WasmError::Other(format!(
Expand Down Expand Up @@ -121,13 +121,3 @@ impl<'a, 'b> sp_wasm_interface::HostFunctionRegistry for Registry<'a, 'b> {
Ok(())
}
}

/// When the module linking proposal is supported the import's name can be `None`.
/// Because we are not using this proposal we could safely unwrap the name.
/// However, we opt for an error in order to avoid panics at all costs.
fn import_name<'a, 'b: 'a>(import: &'a ImportType<'b>) -> Result<&'a str, WasmError> {
let name = import.name().ok_or_else(|| {
WasmError::Other("The module linking proposal is not supported.".to_owned())
})?;
Ok(name)
}
1 change: 0 additions & 1 deletion client/executor/wasmtime/src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ fn common_config(semantics: &Semantics) -> std::result::Result<wasmtime::Config,
config.wasm_bulk_memory(false);
config.wasm_multi_value(false);
config.wasm_multi_memory(false);
config.wasm_module_linking(false);
config.wasm_threads(false);
config.wasm_memory64(false);

Expand Down
2 changes: 1 addition & 1 deletion frame/state-trie-migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log = { version = "0.4.17", default-features = false }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.133", optional = true }
thousands = { version = "0.2.0", optional = true }
zstd = { version = "0.10.0", default-features = false, optional = true }
zstd = { version = "0.11.2", default-features = false, optional = true }
frame-benchmarking = { default-features = false, optional = true, path = "../benchmarking" }
frame-support = { default-features = false, path = "../support" }
frame-system = { default-features = false, path = "../system" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/maybe-compressed-blob/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ readme = "README.md"

[dependencies]
thiserror = "1.0"
zstd = { version = "0.10.0", default-features = false }
zstd = { version = "0.11.2", default-features = false }
2 changes: 1 addition & 1 deletion primitives/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sp-std = { version = "4.0.0", default-features = false, path = "../std" }
[dev-dependencies]
rand = "0.7.2"
serde_json = "1.0.79"
zstd = { version = "0.10.0", default-features = false }
zstd = { version = "0.11.2", default-features = false }
sp-api = { version = "4.0.0-dev", path = "../api" }
sp-state-machine = { version = "0.12.0", path = "../state-machine" }
sp-tracing = { version = "5.0.0", path = "../../primitives/tracing" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/wasm-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
impl-trait-for-tuples = "0.2.2"
log = { version = "0.4.17", optional = true }
wasmi = { version = "0.9.1", optional = true }
wasmtime = { version = "0.35.3", default-features = false, optional = true }
wasmtime = { version = "0.38.0", default-features = false, optional = true }
sp-std = { version = "4.0.0", default-features = false, path = "../std" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/try-runtime/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clap = { version = "3.1.18", features = ["derive"] }
log = "0.4.17"
parity-scale-codec = "3.0.0"
serde = "1.0.136"
zstd = { version = "0.10.0", default-features = false }
zstd = { version = "0.11.2", default-features = false }
remote-externalities = { version = "0.10.0-dev", path = "../../remote-externalities" }
jsonrpsee = { version = "0.14.0", default-features = false, features = ["ws-client"] }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../../client/chain-spec" }
Expand Down