fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2024-12-04 19:50:19 +00:00
Code Issues Projects Releases Wiki Activity

Update Rust crate semver to v1 (#198)

Browse Source 
* Update Rust crate semver to v1

* bump all the deps

* update wasmer-it and fix build

* bump more versions + fix marine-js

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Valery Antopol <valery.antopol@gmail.com>
This commit is contained in:
renovate[bot] 2022-09-13 16:25:11 +03:00 committed by GitHub
parent 853bc595ec
commit 684bf7cb38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 153 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
Cargo.lock generated
View File

@ -930,12 +930,12 @@ dependencies = [
[[package]] [[package]]
name = "fluence-app-service" name = "fluence-app-service"
version = "0.22.0" version = "0.22.1"
dependencies = [ dependencies = [
"log", "log",
"maplit", "maplit",
"marine-min-it-version 0.1.1", "marine-min-it-version 0.2.0",
"marine-runtime 0.22.0", "marine-runtime 0.23.0",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
@ -945,9 +945,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-it-types" name = "fluence-it-types"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "047f670b4807cab8872550a607b1515daff08b3e3bb7576ce8f45971fd811a4e" checksum = "f4e11b54c84babd376e0844d4973fdf7313799c4b9531757015ea6736ef14b70"
dependencies = [ dependencies = [
"it-to-bytes", "it-to-bytes",
"nom", "nom",
@ -1352,25 +1352,25 @@ dependencies = [
"serde_json", "serde_json",
"serde_with 1.14.0", "serde_with 1.14.0",
"thiserror", "thiserror",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
] ]
[[package]] [[package]]
name = "it-json-serde" name = "it-json-serde"
version = "0.3.3" version = "0.3.4"
dependencies = [ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"thiserror", "thiserror",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
] ]
[[package]] [[package]]
name = "it-lilo" name = "it-lilo"
version = "0.4.0" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a39dffcc610873b4c39b0fe04acac5ea77cf2eda9ed3d8a3b970b536d4e24c8" checksum = "59726dde6ea2df9ad15bb67341103879cb94f26642ee0e40bf9a426f8e69bec8"
dependencies = [ dependencies = [
"fluence-it-types", "fluence-it-types",
"it-memory-traits", "it-memory-traits",
@ -1381,9 +1381,9 @@ dependencies = [
[[package]] [[package]]
name = "it-memory-traits" name = "it-memory-traits"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca1799ed89e51a192e80a14ab14589044de9e58f0be86087ae8699cbe59f5c40" checksum = "40e8f26dd64f9c94c7e9c39b2be7bac4e3c946ca31bb5db4a13298199a4d56a2"
dependencies = [ dependencies = [
"thiserror", "thiserror",
] ]
@ -1507,7 +1507,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]] [[package]]
name = "marine" name = "marine"
version = "0.12.3" version = "0.12.4"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"anyhow", "anyhow",
@ -1516,10 +1516,10 @@ dependencies = [
"check-latest", "check-latest",
"clap", "clap",
"exitfailure", "exitfailure",
"marine-it-generator 0.9.3", "marine-it-generator 0.9.4",
"marine-it-parser 0.10.0", "marine-it-parser 0.11.0",
"marine-module-info-parser 0.4.0", "marine-module-info-parser 0.5.0",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"serde_json", "serde_json",
"termion", "termion",
@ -1564,7 +1564,7 @@ dependencies = [
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
"thiserror", "thiserror",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -1572,7 +1572,7 @@ dependencies = [
[[package]] [[package]]
name = "marine-core" name = "marine-core"
version = "0.17.0" version = "0.18.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"boolinator", "boolinator",
@ -1581,12 +1581,12 @@ dependencies = [
"it-lilo", "it-lilo",
"it-memory-traits", "it-memory-traits",
"log", "log",
"marine-it-generator 0.9.3", "marine-it-generator 0.9.4",
"marine-it-interfaces 0.7.2", "marine-it-interfaces 0.7.3",
"marine-it-parser 0.10.0", "marine-it-parser 0.11.0",
"marine-min-it-version 0.1.1", "marine-min-it-version 0.2.0",
"marine-module-info-parser 0.4.0", "marine-module-info-parser 0.5.0",
"marine-module-interface 0.5.0", "marine-module-interface 0.6.0",
"marine-utils 0.4.0", "marine-utils 0.4.0",
"multimap", "multimap",
"once_cell", "once_cell",
@ -1594,11 +1594,11 @@ dependencies = [
"paste", "paste",
"pwasm-utils 0.19.0", "pwasm-utils 0.19.0",
"reqwest", "reqwest",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"thiserror", "thiserror",
"tokio", "tokio",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -1618,22 +1618,22 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus 0.18.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
] ]
[[package]] [[package]]
name = "marine-it-generator" name = "marine-it-generator"
version = "0.9.3" version = "0.9.4"
dependencies = [ dependencies = [
"it-lilo", "it-lilo",
"marine-it-parser 0.10.0", "marine-it-parser 0.11.0",
"marine-macro-impl", "marine-macro-impl",
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
"walrus 0.19.0", "walrus 0.19.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
] ]
[[package]] [[package]]
@ -1643,15 +1643,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3236d1068eaa0f1a07ab74b098b777c150c0c354a16d8869cd69ae3ff847014" checksum = "b3236d1068eaa0f1a07ab74b098b777c150c0c354a16d8869cd69ae3ff847014"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
] ]
[[package]] [[package]]
name = "marine-it-interfaces" name = "marine-it-interfaces"
version = "0.7.2" version = "0.7.3"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
] ]
[[package]] [[package]]
@ -1669,59 +1669,59 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus 0.18.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
[[package]] [[package]]
name = "marine-it-parser" name = "marine-it-parser"
version = "0.10.0" version = "0.11.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.3", "itertools 0.10.3",
"marine-it-interfaces 0.7.2", "marine-it-interfaces 0.7.3",
"marine-module-interface 0.5.0", "marine-module-interface 0.6.0",
"nom", "nom",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.19.0", "walrus 0.19.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
[[package]] [[package]]
name = "marine-js" name = "marine-js"
version = "0.3.2" version = "0.3.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"boolinator", "boolinator",
"bytesize", "bytesize",
"console_error_panic_hook", "console_error_panic_hook",
"fluence-it-types", "fluence-it-types",
"it-json-serde 0.3.3", "it-json-serde 0.3.4",
"it-lilo", "it-lilo",
"it-memory-traits", "it-memory-traits",
"itertools 0.10.3", "itertools 0.10.3",
"log", "log",
"maplit", "maplit",
"marine-it-interfaces 0.7.2", "marine-it-interfaces 0.7.3",
"marine-min-it-version 0.1.1", "marine-min-it-version 0.2.0",
"marine-module-interface 0.5.0", "marine-module-interface 0.6.0",
"marine-rs-sdk", "marine-rs-sdk",
"marine-utils 0.4.0", "marine-utils 0.4.0",
"multimap", "multimap",
"nom", "nom",
"once_cell", "once_cell",
"paste", "paste",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"thiserror", "thiserror",
"toml", "toml",
"wasm-bindgen", "wasm-bindgen",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
"web-sys", "web-sys",
] ]
@ -1760,10 +1760,10 @@ dependencies = [
[[package]] [[package]]
name = "marine-min-it-version" name = "marine-min-it-version"
version = "0.1.1" version = "0.2.0"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"semver 0.11.0", "semver 1.0.13",
] ]
[[package]] [[package]]
@ -1784,12 +1784,12 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-info-parser" name = "marine-module-info-parser"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.19.0", "walrus 0.19.0",
@ -1810,22 +1810,22 @@ dependencies = [
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus 0.18.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
] ]
[[package]] [[package]]
name = "marine-module-interface" name = "marine-module-interface"
version = "0.5.0" version = "0.6.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.3", "itertools 0.10.3",
"marine-it-interfaces 0.7.2", "marine-it-interfaces 0.7.3",
"nom", "nom",
"semver 0.11.0", "semver 1.0.13",
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.19.0", "walrus 0.19.0",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
] ]
[[package]] [[package]]
@ -1888,7 +1888,7 @@ dependencies = [
"serde_with 1.14.0", "serde_with 1.14.0",
"thiserror", "thiserror",
"toml", "toml",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.23.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -1896,15 +1896,15 @@ dependencies = [
[[package]] [[package]]
name = "marine-runtime" name = "marine-runtime"
version = "0.22.0" version = "0.23.0"
dependencies = [ dependencies = [
"bytesize", "bytesize",
"env_logger 0.9.0", "env_logger 0.9.0",
"it-json-serde 0.3.3", "it-json-serde 0.3.4",
"itertools 0.10.3", "itertools 0.10.3",
"log", "log",
"marine-core 0.17.0", "marine-core 0.18.0",
"marine-module-interface 0.5.0", "marine-module-interface 0.6.0",
"marine-rs-sdk", "marine-rs-sdk",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-utils 0.4.0", "marine-utils 0.4.0",
@ -1917,7 +1917,7 @@ dependencies = [
"serde_with 2.0.0", "serde_with 2.0.0",
"thiserror", "thiserror",
"toml", "toml",
"wasmer-interface-types-fl", "wasmer-interface-types-fl 0.24.1",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -2043,13 +2043,13 @@ dependencies = [
[[package]] [[package]]
name = "mrepl" name = "mrepl"
version = "0.18.5" version = "0.18.6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"check-latest", "check-latest",
"clap", "clap",
"env_logger 0.9.0", "env_logger 0.9.0",
"fluence-app-service 0.22.0", "fluence-app-service 0.22.1",
"itertools 0.10.3", "itertools 0.10.3",
"log", "log",
"marine-rs-sdk-main", "marine-rs-sdk-main",
@ -3832,6 +3832,27 @@ dependencies = [
"wast", "wast",
] ]
[[package]]
name = "wasmer-interface-types-fl"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba2a3bf176a65a5a1a136be5b9440395c2ba4493a3a07ea70cac553fe924185d"
dependencies = [
"fluence-it-types",
"it-lilo",
"it-memory-traits",
"it-to-bytes",
"itertools 0.10.3",
"log",
"nom",
"safe-transmute",
"semver 1.0.13",
"serde",
"serde_json",
"thiserror",
"wast",
]
[[package]] [[package]]
name = "wasmer-runtime-core" name = "wasmer-runtime-core"
version = "0.17.1" version = "0.17.1"

18
core/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-core" name = "marine-core"
description = "Core of Marine, the Fluence Wasm Runtime" description = "Core of Marine, the Fluence Wasm Runtime"
version = "0.17.0" version = "0.18.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,18 +11,18 @@ name = "marine_core"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.4.0" } marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.5.0" }
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.2" } marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.3" }
marine-it-parser = { path = "../crates/it-parser", version = "0.10.0" } marine-it-parser = { path = "../crates/it-parser", version = "0.11.0" }
marine-it-generator = { path = "../crates/it-generator", version = "0.9.3" } marine-it-generator = { path = "../crates/it-generator", version = "0.9.4" }
marine-module-interface = { path = "../crates/module-interface", version = "0.5.0" } marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.1"} marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.0" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] } wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
it-lilo = "0.4.0" it-lilo = "0.4.0"
it-memory-traits = "0.3.0" it-memory-traits = "0.3.0"
@ -33,7 +33,7 @@ boolinator = "2.4.0"
parity-wasm = "0.45.0" parity-wasm = "0.45.0"
pwasm-utils = "0.19.0" pwasm-utils = "0.19.0"
once_cell = "1.14.0" once_cell = "1.14.0"
semver = "0.11.0" semver = "1.0.13"
serde = "1.0.144" serde = "1.0.144"
log = "0.4.17" log = "0.4.17"

6
crates/fluence-app-service/Cargo.toml
View File

@ -1,14 +1,14 @@
[package] [package]
name = "fluence-app-service" name = "fluence-app-service"
description = "Fluence Application Service" description = "Fluence Application Service"
version = "0.22.0" version = "0.22.1"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
marine-runtime = { path = "../../marine", version = "0.22.0" } marine-runtime = { path = "../../marine", version = "0.23.0" }
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.1.1" } marine-min-it-version = { path = "../../crates/min-it-version", version = "0.2.0" }
maplit = "1.0.2" maplit = "1.0.2"
log = "0.4.17" log = "0.4.17"

6
crates/it-generator/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-generator" name = "marine-it-generator"
description = "Fluence Marine interface types generator" description = "Fluence Marine interface types generator"
version = "0.9.3" version = "0.9.4"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,10 +11,10 @@ name = "marine_it_generator"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-parser = { path = "../it-parser", version = "0.10.0"} marine-it-parser = { path = "../it-parser", version = "0.11.0" }
marine-macro-impl = "0.7.1" marine-macro-impl = "0.7.1"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
it-lilo = "0.4.0" it-lilo = "0.4.0"
thiserror = "1.0.34" thiserror = "1.0.34"

4
crates/it-interfaces/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-interfaces" name = "marine-it-interfaces"
description = "Fluence Marine interface types helper crate" description = "Fluence Marine interface types helper crate"
version = "0.7.2" version = "0.7.3"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,5 +11,5 @@ name = "marine_it_interfaces"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
multimap = "0.8.3" multimap = "0.8.3"

4
crates/it-json-serde/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "it-json-serde" name = "it-json-serde"
description = "Fluence Marine interface-types serde tools" description = "Fluence Marine interface-types serde tools"
version = "0.3.3" version = "0.3.4"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,7 +11,7 @@ name = "it_json_serde"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
serde = { version = "1.0.144", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85" serde_json = "1.0.85"

10
crates/it-parser/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-it-parser" name = "marine-it-parser"
description = "Fluence Marine interface types parser" description = "Fluence Marine interface types parser"
version = "0.10.0" version = "0.11.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,16 +11,16 @@ name = "marine_it_parser"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.2" } marine-it-interfaces = { path = "../it-interfaces", version = "0.7.3" }
marine-module-interface = { path = "../module-interface", version = "0.5.0" } marine-module-interface = { path = "../module-interface", version = "0.6.0" }
anyhow = "1.0.64" anyhow = "1.0.64"
walrus = "0.19.0" walrus = "0.19.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"} wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1" }
nom = "5.1" nom = "5.1"
itertools = "0.10.3" itertools = "0.10.3"
semver = "0.11.0" semver = "1.0.13"
serde = "1.0.144" serde = "1.0.144"
thiserror = "1.0.34" thiserror = "1.0.34"

