chore(deps): update all non-major rust dependencies (#211)

* chore(deps): update all non-major rust dependencies

* fix build

* fmt

* update generated code in marine-js

* bump marine-runtime version

* update gitignore

* Revert "bump marine-runtime version"

This reverts commit 7cf9f0b6d4.

* bump versions

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-11-28 18:37:07 +03:00 committed by GitHub
parent 8e6f987ff4
commit ee514fb8fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 297 additions and 283 deletions

4
.gitignore vendored
View File

@ -1,6 +1,7 @@
target/
**/*.rs.bk
.idea
node_modules/
# MacOS misc file
*.DS_Store
@ -12,6 +13,9 @@ target/
# REPL history files
*.repl_history
# marine-js tmp files
/marine-js/marine-js-pkg
# local storage of the url-downloader service
/examples/url-downloader/sites/*

322
Cargo.lock generated
View File

@ -56,9 +56,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.64"
version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
[[package]]
name = "arguments-passing-test"
@ -188,9 +188,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
version = "1.2.1"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]]
name = "bytesize"
@ -211,12 +211,11 @@ dependencies = [
[[package]]
name = "cargo_toml"
version = "0.11.6"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4419e9adae9fd7e231b60d50467481bf8181ddeef6ed54683b23ae925c74c9c"
checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8"
dependencies = [
"serde",
"serde_derive",
"toml",
]
@ -247,15 +246,15 @@ dependencies = [
"anyhow",
"chrono",
"reqwest",
"semver 1.0.13",
"semver 1.0.14",
"serde",
]
[[package]]
name = "chrono"
version = "0.4.22"
version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [
"iana-time-zone",
"js-sys",
@ -724,9 +723,9 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.9.0"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
dependencies = [
"atty",
"humantime",
@ -843,7 +842,7 @@ checksum = "7a4c8f3b177149f19682f5c1498e61bdb914f79529d3301d971027cd2470617c"
dependencies = [
"log",
"maplit",
"marine-min-it-version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-min-it-version 0.2.0",
"marine-runtime 0.23.0",
"serde",
"serde_derive",
@ -854,12 +853,12 @@ dependencies = [
[[package]]
name = "fluence-app-service"
version = "0.22.2"
version = "0.22.3"
dependencies = [
"log",
"maplit",
"marine-min-it-version 0.2.0",
"marine-runtime 0.23.1",
"marine-min-it-version 0.2.1",
"marine-runtime 0.23.2",
"serde",
"serde_derive",
"serde_json",
@ -1268,6 +1267,8 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
[[package]]
name = "it-json-serde"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7bc35c4e8bc44e236bc459a88a24a74326eedff6b073a435eb5537849bfd25"
dependencies = [
"serde",
"serde_derive",
@ -1278,9 +1279,7 @@ dependencies = [
[[package]]
name = "it-json-serde"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7bc35c4e8bc44e236bc459a88a24a74326eedff6b073a435eb5537849bfd25"
version = "0.3.5"
dependencies = [
"serde",
"serde_derive",
@ -1319,9 +1318,9 @@ checksum = "729c74bb4236418898a219c6d96f14cba77456dd7c04a2e99e65e9c643709b56"
[[package]]
name = "itertools"
version = "0.10.3"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
@ -1334,9 +1333,9 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
[[package]]
name = "js-sys"
version = "0.3.59"
version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
dependencies = [
"wasm-bindgen",
]
@ -1421,7 +1420,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]]
name = "marine"
version = "0.12.4"
version = "0.12.5"
dependencies = [
"Inflector",
"anyhow",
@ -1430,10 +1429,10 @@ dependencies = [
"check-latest",
"clap",
"exitfailure",
"marine-it-generator 0.9.4",
"marine-it-parser 0.11.0",
"marine-module-info-parser 0.5.0",
"semver 1.0.13",
"marine-it-generator 0.9.5",
"marine-it-parser 0.11.1",
"marine-module-info-parser 0.5.1",
"semver 1.0.14",
"serde",
"serde_json",
"termion",
@ -1454,6 +1453,39 @@ dependencies = [
[[package]]
name = "marine-core"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68e6db433b04a70ebfa7d4f65797863d45d3af0bbbb2865e39ab3de92803c2a"
dependencies = [
"anyhow",
"boolinator",
"bytesize",
"it-lilo",
"it-memory-traits",
"log",
"marine-it-generator 0.9.4",
"marine-it-interfaces 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-parser 0.11.0",
"marine-min-it-version 0.2.0",
"marine-module-info-parser 0.5.0",
"marine-module-interface 0.6.0",
"marine-utils 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"multimap",
"once_cell",
"parity-wasm 0.45.0",
"paste",
"pwasm-utils",
"semver 1.0.14",
"serde",
"thiserror",
"wasmer-interface-types-fl",
"wasmer-runtime-core-fl",
"wasmer-runtime-fl",
"wasmer-wasi-fl",
]
[[package]]
name = "marine-core"
version = "0.18.1"
dependencies = [
"anyhow",
"boolinator",
@ -1462,12 +1494,12 @@ dependencies = [
"it-lilo",
"it-memory-traits",
"log",
"marine-it-generator 0.9.4",
"marine-it-generator 0.9.5",
"marine-it-interfaces 0.7.3",
"marine-it-parser 0.11.0",
"marine-min-it-version 0.2.0",
"marine-module-info-parser 0.5.0",
"marine-module-interface 0.6.0",
"marine-it-parser 0.11.1",
"marine-min-it-version 0.2.1",
"marine-module-info-parser 0.5.1",
"marine-module-interface 0.6.1",
"marine-utils 0.4.0",
"multimap",
"once_cell",
@ -1475,7 +1507,7 @@ dependencies = [
"paste",
"pwasm-utils",
"reqwest",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"thiserror",
"tokio",
@ -1485,42 +1517,11 @@ dependencies = [
"wasmer-wasi-fl",
]
[[package]]
name = "marine-core"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68e6db433b04a70ebfa7d4f65797863d45d3af0bbbb2865e39ab3de92803c2a"
dependencies = [
"anyhow",
"boolinator",
"bytesize",
"it-lilo",
"it-memory-traits",
"log",
"marine-it-generator 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-interfaces 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-parser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-min-it-version 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-module-info-parser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-module-interface 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-utils 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"multimap",
"once_cell",
"parity-wasm 0.45.0",
"paste",
"pwasm-utils",
"semver 1.0.13",
"serde",
"thiserror",
"wasmer-interface-types-fl",
"wasmer-runtime-core-fl",
"wasmer-runtime-fl",
"wasmer-wasi-fl",
]
[[package]]
name = "marine-it-generator"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f2cbca852ae9b00f95e48afcf9135ea3cc54b7364dff7adaf5dc57e4dab6668"
dependencies = [
"it-lilo",
"marine-it-parser 0.11.0",
@ -1535,12 +1536,10 @@ dependencies = [
[[package]]
name = "marine-it-generator"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f2cbca852ae9b00f95e48afcf9135ea3cc54b7364dff7adaf5dc57e4dab6668"
version = "0.9.5"
dependencies = [
"it-lilo",
"marine-it-parser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-parser 0.11.1",
"marine-macro-impl",
"once_cell",
"serde",
@ -1571,13 +1570,15 @@ dependencies = [
[[package]]
name = "marine-it-parser"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e52c1e59b84546be07004851c242a5644487211b62c242c69ceff57f9112aa0"
dependencies = [
"anyhow",
"itertools",
"marine-it-interfaces 0.7.3",
"marine-it-interfaces 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-module-interface 0.6.0",
"nom",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
@ -1587,16 +1588,14 @@ dependencies = [
[[package]]
name = "marine-it-parser"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e52c1e59b84546be07004851c242a5644487211b62c242c69ceff57f9112aa0"
version = "0.11.1"
dependencies = [
"anyhow",
"itertools",
"marine-it-interfaces 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-module-interface 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-interfaces 0.7.3",
"marine-module-interface 0.6.1",
"nom",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
@ -1613,22 +1612,22 @@ dependencies = [
"bytesize",
"console_error_panic_hook",
"fluence-it-types",
"it-json-serde 0.3.4",
"it-json-serde 0.3.5",
"it-lilo",
"it-memory-traits",
"itertools",
"log",
"maplit",
"marine-it-interfaces 0.7.3",
"marine-min-it-version 0.2.0",
"marine-module-interface 0.6.0",
"marine-min-it-version 0.2.1",
"marine-module-interface 0.6.1",
"marine-rs-sdk",
"marine-utils 0.4.0",
"multimap",
"nom",
"once_cell",
"paste",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"serde_derive",
"serde_json",
@ -1662,14 +1661,6 @@ dependencies = [
"syn",
]
[[package]]
name = "marine-min-it-version"
version = "0.2.0"
dependencies = [
"once_cell",
"semver 1.0.13",
]
[[package]]
name = "marine-min-it-version"
version = "0.2.0"
@ -1677,21 +1668,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af8d201133f1ca6af9d9bc68a2fe03e16e7c5672456e1aa2c7785976f544265d"
dependencies = [
"once_cell",
"semver 1.0.13",
"semver 1.0.14",
]
[[package]]
name = "marine-module-info-parser"
version = "0.5.0"
name = "marine-min-it-version"
version = "0.2.1"
dependencies = [
"anyhow",
"chrono",
"marine-rs-sdk-main",
"semver 1.0.13",
"serde",
"thiserror",
"walrus",
"wasmer-runtime-core-fl",
"once_cell",
"semver 1.0.14",
]
[[package]]
@ -1703,7 +1688,7 @@ dependencies = [
"anyhow",
"chrono",
"marine-rs-sdk-main",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
@ -1711,18 +1696,17 @@ dependencies = [
]
[[package]]
name = "marine-module-interface"
version = "0.6.0"
name = "marine-module-info-parser"
version = "0.5.1"
dependencies = [
"anyhow",
"itertools",
"marine-it-interfaces 0.7.3",
"nom",
"semver 1.0.13",
"chrono",
"marine-rs-sdk-main",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
"wasmer-interface-types-fl",
"wasmer-runtime-core-fl",
]
[[package]]
@ -1735,7 +1719,22 @@ dependencies = [
"itertools",
"marine-it-interfaces 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"nom",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
"wasmer-interface-types-fl",
]
[[package]]
name = "marine-module-interface"
version = "0.6.1"
dependencies = [
"anyhow",
"itertools",
"marine-it-interfaces 0.7.3",
"nom",
"semver 1.0.14",
"serde",
"thiserror",
"walrus",
@ -1786,11 +1785,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3d1b0f4d5f946a1eba7d2f295a2f61836116aa30dd0be60d73b950d93b799e"
dependencies = [
"bytesize",
"it-json-serde 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"it-json-serde 0.3.4",
"itertools",
"log",
"marine-core 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-module-interface 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-core 0.18.0",
"marine-module-interface 0.6.0",
"marine-rs-sdk",
"marine-rs-sdk-main",
"marine-utils 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1809,15 +1808,15 @@ dependencies = [
[[package]]
name = "marine-runtime"
version = "0.23.1"
version = "0.23.2"
dependencies = [
"bytesize",
"env_logger 0.9.0",
"it-json-serde 0.3.4",
"env_logger 0.9.3",
"it-json-serde 0.3.5",
"itertools",
"log",
"marine-core 0.18.0",
"marine-module-interface 0.6.0",
"marine-core 0.18.1",
"marine-module-interface 0.6.1",
"marine-rs-sdk",
"marine-rs-sdk-main",
"marine-utils 0.4.0",
@ -1867,7 +1866,7 @@ dependencies = [
"darling 0.14.1",
"fluence-app-service 0.22.1",
"itertools",
"marine-it-parser 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"marine-it-parser 0.11.0",
"proc-macro-error",
"proc-macro2",
"quote",
@ -1956,13 +1955,13 @@ dependencies = [
[[package]]
name = "mrepl"
version = "0.18.6"
version = "0.18.7"
dependencies = [
"anyhow",
"check-latest",
"clap",
"env_logger 0.9.0",
"fluence-app-service 0.22.2",
"env_logger 0.9.3",
"fluence-app-service 0.22.3",
"itertools",
"log",
"marine-rs-sdk-main",
@ -2122,9 +2121,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.14.0"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "openssl"
@ -2476,9 +2475,9 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.11.11"
version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
dependencies = [
"base64",
"bytes",
@ -2492,10 +2491,10 @@ dependencies = [
"hyper-tls",
"ipnet",
"js-sys",
"lazy_static",
"log",
"mime",
"native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
"serde",
@ -2649,9 +2648,9 @@ dependencies = [
[[package]]
name = "semver"
version = "1.0.13"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
dependencies = [
"serde",
]
@ -2664,9 +2663,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.144"
version = "1.0.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
dependencies = [
"serde_derive",
]
@ -2692,9 +2691,9 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.144"
version = "1.0.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
dependencies = [
"proc-macro2",
"quote",
@ -2703,9 +2702,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.85"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
"itoa",
"ryu",
@ -2726,9 +2725,9 @@ dependencies = [
[[package]]
name = "serde_with"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89df7a26519371a3cce44fbb914c2819c84d9b897890987fa3ab096491cc0ea8"
checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
dependencies = [
"base64",
"chrono",
@ -2742,9 +2741,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de337f322382fcdfbb21a014f7c224ee041a23785651db67b9827403178f698f"
checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
dependencies = [
"darling 0.14.1",
"proc-macro2",
@ -3021,18 +3020,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.34"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252"
checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.34"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487"
checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
dependencies = [
"proc-macro2",
"quote",
@ -3135,9 +3134,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.21.0"
version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42"
checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
dependencies = [
"autocfg",
"bytes",
@ -3145,7 +3144,6 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
"once_cell",
"pin-project-lite",
"socket2",
"tokio-macros",
@ -3330,9 +3328,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]]
name = "uuid"
version = "1.1.2"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
dependencies = [
"getrandom 0.2.7",
]
@ -3456,9 +3454,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
version = "0.2.82"
version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@ -3466,9 +3464,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.82"
version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
dependencies = [
"bumpalo",
"log",
@ -3493,9 +3491,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.82"
version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -3503,9 +3501,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.82"
version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
@ -3516,9 +3514,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.82"
version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
name = "wasm-build-rs"
@ -3636,7 +3634,7 @@ dependencies = [
"log",
"nom",
"safe-transmute",
"semver 1.0.13",
"semver 1.0.14",
"serde",
"serde_json",
"thiserror",
@ -3770,9 +3768,9 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.59"
version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
dependencies = [
"js-sys",
"wasm-bindgen",

View File

@ -1,7 +1,7 @@
[package]
name = "marine-core"
description = "Core of Marine, the Fluence Wasm Runtime"
version = "0.18.0"
version = "0.18.1"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -11,39 +11,39 @@ name = "marine_core"
path = "src/lib.rs"
[dependencies]
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.5.0" }
marine-module-info-parser = { path = "../crates/module-info-parser", version = "0.5.1" }
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.3" }
marine-it-parser = { path = "../crates/it-parser", version = "0.11.0" }
marine-it-generator = { path = "../crates/it-generator", version = "0.9.4" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-it-parser = { path = "../crates/it-parser", version = "0.11.1" }
marine-it-generator = { path = "../crates/it-generator", version = "0.9.5" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.1" }
marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.1" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["dynamicfunc-fat-closures"] }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
it-lilo = "0.4.0"
it-memory-traits = "0.3.0"
it-lilo = "0.4.1"
it-memory-traits = "0.3.1"
bytesize = "1.1.0"
multimap = "0.8.3"
boolinator = "2.4.0"
parity-wasm = "0.45.0"
pwasm-utils = "0.19.0"
once_cell = "1.14.0"
semver = "1.0.13"
serde = "1.0.144"
once_cell = "1.16.0"
semver = "1.0.14"
serde = "1.0.147"
log = "0.4.17"
paste = "1.0.9"
anyhow = "1.0.64"
thiserror = "1.0.34"
anyhow = "1.0.66"
thiserror = "1.0.37"
[dev-dependencies]
reqwest = "0.11.11"
bytes = "1.2.1"
tokio = { version = "1.21.0", features = ["rt", "macros"] }
once_cell = "1.14.0"
reqwest = "0.11.13"
bytes = "1.3.0"
tokio = { version = "1.22.0", features = ["rt", "macros"] }
once_cell = "1.16.0"

View File

@ -1,20 +1,20 @@
[package]
name = "fluence-app-service"
description = "Fluence Application Service"
version = "0.22.2"
version = "0.22.3"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
[dependencies]
marine-runtime = { path = "../../marine", version = "0.23.1" }
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.2.0" }
marine-runtime = { path = "../../marine", version = "0.23.2" }
marine-min-it-version = { path = "../../crates/min-it-version", version = "0.2.1" }
maplit = "1.0.2"
log = "0.4.17"
serde = "1.0.144"
serde_derive = "1.0.144"
serde_json = "1.0.85"
serde = "1.0.147"
serde_derive = "1.0.147"
serde_json = "1.0.89"
toml = "0.5.9"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }

View File

@ -1,7 +1,7 @@
[package]
name = "marine-it-generator"
description = "Fluence Marine interface types generator"
version = "0.9.4"
version = "0.9.5"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -11,14 +11,14 @@ name = "marine_it_generator"
path = "src/lib.rs"
[dependencies]
marine-it-parser = { path = "../it-parser", version = "0.11.0" }
marine-it-parser = { path = "../it-parser", version = "0.11.1" }
marine-macro-impl = "0.7.1"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
it-lilo = "0.4.0"
it-lilo = "0.4.1"
thiserror = "1.0.34"
thiserror = "1.0.37"
walrus = "0.19.0"
once_cell = "1.14.0"
serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85"
once_cell = "1.16.0"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.89"

View File

@ -1,7 +1,7 @@
[package]
name = "it-json-serde"
description = "Fluence Marine interface-types serde tools"
version = "0.3.4"
version = "0.3.5"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -13,7 +13,7 @@ path = "src/lib.rs"
[dependencies]
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85"
serde_derive = "1.0.144"
thiserror = "1.0.34"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.89"
serde_derive = "1.0.147"
thiserror = "1.0.37"

View File

@ -1,7 +1,7 @@
[package]
name = "marine-it-parser"
description = "Fluence Marine interface types parser"
version = "0.11.0"
version = "0.11.1"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -12,15 +12,15 @@ path = "src/lib.rs"
[dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.3" }
marine-module-interface = { path = "../module-interface", version = "0.6.0" }
marine-module-interface = { path = "../module-interface", version = "0.6.1" }
anyhow = "1.0.64"
anyhow = "1.0.66"
walrus = "0.19.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1" }
nom = "5.1"
itertools = "0.10.3"
semver = "1.0.13"
serde = "1.0.144"
thiserror = "1.0.34"
itertools = "0.10.5"
semver = "1.0.14"
serde = "1.0.147"
thiserror = "1.0.37"

View File

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

View File

@ -1,7 +1,7 @@
[package]
name = "marine-module-info-parser"
description = "Fluence Marine Wasm module info (manifest and version) parser"
version = "0.5.0"
version = "0.5.1"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -15,10 +15,10 @@ marine-rs-sdk-main = "0.7.1"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "=0.17.1" }
anyhow = "1.0.64"
chrono = "0.4.22"
anyhow = "1.0.66"
chrono = "0.4.23"
walrus = "0.19.0"
semver = "1.0.13"
semver = "1.0.14"
serde = "1.0.144"
thiserror = "1.0.34"
serde = "1.0.147"
thiserror = "1.0.37"

View File

@ -1,7 +1,7 @@
[package]
name = "marine-module-interface"
description = "Fluence Marine module interface"
version = "0.6.0"
version = "0.6.1"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -13,12 +13,12 @@ path = "src/lib.rs"
[dependencies]
marine-it-interfaces = { path = "../it-interfaces", version = "0.7.3" }
anyhow = "1.0.64"
anyhow = "1.0.66"
walrus = "0.19.0"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1" }
nom = "5.1"
itertools = "0.10.3"
semver = "1.0.13"
serde = "1.0.144"
thiserror = "1.0.34"
itertools = "0.10.5"
semver = "1.0.14"
serde = "1.0.147"
thiserror = "1.0.37"

View File

@ -11,33 +11,33 @@ crate-type = ["cdylib"]
[dependencies]
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.3" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.1" }
marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.0" }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.4" }
marine-min-it-version = { path = "../crates/min-it-version", version = "0.2.1" }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.5" }
marine-rs-sdk = "0.7.1"
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
fluence-it-types = {version = "0.3.1", features = ["impls"] }
it-lilo = "0.4.0"
it-memory-traits = "0.3.0"
fluence-it-types = {version = "0.3.2", features = ["impls"] }
it-lilo = "0.4.1"
it-memory-traits = "0.3.1"
wasm-bindgen = "0.2"
nom = "5.1"
itertools = "0.10.3"
itertools = "0.10.5"
multimap = "0.8.3"
boolinator = "2.4.0"
bytesize = {version = "1.1.0", features = ["serde"]}
console_error_panic_hook = "0.1.7"
once_cell = "1.14.0"
semver = "1.0.13"
serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85"
serde_derive = "1.0.144"
once_cell = "1.16.0"
semver = "1.0.14"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.89"
serde_derive = "1.0.147"
log = "0.4.17"
toml = "0.5.9"
paste = "1.0.9"
anyhow = "1.0.64"
thiserror = "1.0.34"
anyhow = "1.0.66"
thiserror = "1.0.37"
maplit = "1.0.2"
web-sys = {version = "0.3.59", features = ["console"]}
web-sys = {version = "0.3.60", features = ["console"]}

View File

@ -223,18 +223,32 @@ export async function init(module) {
function getImports() {
const imports = {};
imports.wbg = {};
imports.wbg.__wbg_new_693216e109162396 = function() {
imports.wbg.__wbg_writebyterange_0c59aabc2aad1210 = function(arg0, arg1, arg2, arg3) {
write_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_readbyte_0b96cd62e4c1af25 = function(arg0, arg1) {
const ret = read_byte(getObject(arg0), arg1 >>> 0);
return ret;
};
imports.wbg.__wbg_readbyterange_6def5970b1aebf61 = function(arg0, arg1, arg2, arg3) {
read_byte_range(getObject(arg0), arg1 >>> 0, getArrayU8FromWasm0(arg2, arg3));
};
imports.wbg.__wbg_getmemorysize_16d792c547469ba4 = function(arg0) {
const ret = get_memory_size(getObject(arg0));
return ret;
};
imports.wbg.__wbg_new_abda76e883ba8a5f = function() {
const ret = new Error();
return addHeapObject(ret);
};
imports.wbg.__wbg_stack_0ddaca5d1abfb52f = function(arg0, arg1) {
imports.wbg.__wbg_stack_658279fe44541cf6 = function(arg0, arg1) {
const ret = getObject(arg1).stack;
const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
const len0 = WASM_VECTOR_LEN;
getInt32Memory0()[arg0 / 4 + 1] = len0;
getInt32Memory0()[arg0 / 4 + 0] = ptr0;
};
imports.wbg.__wbg_error_09919627ac0992f5 = function(arg0, arg1) {
imports.wbg.__wbg_error_f851667af71bcfc6 = function(arg0, arg1) {
try {
console.error(getStringFromWasm0(arg0, arg1));
} finally {
@ -244,24 +258,10 @@ export async function init(module) {
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
takeObject(arg0);
};
imports.wbg.__wbg_writebyte_e07e58ec23d965ab = function(arg0, arg1, arg2) {
imports.wbg.__wbg_writebyte_111fe93c2b0126fe = function(arg0, arg1, arg2) {
write_byte(getObject(arg0), arg1 >>> 0, arg2);
};
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);
return ret;
};
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) {
imports.wbg.__wbg_callexport_633630b9132e20a4 = function(arg0, arg1, arg2, arg3, 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 len0 = WASM_VECTOR_LEN;

View File

@ -1,7 +1,7 @@
[package]
name = "marine-runtime"
description = "The Fluence Wasm Runtime"
version = "0.23.1"
version = "0.23.2"
authors = ["Fluence Labs"]
license = "Apache-2.0"
edition = "2018"
@ -11,12 +11,12 @@ name = "marine"
path = "src/lib.rs"
[dependencies]
marine-core = { path = "../core", version = "0.18.0" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.0" }
marine-core = { path = "../core", version = "0.18.1" }
marine-module-interface = { path = "../crates/module-interface", version = "0.6.1" }
marine-utils = { path = "../crates/utils", version = "0.4.0" }
marine-rs-sdk-main = { 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.4" }
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.5" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc
@ -25,19 +25,19 @@ wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.24.1"}
toml = "0.5.9"
serde = { version = "1.0.144", features = ["derive"] }
serde_json = "1.0.85"
serde_derive = "1.0.144"
serde_with = "2.0.0"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.89"
serde_derive = "1.0.147"
serde_with = "2.1.0"
bytesize = {version = "1.1.0", features = ["serde"]}
itertools = "0.10.3"
itertools = "0.10.5"
log = "0.4.17"
safe-transmute = "0.11.2"
thiserror = "1.0.34"
thiserror = "1.0.37"
[dev-dependencies]
once_cell = "1.14.0"
env_logger = "0.9.0"
once_cell = "1.16.0"
env_logger = "0.9.3"
pretty_assertions = "1.3.0"
[features]

View File

@ -1,7 +1,7 @@
[package]
name = "marine"
description = "Fluence Marine command line tool"
version = "0.12.4"
version = "0.12.5"
authors = ["Fluence Labs"]
repository = "https://github.com/fluencelabs/marine/tools/cli"
license = "Apache-2.0"
@ -12,21 +12,21 @@ name = "marine"
path = "src/main.rs"
[dependencies]
marine-it-generator = { path = "../../crates/it-generator", version = "0.9.4" }
marine-it-parser = { path = "../../crates/it-parser", version = "0.11.0" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.5.0" }
marine-it-generator = { path = "../../crates/it-generator", version = "0.9.5" }
marine-it-parser = { path = "../../crates/it-parser", version = "0.11.1" }
marine-module-info-parser = { path = "../../crates/module-info-parser", version = "0.5.1" }
cargo_toml = "0.11.6"
semver = "1.0.13"
cargo_toml = "0.13.0"
semver = "1.0.14"
walrus = "0.19.0"
Inflector = "0.11.4"
toml = "0.5.9"
atty = "0.2.14"
thiserror = "1.0.34"
anyhow = "1.0.64"
thiserror = "1.0.37"
anyhow = "1.0.66"
check-latest = "1.0.1"
clap = "2.34.0"
exitfailure = "0.5.1"
serde = "1.0.144"
serde_json = "1.0.85"
serde = "1.0.147"
serde_json = "1.0.89"
termion = "1.5.6"

View File

@ -5,6 +5,7 @@ use thiserror::Error as ThisError;
use std::path::Path;
use std::str::FromStr;
use crate::cargo_manifest::ManifestError::CannotProcessManifest;
const SKD_CRATE_NAME: &str = "marine-rs-sdk";
@ -20,6 +21,10 @@ pub enum ManifestError {
NoSdkVersionError,
#[error("Cannot parse marine-rs-sdk version: {0}")]
VersionParseError(#[from] semver::Error),
#[error("Inherited dependencies are not supported yet")]
InheritedDependencyUnsupported,
#[error("Cannot process cargo manifest because of: {0}")]
CannotProcessManifest(String),
}
pub(crate) fn extract_sdk_version(path: &Path) -> Result<Version, ManifestError> {
@ -28,6 +33,12 @@ pub(crate) fn extract_sdk_version(path: &Path) -> Result<Version, ManifestError>
match e {
CargoTomlError::Parse(e) => e.into(),
CargoTomlError::Io(e) => e.into(),
CargoTomlError::InheritedUnknownValue => {
CannotProcessManifest("inherited unknown value".to_string())
}
CargoTomlError::WorkspaceIntegrity(reason) => CannotProcessManifest(reason),
CargoTomlError::Other(reason) => CannotProcessManifest(reason.to_string()),
_ => CannotProcessManifest("Unknown".to_string()),
}
})?;
@ -42,6 +53,7 @@ pub(crate) fn extract_sdk_version(path: &Path) -> Result<Version, ManifestError>
.version
.as_ref()
.ok_or(ManifestError::NoSdkVersionError)?,
Dependency::Inherited(_) => return Err(ManifestError::InheritedDependencyUnsupported),
};
Version::from_str(version).map_err(Into::into)

View File

@ -1,7 +1,7 @@
[package]
name = "mrepl"
description = "Fluence Marine REPL intended for testing purposes"
version = "0.18.6"
version = "0.18.7"
authors = ["Fluence Labs"]
repository = "https://github.com/fluencelabs/marine/tools/repl"
license = "Apache-2.0"
@ -12,21 +12,21 @@ name = "mrepl"
path = "src/main.rs"
[dependencies]
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.22.2", features = ["raw-module-api"] }
fluence-app-service = { path = "../../crates/fluence-app-service", version = "0.22.3", features = ["raw-module-api"] }
marine-rs-sdk-main = { version = "0.7.1", features = ["logger"] }
anyhow = "1.0.64"
anyhow = "1.0.66"
clap = "2.34.0"
serde = "1.0.144"
serde_json = "1.0.85"
serde = "1.0.147"
serde_json = "1.0.89"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1"}
env_logger = "0.9.0"
env_logger = "0.9.3"
check-latest = "1.0.1"
log = "0.4.17"
rustyline = { version = "10.0.0", features = ["with-fuzzy"] }
rustyline-derive = "0.7.0"
rustop = "1.1.2"
itertools = "0.10.3"
uuid = { version = "1.1.2", features = ["v4"] }
itertools = "0.10.5"
uuid = { version = "1.2.2", features = ["v4"] }
termion = "1.5.6"