From 63fb64ac3518959e7498e38eec4e943d3f13b23e Mon Sep 17 00:00:00 2001 From: Mike Voronov Date: Tue, 17 Aug 2021 20:43:55 +0300 Subject: [PATCH] update avm-server (#129) --- Cargo.lock | 215 +++++------------------------------------- avm/server/Cargo.toml | 4 +- 2 files changed, 24 insertions(+), 195 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de1abb94..1436e2b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "array_tool" @@ -153,10 +153,10 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "avm-server" -version = "0.8.0" +version = "0.9.0" dependencies = [ "air-interpreter-interface", - "fluence-faas 0.7.1", + "fluence-faas", "log", "maplit", "parking_lot 0.11.1", @@ -191,9 +191,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake3" @@ -639,41 +639,19 @@ dependencies = [ "libc", ] -[[package]] -name = "fce-timestamp-macro" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0" -dependencies = [ - "chrono", - "quote", -] - [[package]] name = "fixedbitset" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" -[[package]] -name = "fluence" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8" -dependencies = [ - "fce-timestamp-macro", - "fluence-sdk-macro", - "fluence-sdk-main", - "serde", -] - [[package]] name = "fluence-app-service" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58d92fd37b7673513efafb0d1e0c366b8d6f297b74e9bfcda27c452f400af70a" dependencies = [ - "fluence-faas 0.9.0", + "fluence-faas", "log", "maplit", "serde", @@ -683,31 +661,6 @@ dependencies = [ "wasmer-wasi-fl", ] -[[package]] -name = "fluence-faas" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a93aa001cc929b56958cc7d7e032be4c0d9682f86b6288bd5a47cf12b2c277" -dependencies = [ - "cmd_lib", - "fluence", - "fluence-sdk-main", - "itertools 0.9.0", - "log", - "marine", - "marine-utils", - "safe-transmute", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "toml", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", - "wasmer-runtime-fl", - "wasmer-wasi-fl", -] - [[package]] name = "fluence-faas" version = "0.9.0" @@ -746,40 +699,6 @@ dependencies = [ "wast", ] -[[package]] -name = "fluence-sdk-macro" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde" -dependencies = [ - "fluence-sdk-wit", -] - -[[package]] -name = "fluence-sdk-main" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604" -dependencies = [ - "fluence-sdk-macro", - "log", - "serde", -] - -[[package]] -name = "fluence-sdk-wit" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn", - "uuid", -] - [[package]] name = "fstrings" version = "0.2.3" @@ -1096,9 +1015,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.98" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "lock_api" @@ -1133,53 +1052,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "marine" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145a65f2fb87fe838bf48469f3b4525f6fbee6698a446a43e530b3b294fe4f4" -dependencies = [ - "anyhow", - "boolinator", - "it-lilo", - "log", - "marine-it-generator 0.4.0", - "marine-it-interfaces 0.3.0", - "marine-it-parser 0.5.0", - "marine-module-info-parser 0.1.0", - "marine-utils", - "multimap", - "once_cell", - "parity-wasm", - "paste", - "pwasm-utils", - "semver 0.11.0", - "serde", - "thiserror", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", - "wasmer-runtime-fl", - "wasmer-wasi-fl", -] - -[[package]] -name = "marine-it-generator" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245d4971ee68559236cdd34e6d57ae769dab68c6c9ed4d390f14ae5830880c8f" -dependencies = [ - "cargo_toml", - "fluence-sdk-wit", - "it-lilo", - "marine-it-parser 0.5.0", - "once_cell", - "serde", - "serde_json", - "thiserror", - "walrus", - "wasmer-interface-types-fl", -] - [[package]] name = "marine-it-generator" version = "0.5.3" @@ -1188,7 +1060,7 @@ checksum = "e62f29b16bbdb0763a04f8561c954624ee9cd9f558af4e67b95eb00880da11ec" dependencies = [ "cargo_toml", "it-lilo", - "marine-it-parser 0.6.5", + "marine-it-parser", "marine-macro-impl", "once_cell", "serde", @@ -1198,16 +1070,6 @@ dependencies = [ "wasmer-interface-types-fl", ] -[[package]] -name = "marine-it-interfaces" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c533789e72808630cc35b5d14d286382236282525f82ddce8fb47eb9d659e8" -dependencies = [ - "multimap", - "wasmer-interface-types-fl", -] - [[package]] name = "marine-it-interfaces" version = "0.4.0" @@ -1218,23 +1080,6 @@ dependencies = [ "wasmer-interface-types-fl", ] -[[package]] -name = "marine-it-parser" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e59c7067a18b9e4aebe67bee033638fae97d6fe4fb00f70f9a509eb5d03d1c5d" -dependencies = [ - "anyhow", - "marine-it-interfaces 0.3.0", - "nom", - "semver 0.11.0", - "serde", - "thiserror", - "walrus", - "wasmer-interface-types-fl", - "wasmer-runtime-core-fl", -] - [[package]] name = "marine-it-parser" version = "0.6.5" @@ -1243,7 +1088,7 @@ checksum = "19a6606e472587b2e7b759b16d037a4ea951facc2a6650f668f22403978c2442" dependencies = [ "anyhow", "itertools 0.10.1", - "marine-it-interfaces 0.4.0", + "marine-it-interfaces", "marine-module-interface", "nom", "semver 0.11.0", @@ -1277,22 +1122,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "marine-module-info-parser" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003017e314cebb5c774569a4257f5eca82106cff170b124c6712f2fcd3ceefef" -dependencies = [ - "anyhow", - "chrono", - "fluence-sdk-main", - "semver 0.11.0", - "serde", - "thiserror", - "walrus", - "wasmer-runtime-core-fl", -] - [[package]] name = "marine-module-info-parser" version = "0.2.0" @@ -1317,7 +1146,7 @@ checksum = "d8a5936273bebb523ed169863282dbc19fc66bb983c7031c5b8b0556584f2401" dependencies = [ "anyhow", "itertools 0.10.1", - "marine-it-interfaces 0.4.0", + "marine-it-interfaces", "nom", "semver 0.11.0", "serde", @@ -1360,10 +1189,10 @@ dependencies = [ "boolinator", "it-lilo", "log", - "marine-it-generator 0.5.3", - "marine-it-interfaces 0.4.0", - "marine-it-parser 0.6.5", - "marine-module-info-parser 0.2.0", + "marine-it-generator", + "marine-it-interfaces", + "marine-it-parser", + "marine-module-info-parser", "marine-module-interface", "marine-utils", "multimap", @@ -1570,7 +1399,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.9", + "redox_syscall 0.2.10", "smallvec", "winapi", ] @@ -1754,9 +1583,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -1768,7 +1597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.3", - "redox_syscall 0.2.9", + "redox_syscall 0.2.10", ] [[package]] @@ -1914,9 +1743,9 @@ dependencies = [ [[package]] name = "serde_cbor" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", "serde", diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml index d75ef381..a3d18787 100644 --- a/avm/server/Cargo.toml +++ b/avm/server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm-server" description = "Fluence AIR VM" -version = "0.8.0" +version = "0.9.0" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -11,7 +11,7 @@ name = "avm_server" path = "src/lib.rs" [dependencies] -fluence-faas = "0.7.0" +fluence-faas = "0.9.0" air-interpreter-interface = { version = "0.5.1", path = "../../crates/interpreter-interface" } thiserror = "1.0.24"