4
crates/min-it-version/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "marine-min-it-version" name = "marine-min-it-version"
version = "0.1.1" version = "0.2.0"
description = "Fluence Marine interface types minimum supported version checker" description = "Fluence Marine interface types minimum supported version checker"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
@ -12,4 +12,4 @@ path = "src/lib.rs"
[dependencies] [dependencies]
once_cell = "1.14.0" once_cell = "1.14.0"
semver = "0.11.0" semver = "1.0.13"

4
crates/module-info-parser/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-module-info-parser" name = "marine-module-info-parser"
description = "Fluence Marine Wasm module info (manifest and version) parser" description = "Fluence Marine Wasm module info (manifest and version) parser"
version = "0.4.0" version = "0.5.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -18,7 +18,7 @@ wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1" }
anyhow = "1.0.64" anyhow = "1.0.64"
chrono = "0.4.22" chrono = "0.4.22"
walrus = "0.19.0" walrus = "0.19.0"
semver = "0.11.0" semver = "1.0.13"
serde = "1.0.144" serde = "1.0.144"
thiserror = "1.0.34" thiserror = "1.0.34"

4
crates/module-info-parser/src/manifest/errors.rs
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
use semver::SemVerError; use semver::Error as SemVerError;
use thiserror::Error as ThisError; use thiserror::Error as ThisError;
use std::str::Utf8Error; use std::str::Utf8Error;
#[derive(Debug, ThisError, PartialEq)] #[derive(Debug, ThisError)]
pub enum ManifestError { pub enum ManifestError {
/// Manifest of a Wasm file doesn't have enough bytes to read size of a field from its prefix. /// Manifest of a Wasm file doesn't have enough bytes to read size of a field from its prefix.
#[error( #[error(

2
crates/module-info-parser/src/sdk_version/errors.rs
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
use semver::SemVerError; use semver::Error as SemVerError;
use thiserror::Error as ThisError; use thiserror::Error as ThisError;
use std::str::Utf8Error; use std::str::Utf8Error;

8
crates/module-interface/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-module-interface" name = "marine-module-interface"
description = "Fluence Marine module interface" description = "Fluence Marine module interface"
version = "0.5.0" version = "0.6.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,14 +11,14 @@ name = "marine_module_interface"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.1" } marine-it-interfaces = { path = "../it-interfaces", version = "0.7.3" }
anyhow = "1.0.64" anyhow = "1.0.64"
walrus = "0.19.0" walrus = "0.19.0"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.0"} wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1" }
nom = "5.1" nom = "5.1"
itertools = "0.10.3" itertools = "0.10.3"
semver = "0.11.0" semver = "1.0.13"
serde = "1.0.144" serde = "1.0.144"
thiserror = "1.0.34" thiserror = "1.0.34"

