diff --git a/Cargo.lock b/Cargo.lock index cb9a1878..73370b62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,12 +215,12 @@ version = "0.1.0" [[package]] name = "avm-server" -version = "0.15.0" +version = "0.16.0" dependencies = [ "air-interpreter-interface", "avm-data-store", "eyre", - "fluence-faas 0.12.0", + "fluence-faas 0.14.0", "log", "maplit", "parking_lot 0.11.2", @@ -799,7 +799,7 @@ dependencies = [ "cmd_lib", "itertools 0.9.0", "log", - "marine-module-interface", + "marine-module-interface 0.1.6", "marine-rs-sdk", "marine-rs-sdk-main", "marine-runtime 0.7.2", @@ -810,7 +810,7 @@ dependencies = [ "serde_json", "thiserror", "toml", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", "wasmer-runtime-core-fl", "wasmer-runtime-fl", "wasmer-wasi-fl", @@ -818,18 +818,19 @@ dependencies = [ [[package]] name = "fluence-faas" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8bacb54bd9ea809f38e9a9d79658fab2b6f357256d06b34b22086af2557bcf" +checksum = "81507a8e92e2647f75f10e2a34619350040a2d3605244c6f0625d9a8d791116c" dependencies = [ "bytesize", "cmd_lib", + "it-json-serde", "itertools 0.9.0", "log", - "marine-module-interface", + "marine-module-interface 0.3.0", "marine-rs-sdk", "marine-rs-sdk-main", - "marine-runtime 0.10.0", + "marine-runtime 0.12.0", "marine-utils 0.4.0", "safe-transmute", "serde", @@ -838,7 +839,7 @@ dependencies = [ "serde_with", "thiserror", "toml", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.22.0", "wasmer-runtime-core-fl", "wasmer-runtime-fl", "wasmer-wasi-fl", @@ -1050,6 +1051,20 @@ dependencies = [ "ghost", ] +[[package]] +name = "it-json-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3144fd1e57ab6e1fe548b092a6f48cd65b6575b13a359fb53c3f469aaa3e95" +dependencies = [ + "serde", + "serde_derive", + "serde_json", + "serde_with", + "thiserror", + "wasmer-interface-types-fl 0.22.0", +] + [[package]] name = "it-lilo" version = "0.1.0" @@ -1062,6 +1077,28 @@ dependencies = [ "thiserror", ] +[[package]] +name = "it-lilo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea8088acc275f9f8112632075730e10ebbf143d526017e4faa0bb6a215fa3c2b" +dependencies = [ + "fluence-it-types", + "it-memory-traits", + "log", + "paste", + "thiserror", +] + +[[package]] +name = "it-memory-traits" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8587a124e05788087174863e613903a0987d3baceda89d154549e5bb914e2543" +dependencies = [ + "thiserror", +] + [[package]] name = "it-to-bytes" version = "0.1.0" @@ -1210,15 +1247,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "890b228b9151e9dff213501986f564445a2f9ca5a706088b5d900f5ecf67f7e7" dependencies = [ "cargo_toml", - "it-lilo", - "marine-it-parser", + "it-lilo 0.1.0", + "marine-it-parser 0.6.8", "marine-macro-impl", "once_cell", "serde", "serde_json", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", +] + +[[package]] +name = "marine-it-generator" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "834a10010996ccc0afb95adcf5931966287ceb4c75ac86e77fc8394769bdaaef" +dependencies = [ + "cargo_toml", + "it-lilo 0.3.0", + "marine-it-parser 0.8.0", + "marine-macro-impl", + "once_cell", + "serde", + "serde_json", + "thiserror", + "walrus", + "wasmer-interface-types-fl 0.22.0", ] [[package]] @@ -1228,7 +1283,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42e229143e72ba20e754de4766ff0d02e0cf176001f7471593f82b16c72dc26d" dependencies = [ "multimap", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", +] + +[[package]] +name = "marine-it-interfaces" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03da0a9083109d9606068154eb3dc86730eeb487f1f4aceb779ea9c9c8aa34c6" +dependencies = [ + "multimap", + "wasmer-interface-types-fl 0.22.0", ] [[package]] @@ -1239,14 +1304,33 @@ checksum = "edd97bd85072fc540763769be153a7c8ee83391e668b37ef96d6c48decec2cd5" dependencies = [ "anyhow", "itertools 0.10.3", - "marine-it-interfaces", - "marine-module-interface", + "marine-it-interfaces 0.4.1", + "marine-module-interface 0.1.6", "nom", "semver 0.11.0", "serde", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", + "wasmer-runtime-core-fl", +] + +[[package]] +name = "marine-it-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349dfb883856cfc74dd8e51b1dd056f8b2e51505b8deb014eef0294522501914" +dependencies = [ + "anyhow", + "itertools 0.10.3", + "marine-it-interfaces 0.6.0", + "marine-module-interface 0.3.0", + "nom", + "semver 0.11.0", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl 0.22.0", "wasmer-runtime-core-fl", ] @@ -1274,6 +1358,16 @@ dependencies = [ "uuid", ] +[[package]] +name = "marine-min-it-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890269754a531810b8c16cf00e6161e01c1183ef7ff4ff20117656316e9fdbd1" +dependencies = [ + "once_cell", + "semver 0.11.0", +] + [[package]] name = "marine-module-info-parser" version = "0.2.2" @@ -1298,16 +1392,33 @@ checksum = "06bc36ef268bf7436916f1fa9b0c84104692a717ea5eef3c90b9f25c3407f6b7" dependencies = [ "anyhow", "itertools 0.10.3", - "marine-it-interfaces", + "marine-it-interfaces 0.4.1", "nom", "semver 0.11.0", "serde", "thiserror", "walrus", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", "wasmer-runtime-core-fl", ] +[[package]] +name = "marine-module-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b415a9bf415d2768e17a5819b4d51c5eebea521ab32167a71897c18c690b0a7" +dependencies = [ + "anyhow", + "itertools 0.10.3", + "marine-it-interfaces 0.6.0", + "nom", + "semver 0.11.0", + "serde", + "thiserror", + "walrus", + "wasmer-interface-types-fl 0.22.0", +] + [[package]] name = "marine-rs-sdk" version = "0.6.15" @@ -1339,13 +1450,13 @@ checksum = "983262d394c59d4321b141e303eb55015bc412f319d54bbad7f253e4583253b2" dependencies = [ "anyhow", "boolinator", - "it-lilo", + "it-lilo 0.1.0", "log", - "marine-it-generator", - "marine-it-interfaces", - "marine-it-parser", + "marine-it-generator 0.5.6", + "marine-it-interfaces 0.4.1", + "marine-it-parser 0.6.8", "marine-module-info-parser", - "marine-module-interface", + "marine-module-interface 0.1.6", "marine-utils 0.2.0", "multimap", "once_cell", @@ -1355,7 +1466,7 @@ dependencies = [ "semver 0.11.0", "serde", "thiserror", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.20.2", "wasmer-runtime-core-fl", "wasmer-runtime-fl", "wasmer-wasi-fl", @@ -1363,20 +1474,22 @@ dependencies = [ [[package]] name = "marine-runtime" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e02d81de809a923c4d5c2772142f92497394412806987e4dbdf85596c738d9" +checksum = "27ed7800de4db32ef813d1a391674f401b66ce8da79034f80e9b148b1c960109" dependencies = [ "anyhow", "boolinator", "bytesize", - "it-lilo", + "it-lilo 0.3.0", + "it-memory-traits", "log", - "marine-it-generator", - "marine-it-interfaces", - "marine-it-parser", + "marine-it-generator 0.7.0", + "marine-it-interfaces 0.6.0", + "marine-it-parser 0.8.0", + "marine-min-it-version", "marine-module-info-parser", - "marine-module-interface", + "marine-module-interface 0.3.0", "marine-utils 0.4.0", "multimap", "once_cell", @@ -1386,7 +1499,7 @@ dependencies = [ "semver 0.11.0", "serde", "thiserror", - "wasmer-interface-types-fl", + "wasmer-interface-types-fl 0.22.0", "wasmer-runtime-core-fl", "wasmer-runtime-fl", "wasmer-wasi-fl", @@ -2428,7 +2541,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14ba3b5a07989987994b96bf5cc7ac2947005f9ff6123d71b7064232f07d28fa" dependencies = [ "fluence-it-types", - "it-lilo", + "it-lilo 0.1.0", + "it-to-bytes", + "itertools 0.10.3", + "log", + "nom", + "safe-transmute", + "semver 0.11.0", + "serde", + "serde_json", + "thiserror", + "wast", +] + +[[package]] +name = "wasmer-interface-types-fl" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1571d6f8f11e181dabddbc01017dd928007c08f567fb2ba4611583d259513ca6" +dependencies = [ + "fluence-it-types", + "it-lilo 0.3.0", + "it-memory-traits", "it-to-bytes", "itertools 0.10.3", "log", diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml index c87d1cfa..8b817274 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.15.0" +version = "0.16.0" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] air-interpreter-interface = { version = "0.8.0", path = "../../crates/air-lib/interpreter-interface" } avm-data-store = { version = "0.1.0", path = "../../crates/data-store" } -fluence-faas = "0.12.0" +fluence-faas = "0.14.0" polyplets = { version = "0.2.0", path = "../../crates/air-lib/polyplets" } eyre = "0.6.5"