14
marine-js/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "marine-js" name = "marine-js"
version = "0.3.2" version = "0.3.3"
edition = "2018" edition = "2018"
description = "Web version of the marine runtime" description = "Web version of the marine runtime"
publish = false publish = false
@ -10,14 +10,14 @@ publish = false
crate-type = ["cdylib"] crate-type = ["cdylib"]
[dependencies] [dependencies]
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.2" } marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.3" }
marine-module-interface = { path = "../crates/module-interface", version = "0.5.0" } marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.1"} marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.0" }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.2" } it-json-serde = { path = "../crates/it-json-serde", version = "0.3.4" }
marine-rs-sdk = "0.7.1" marine-rs-sdk = "0.7.1"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
fluence-it-types = {version = "0.3.1", features = ["impls"] } fluence-it-types = {version = "0.3.1", features = ["impls"] }
it-lilo = "0.4.0" it-lilo = "0.4.0"
it-memory-traits = "0.3.0" it-memory-traits = "0.3.0"
@ -30,7 +30,7 @@ boolinator = "2.4.0"
bytesize = {version = "1.1.0", features = ["serde"]} bytesize = {version = "1.1.0", features = ["serde"]}
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
once_cell = "1.14.0" once_cell = "1.14.0"
semver = "0.11.0" semver = "1.0.13"
serde = { version = "1.0.144", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85" serde_json = "1.0.85"
serde_derive = "1.0.144" serde_derive = "1.0.144"

26
marine-js/npm-package/src/marine_js.js
View File

@ -244,30 +244,30 @@ export async function init(module) {
imports.wbg.__wbindgen_object_drop_ref = function(arg0) { imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
takeObject(arg0); takeObject(arg0);
}; };
imports.wbg.__wbg_writebyte_2c5138809e09fa99 = function(arg0, arg1, arg2) { imports.wbg.__wbg_writebyte_e07e58ec23d965ab = function(arg0, arg1, arg2) {
write_byte(getObject(arg0), arg1 >>> 0, arg2); write_byte(getObject(arg0), arg1 >>> 0, arg2);
}; };
imports.wbg.__wbg_readbyte_1b6608832c29866b = function(arg0, arg1) { imports.wbg.__wbg_writebyterange_783b310f6d87c4b8 = function(arg0, arg1, arg2, arg3) {
write_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_readbyte_fb03559551e0b655 = function(arg0, arg1) {
const ret = read_byte(getObject(arg0), arg1 >>> 0); const ret = read_byte(getObject(arg0), arg1 >>> 0);
return ret; return ret;
}; };
imports.wbg.__wbg_callexport_e73715b59b3cd956 = function(arg0, arg1, arg2, arg3, arg4, arg5) { imports.wbg.__wbg_readbyterange_0aaccd59853091e1 = function(arg0, arg1, arg2, arg3) {
read_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_getmemorysize_0d0685486c307a71 = function(arg0) {
const ret = get_memory_size(getObject(arg0));
return ret;
};
imports.wbg.__wbg_callexport_5fee3906368c5b71 = function(arg0, arg1, arg2, arg3, arg4, arg5) {
const ret = call_export(getObject(arg1), getStringFromWasm0(arg2, arg3), getStringFromWasm0(arg4, arg5)); const ret = call_export(getObject(arg1), getStringFromWasm0(arg2, arg3), getStringFromWasm0(arg4, arg5));
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN; const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0; getInt32Memory0()[arg0 / 4 + 0] = ptr0;
}; };
imports.wbg.__wbg_getmemorysize_ce6627159198e3f0 = function(arg0) {
const ret = get_memory_size(getObject(arg0));
return ret;
};
imports.wbg.__wbg_readbyterange_5afd87a9f196959d = function(arg0, arg1, arg2, arg3) {
read_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_writebyterange_7e6d25b750104508 = function(arg0, arg1, arg2, arg3) {
write_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
return imports; return imports;
} }

10
marine/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine-runtime" name = "marine-runtime"
description = "The Fluence Wasm Runtime" description = "The Fluence Wasm Runtime"
version = "0.22.0" version = "0.23.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
@ -11,18 +11,18 @@ name = "marine"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-core = { path = "../core", version = "0.17.0" } marine-core = { path = "../core", version = "0.18.0" }
marine-module-interface = { path = "../crates/module-interface", version = "0.5.0" } marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-utils = { path = "../crates/utils", version = "0.4.0" } marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-rs-sdk-main = { version = "0.7.1", features = ["logger"] } marine-rs-sdk-main = { version = "0.7.1", features = ["logger"] }
marine-rs-sdk = { version = "0.7.1", features = ["logger"] } marine-rs-sdk = { version = "0.7.1", features = ["logger"] }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.2" } it-json-serde = { path = "../crates/it-json-serde", version = "0.3.4" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] } wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] }
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
toml = "0.5.9" toml = "0.5.9"
serde = { version = "1.0.144", features = ["derive"] } serde = { version = "1.0.144", features = ["derive"] }

10
tools/cli/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "marine" name = "marine"
description = "Fluence Marine command line tool" description = "Fluence Marine command line tool"
version = "0.12.3" version = "0.12.4"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
repository = "https://github.com/fluencelabs/marine/tools/cli" repository = "https://github.com/fluencelabs/marine/tools/cli"
license = "Apache-2.0" license = "Apache-2.0"
@ -12,12 +12,12 @@ name = "marine"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-it-generator = { path = "../../crates/it-generator", version = "0.9.3" } marine-it-generator = { path = "../../crates/it-generator", version = "0.9.4" }
marine-it-parser = { path = "../../crates/it-parser", version = "0.10.0" } marine-it-parser = { path = "../../crates/it-parser", version = "0.11.0" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.4.0" } marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.5.0" }
cargo_toml = "0.11.6" cargo_toml = "0.11.6"
semver = "0.11.0" semver = "1.0.13"
walrus = "0.19.0" walrus = "0.19.0"
Inflector = "0.11.4" Inflector = "0.11.4"
toml = "0.5.9" toml = "0.5.9"

2
tools/cli/src/cargo_manifest.rs
View File

@ -19,7 +19,7 @@ pub enum ManifestError {
#[error("Cannot find version of marine-rs-sdk dependency")] #[error("Cannot find version of marine-rs-sdk dependency")]
NoSdkVersionError, NoSdkVersionError,
#[error("Cannot parse marine-rs-sdk version: {0}")] #[error("Cannot parse marine-rs-sdk version: {0}")]
VersionParseError(#[from] semver::SemVerError), VersionParseError(#[from] semver::Error),
} }
pub(crate) fn extract_sdk_version(path: &Path) -> Result<Version, ManifestError> { pub(crate) fn extract_sdk_version(path: &Path) -> Result<Version, ManifestError> {

4
tools/repl/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "mrepl" name = "mrepl"
description = "Fluence Marine REPL intended for testing purposes" description = "Fluence Marine REPL intended for testing purposes"
version = "0.18.5" version = "0.18.6"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
repository = "https://github.com/fluencelabs/marine/tools/repl" repository = "https://github.com/fluencelabs/marine/tools/repl"
license = "Apache-2.0" license = "Apache-2.0"
@ -12,7 +12,7 @@ name = "mrepl"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.22.0", features = ["raw-module-api"] } fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.22.1", features = ["raw-module-api"] }
marine-rs-sdk-main = { version = "0.7.1", features = ["logger"] } marine-rs-sdk-main = { version = "0.7.1", features = ["logger"] }
anyhow = "1.0.64" anyhow = "1.0.64"