diff --git a/Cargo.lock b/Cargo.lock index b55838e3..a5e45431 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli 0.26.2", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -28,13 +19,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -73,6 +65,12 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arrayref" version = "0.3.7" @@ -118,12 +116,12 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] @@ -139,6 +137,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + [[package]] name = "bincode" version = "1.3.3" @@ -269,38 +273,50 @@ dependencies = [ [[package]] name = "cap-fs-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc48200a1a0fa6fba138b1802ad7def18ec1cdd92f7b2a04e21f1bd887f7b9" +checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 1.0.11", + "io-lifetimes 2.0.2", "windows-sys 0.48.0", ] +[[package]] +name = "cap-net-ext" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" +dependencies = [ + "cap-primitives", + "cap-std", + "rustix 0.38.13", + "smallvec", +] + [[package]] name = "cap-primitives" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b6df5b295dca8d56f35560be8c391d59f0420f72e546997154e24e765e6451" +checksum = "2bf30c373a3bee22c292b1b6a7a26736a38376840f1af3d2d806455edf8c3899" dependencies = [ "ambient-authority", - "fs-set-times 0.19.2", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes 2.0.2", "ipnet", "maybe-owned", - "rustix 0.37.23", + "rustix 0.38.13", "windows-sys 0.48.0", - "winx 0.35.1", + "winx", ] [[package]] name = "cap-rand" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25555efacb0b5244cf1d35833d55d21abc916fff0eaad254b8e2453ea9b8ab" +checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" dependencies = [ "ambient-authority", "rand", @@ -308,26 +324,26 @@ dependencies = [ [[package]] name = "cap-std" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3373a62accd150b4fcba056d4c5f3b552127f0ec86d3c8c102d60b978174a012" +checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 1.0.11", - "rustix 0.37.23", + "io-lifetimes 2.0.2", + "rustix 0.38.13", ] [[package]] name = "cap-time-ext" -version = "1.0.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95002993b7baee6b66c8950470e59e5226a23b3af39fc59c47fe416dd39821a" +checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.37.23", - "winx 0.35.1", + "rustix 0.38.13", + "winx", ] [[package]] @@ -357,7 +373,7 @@ dependencies = [ "hex", "libp2p-identity", "log", - "marine-rs-sdk 0.7.1", + "marine-rs-sdk", "marine-rs-sdk-test", "mockito", "serde", @@ -460,28 +476,28 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" +checksum = "751cbf89e513f283c0641eb7f95dc72fda5051dd95ca203d1dc45e26bc89dba8" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" +checksum = "210730edc05121e915201cc36595e1f00062094669fa07ac362340e3627b3dc5" dependencies = [ - "arrayvec", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", - "hashbrown", + "gimli 0.28.0", + "hashbrown 0.14.3", "log", "regalloc2", "smallvec", @@ -490,33 +506,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" +checksum = "b5dc7fdf210c53db047f3eaf49b3a89efee0cc3d9a2ce0c0f0236933273d0c53" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" +checksum = "f46875cc87d963119d78fe5c19852757dc6eea3cb9622c0df69c26b242cd44b4" + +[[package]] +name = "cranelift-control" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375dca8f58d8a801a85e11730c1529c5c4a9c3593dfb12118391ac437b037155" +dependencies = [ + "arbitrary", +] [[package]] name = "cranelift-entity" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" +checksum = "cc619b86fe3c72f43fc417c9fd67a04ec0c98296e5940922d9fd9e6eedf72521" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" +checksum = "7eb607fd19ae264da18f9f2532e7302b826f7fbf77bf88365fc075f2e3419436" dependencies = [ "cranelift-codegen", "log", @@ -526,15 +552,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" +checksum = "9fe806a6470dddfdf79e878af6a96afb1235a09fe3e21f9e0c2f18d402820432" [[package]] name = "cranelift-native" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" +checksum = "fac7f1722660b10af1f7229c0048f716bfd8bd344549b0e06e3eb6417ec3fe5b" dependencies = [ "cranelift-codegen", "libc", @@ -543,9 +569,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.2" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" +checksum = "b1b65810be56b619c3c55debade92798d999f34bf0670370c578afab5d905f06" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -553,7 +579,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.100.0", + "wasmparser 0.112.0", "wasmtime-types", ] @@ -596,7 +622,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -629,7 +655,7 @@ dependencies = [ name = "curl_adapter" version = "0.5.1" dependencies = [ - "marine-rs-sdk 0.7.1", + "marine-rs-sdk", "marine-rs-sdk-test", ] @@ -694,6 +720,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + [[package]] name = "deranged" version = "0.3.8" @@ -771,6 +806,15 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -784,6 +828,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.3" @@ -855,6 +905,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fd-lock" version = "4.0.0" @@ -866,16 +922,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "file-per-thread-logger" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "fixed-hash" version = "0.8.0" @@ -890,9 +936,9 @@ dependencies = [ [[package]] name = "fluence-app-service" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0916285affb8d7c59c80a38f97563ea6fe1082f14778d22e5c8bec7f8537ec" +checksum = "5be1794d6900d3b0376a54d8017d656a1d549e4503b7075f977cbc476c9293b3" dependencies = [ "log", "maplit", @@ -936,24 +982,13 @@ dependencies = [ [[package]] name = "fs-set-times" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857cf27edcb26c2a36d84b2954019573d335bb289876113aceacacdca47a4fd4" -dependencies = [ - "io-lifetimes 1.0.11", - "rustix 0.36.15", - "windows-sys 0.45.0", -] - -[[package]] -name = "fs-set-times" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f" +checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ - "io-lifetimes 1.0.11", + "io-lifetimes 2.0.2", "rustix 0.38.13", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1060,6 +1095,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "fxprof-processed-profile" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" +dependencies = [ + "bitflags 2.4.0", + "debugid", + "fxhash", + "serde", + "serde_json", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1087,8 +1135,8 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ - "fallible-iterator", - "indexmap", + "fallible-iterator 0.2.0", + "indexmap 1.9.3", "stable_deref_trait", ] @@ -1097,6 +1145,11 @@ name = "gimli" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +dependencies = [ + "fallible-iterator 0.3.0", + "indexmap 2.1.0", + "stable_deref_trait", +] [[package]] name = "h2" @@ -1110,7 +1163,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1122,6 +1175,21 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", ] @@ -1307,18 +1375,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", "serde", ] [[package]] name = "io-extras" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde93d48f0d9277f977a333eca8313695ddd5301dc96f7e02aeddcb0dd99096f" +checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" dependencies = [ - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", + "io-lifetimes 2.0.2", + "windows-sys 0.52.0", ] [[package]] @@ -1357,9 +1436,9 @@ dependencies = [ [[package]] name = "it-json-serde" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145ec580d7bd2edbe7177841fa6f48bf820c5bbaa0fc51d4ecef48a8f91889e5" +checksum = "0bdf951681696f6c957026a6aa576c9a6b1a25e753c1f4d62f75fcf0ff38abe5" dependencies = [ "serde", "serde_derive", @@ -1370,10 +1449,11 @@ dependencies = [ [[package]] name = "it-lilo" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14693c2c3696b46349b0bc54f8b39de8eb67951b6623f42ff6b6b2d129ff00e" +checksum = "20108e77e11eeb1ef019f54c3868e0f2e9227295502f0702fa2e7e730ea748f8" dependencies = [ + "anyhow", "fluence-it-types", "it-memory-traits", "log", @@ -1491,12 +1571,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -1542,29 +1616,29 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "marine-build-rs-generator" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4170c2285f9cc8679823406d90dfc3f76ffd863e31f9eb7f6ca762a41443d99d" +checksum = "ba5881a385788dae5e23b2e063ef212ada2e402a97833a6c066bbae26bbe8bd9" dependencies = [ "marine-test-macro-impl", ] [[package]] name = "marine-call-parameters" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979e5c52888bae300c937e36240293c20e34bb7b29d058375b15f85e713dd854" +checksum = "60dfc6d5a00b2d5aadbd60a13bdd6c6d6a5f46b31bf8db9f80ad295032f3bda3" dependencies = [ - "marine-macro 0.10.1", - "marine-rs-sdk-main 0.10.1", + "marine-macro", + "marine-rs-sdk-main", "serde", ] [[package]] name = "marine-core" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f2db990567b2677d4b03d3f5b019c9f03e4365eaa8303cef083e388d960e47" +checksum = "eb4758abae2100ab5a89e6df2341492ac753a7c9be72076528b5adf94aeaeb8f" dependencies = [ "anyhow", "bytesize", @@ -1591,9 +1665,9 @@ dependencies = [ [[package]] name = "marine-it-generator" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0cc0ce2ee4ee0986abf71327b84ef3fb26dcb33b866226f9e659d1cce922fd" +checksum = "416d13df5d4d301fc780ae85368e031c1526dc23c9609ecc8a89c09b246d999c" dependencies = [ "it-lilo", "marine-it-parser", @@ -1602,15 +1676,15 @@ dependencies = [ "serde", "serde_json", "thiserror", - "walrus 0.20.1", + "walrus", "wasmer-interface-types-fl", ] [[package]] name = "marine-it-interfaces" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3bdc1a0d26f38f8d0375c7f8aa0621de90b5966e38b407c7505ead9649bbd92" +checksum = "942f05f37d694802550d9dfed55a1d56fe53f15ef3a3219b9345e9a235c042cd" dependencies = [ "multimap", "wasmer-interface-types-fl", @@ -1618,9 +1692,9 @@ dependencies = [ [[package]] name = "marine-it-parser" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52907d7e7b9487a029dd3d99e647307c8808d7fba327e27113b0807d4868b315" +checksum = "ec9325e7cf7c4e01087be83ae5abb26fe76445b0df517a201fbe6ca298b8661b" dependencies = [ "anyhow", "itertools", @@ -1631,38 +1705,18 @@ dependencies = [ "semver", "serde", "thiserror", - "walrus 0.20.1", + "walrus", "wasmer-interface-types-fl", ] [[package]] name = "marine-macro" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e03da22f641984aad5229f780d190502196d1c0bf908d3d17f5d6bcba73e525" -dependencies = [ - "marine-macro-impl 0.7.1", - "marine-rs-sdk-main 0.7.1", -] - -[[package]] -name = "marine-macro" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea" -dependencies = [ - "marine-macro-impl 0.8.1", - "marine-rs-sdk-main 0.8.1", -] - -[[package]] -name = "marine-macro" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93835918915610947b5ce96a4b3d89268fde2842a6d18d893c86ffe1b605c16e" +checksum = "3f4bef66ff0a930272053bc622e60ae07a444b6bdd6b2406ee2e85ee93fa34a8" dependencies = [ - "marine-macro-impl 0.10.1", - "marine-rs-sdk-main 0.10.1", + "marine-macro-impl 0.10.2", + "marine-rs-sdk-main", ] [[package]] @@ -1680,22 +1734,9 @@ dependencies = [ [[package]] name = "marine-macro-impl" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", -] - -[[package]] -name = "marine-macro-impl" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794126e4a2f5b78b43bc7c82329dc6ffa0c2511591803f89a6d97c037feb068" +checksum = "51866ba9045c01e96a716343c30b2d9302d1451c969ceba8f8e3cb52b78053c8" dependencies = [ "proc-macro2", "quote", @@ -1706,9 +1747,9 @@ dependencies = [ [[package]] name = "marine-min-it-version" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a501fd122de0e7ffd4b97ed0431a7ff55c09aaab0ac72486d09cdd0b9555b32" +checksum = "a84be3c30abaa13df50cdaceb6b62ca806ac8a10fd5bacfeb4371ec1bd0f5101" dependencies = [ "once_cell", "semver", @@ -1716,26 +1757,26 @@ dependencies = [ [[package]] name = "marine-module-info-parser" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5aa7160fa89a493ce5367aa4b09f7001e054dd4c6373aa5dd0d1ff22b2466e" +checksum = "5b3c94cb70c951bf8ef26bd921ef9ddc5b61e2a45b7c62683ad98313f21fb8df" dependencies = [ "anyhow", "chrono", "derivative", - "marine-rs-sdk-main 0.10.1", + "marine-rs-sdk-main", "marine-wasm-backend-traits", "semver", "serde", "thiserror", - "walrus 0.20.1", + "walrus", ] [[package]] name = "marine-module-interface" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d8f21255b94f1c8b2731a2b49c2ed34f955ed2e11dae3fb6c580a346d10bdd" +checksum = "8ace780e273bfa9c2124e53da578af10059e053ba9c22400e1e86a99c00576c4" dependencies = [ "anyhow", "itertools", @@ -1744,61 +1785,28 @@ dependencies = [ "semver", "serde", "thiserror", - "walrus 0.19.0", + "walrus", "wasmer-interface-types-fl", ] [[package]] name = "marine-rs-sdk" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfeeb7b8cd98e32276fabfe6ab095a6aae793f3f080e7eb1c3d36b1b762397c" -dependencies = [ - "marine-macro 0.7.1", - "marine-rs-sdk-main 0.7.1", - "marine-timestamp-macro 0.7.1", - "polyplets", - "serde", -] - -[[package]] -name = "marine-rs-sdk" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eeb2e2a1ab3f7a2ba270ff42bc2d4fa0d1a0b0f6bdb377b2db4403030a854a" +checksum = "d189b674dfcebfbb5668ead5335c3ba52fd4f8e8947b6f2d48869765ab403bd9" dependencies = [ "marine-call-parameters", - "marine-macro 0.10.1", - "marine-rs-sdk-main 0.10.1", - "marine-timestamp-macro 0.10.1", - "serde", -] - -[[package]] -name = "marine-rs-sdk-main" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43e6eac611bc5b96e80a3f3e2621eeded69fb56389aa83b6ea76ec0f243ef23" -dependencies = [ - "log", - "serde", -] - -[[package]] -name = "marine-rs-sdk-main" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd" -dependencies = [ - "log", + "marine-macro", + "marine-rs-sdk-main", + "marine-timestamp-macro", "serde", ] [[package]] name = "marine-rs-sdk-main" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997cdfb9fdef7066a527e9436938618d0596e00f4cceea1ab3b5bb32d20947f6" +checksum = "d3b4d597243fa88bf33fe91e080ab155cc1679ac4970e1a20dce6b58df084673" dependencies = [ "log", "serde", @@ -1806,9 +1814,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk-test" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ed5315a63bdbd0d88b3e4c2245235d72a81842235ca57e3438c5281b1cda7e" +checksum = "6233297b96919aba3c98aa553ceef6167b50f2ff0cd61018d6393e3166063e74" dependencies = [ "fluence-app-service", "marine-build-rs-generator", @@ -1820,9 +1828,9 @@ dependencies = [ [[package]] name = "marine-runtime" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2f5584266fe595f06fa83fd4cc0de4c2cff513906869a4e37f112354ca08b8" +checksum = "4254658402bf40cb64c0116f44124de84fee46e7fcd413ae6cc6097cbd6b3bff" dependencies = [ "bytesize", "it-json-serde", @@ -1831,8 +1839,8 @@ dependencies = [ "log", "marine-core", "marine-module-interface", - "marine-rs-sdk 0.10.1", - "marine-rs-sdk-main 0.10.1", + "marine-rs-sdk", + "marine-rs-sdk-main", "marine-utils", "marine-wasm-backend-traits", "marine-wasmtime-backend", @@ -1849,9 +1857,9 @@ dependencies = [ [[package]] name = "marine-test-macro" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b8bcd14e70bc8fe64e51241de42fb01538aff923e8cacc34ad1420a5e2e177" +checksum = "9fe9c6bde18966329b631d913f708d546b68174e6d51f18a498567bdcce4021f" dependencies = [ "marine-test-macro-impl", "proc-macro-error", @@ -1862,9 +1870,9 @@ dependencies = [ [[package]] name = "marine-test-macro-impl" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f78dfe398150fc719bbb6a1994ebbccf03f4abb50d058a13b16373b5f38799" +checksum = "8c3004eb4239e8d5866c9a54872f4d9c1e13d782de2ff553cf07cc95dd187503" dependencies = [ "darling", "fluence-app-service", @@ -1880,19 +1888,9 @@ dependencies = [ [[package]] name = "marine-timestamp-macro" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea4557a757e9f4d04a0b6afb047431a246963268a4cab56c62cb5355457cb2f" -dependencies = [ - "chrono", - "quote", -] - -[[package]] -name = "marine-timestamp-macro" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ccb7870fd62eb4cc34a86b0ae8bdca680067138c3bb10fca7fb67e03242ca4" +checksum = "d1465b4dcc7d85940cf33f8d64fd0bb2f98093cc3a5384e2d224bf6e50069adb" dependencies = [ "chrono", "quote", @@ -1906,9 +1904,9 @@ checksum = "7e86cb57ff0e2fdc8e188a52d388287d38e5cc781eddd09a82d20f8ee1f48b80" [[package]] name = "marine-wasm-backend-traits" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8094cd7d1bf6c14ded993fd2d6e6999f7e25c07b2f770277ea28ee64fe433ecc" +checksum = "470aaec9c93cec6a4cfd6ce78e338c92e688da14d3203863c517a96027aec417" dependencies = [ "anyhow", "it-memory-traits", @@ -1921,9 +1919,9 @@ dependencies = [ [[package]] name = "marine-wasmtime-backend" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb895ec13df3b2241b848b3b138569afd3aadd21719af99a2b8aafa5595edec" +checksum = "e1f9991a1c37b7d414c6865ddb04e93c27b260d8e575cb2b6d994454c69ebf76" dependencies = [ "anyhow", "it-memory-traits", @@ -1957,15 +1955,6 @@ dependencies = [ "rustix 0.37.23", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -2122,24 +2111,15 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "crc32fast", - "hashbrown", - "indexmap", - "memchr", -] - [[package]] name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ + "crc32fast", + "hashbrown 0.14.3", + "indexmap 2.1.0", "memchr", ] @@ -2229,19 +2209,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] -name = "polyplets" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad2a1ffbc0d66f92c861bb57fb60f113ea0736d16d4cd7ead1bb514d8d8b3d3" -dependencies = [ - "marine-macro 0.8.1", - "marine-rs-sdk-main 0.7.1", - "serde", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "ppv-lite86" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" @@ -2310,6 +2279,17 @@ dependencies = [ "cc", ] +[[package]] +name = "pulldown-cmark" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +dependencies = [ + "bitflags 1.3.2", + "memchr", + "unicase", +] + [[package]] name = "quick-protobuf" version = "0.8.1" @@ -2417,12 +2397,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", + "hashbrown 0.13.2", "log", + "rustc-hash", "slice-group-by", "smallvec", ] @@ -2473,24 +2454,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rustc-hex" -version = "2.1.0" +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustix" -version = "0.36.15" +name = "rustc-hex" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes 1.0.11", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustix" @@ -2501,10 +2474,8 @@ dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes 1.0.11", - "itoa", "libc", "linux-raw-sys 0.3.8", - "once_cell", "windows-sys 0.48.0", ] @@ -2516,8 +2487,10 @@ checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", + "itoa", "libc", "linux-raw-sys 0.4.7", + "once_cell", "windows-sys 0.48.0", ] @@ -2559,9 +2532,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" @@ -2612,10 +2585,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "serde_with_macros", @@ -2720,6 +2693,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -2774,9 +2753,9 @@ dependencies = [ [[package]] name = "system-interface" -version = "0.25.9" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe" +checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ "bitflags 2.4.0", "cap-fs-ext", @@ -2785,7 +2764,7 @@ dependencies = [ "io-lifetimes 2.0.2", "rustix 0.38.13", "windows-sys 0.48.0", - "winx 0.36.2", + "winx", ] [[package]] @@ -2811,18 +2790,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -2997,6 +2976,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -3078,20 +3066,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "walrus" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" -dependencies = [ - "anyhow", - "id-arena", - "leb128", - "log", - "walrus-macro", - "wasmparser 0.77.1", -] - [[package]] name = "walrus" version = "0.20.1" @@ -3137,9 +3111,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22ba2ca9076574dc9de38f3141c63677ce5577ed204d57740691b12d35ec8b3" +checksum = "77c4db6155e71cfae4ed732d87c2583faf4bbdcb77372697eb77d636f46108ba" dependencies = [ "anyhow", "async-trait", @@ -3147,35 +3121,36 @@ dependencies = [ "cap-rand", "cap-std", "cap-time-ext", - "fs-set-times 0.18.1", + "fs-set-times", "io-extras", - "io-lifetimes 1.0.11", + "io-lifetimes 2.0.2", "is-terminal", "once_cell", - "rustix 0.36.15", + "rustix 0.38.13", "system-interface", "tracing", "wasi-common", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasi-common" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13183cd7fed5d94b482f4e30e7a0bbf9b52426d51a647019906a1ecff7e84143" +checksum = "bf3f291b2a567f266ac488715f1742f62b2ca633524708c62ead9c0f71b7d72c" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.4.0", "cap-rand", "cap-std", "io-extras", - "rustix 0.36.15", + "log", + "rustix 0.38.13", "thiserror", "tracing", "wasmtime", "wiggle", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -3252,10 +3227,11 @@ dependencies = [ [[package]] name = "wasmer-interface-types-fl" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cd52371bfc227c904a0ab1ff478c287d2f74fa371fcff1d2e157444faf8fda2" +checksum = "62958478f282fbf2b05c12f9630972bd8194937de1ab22d6a59d43093be32886" dependencies = [ + "anyhow", "fluence-it-types", "it-lilo", "it-memory-traits", @@ -3273,230 +3249,391 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.77.1" +version = "0.80.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "wasmparser" -version = "0.80.2" +version = "0.101.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" +checksum = "bf2f22ef84ac5666544afa52f326f13e16f3d019d2e61e704fd8091c9358b130" +dependencies = [ + "indexmap 1.9.3", + "url", +] [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap", - "url", + "indexmap 2.1.0", + "semver", ] [[package]] name = "wasmparser" -version = "0.101.1" +version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2f22ef84ac5666544afa52f326f13e16f3d019d2e61e704fd8091c9358b130" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ - "indexmap", - "url", + "indexmap 2.1.0", + "semver", +] + +[[package]] +name = "wasmprinter" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" +dependencies = [ + "anyhow", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" +checksum = "b0263693caa1486bd4d26a5f18511948a706c9290689386b81b851ce088063ce" dependencies = [ "anyhow", + "async-trait", "bincode", + "bumpalo", "cfg-if", - "indexmap", + "encoding_rs", + "fxprof-processed-profile", + "indexmap 2.1.0", "libc", "log", - "object 0.29.0", + "object", "once_cell", "paste", "psm", "rayon", "serde", + "serde_derive", + "serde_json", "target-lexicon", - "wasmparser 0.100.0", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", "wasmtime-cache", + "wasmtime-component-macro", + "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", + "wasmtime-fiber", "wasmtime-jit", "wasmtime-runtime", + "wasmtime-winch", "wat", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-asm-macros" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" +checksum = "4711e5969236ecfbe70c807804ff9ffb5206c1dbb5c55c5e8200d9f7e8e76adf" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" +checksum = "5b79f9f79188e5a26b6911b79d3171c06699d9a17ae07f6a265c51635b8d80c2" dependencies = [ "anyhow", - "base64", + "base64 0.21.5", "bincode", "directories-next", - "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix 0.38.13", "serde", + "serde_derive", "sha2", "toml", - "windows-sys 0.42.0", + "windows-sys 0.48.0", "zstd", ] +[[package]] +name = "wasmtime-component-macro" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed724d0f41c21bcf8754651a59d0423c530069ddca4cf3822768489ad313a812" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.32", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e7d69464b94bd312a27d93d0b482cd74bedf01f030199ef0740d6300ebca1d3" + [[package]] name = "wasmtime-cranelift" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" +checksum = "4e63f53c61ba05eb815f905c1738ad82c95333dd42ef5a8cc2aa3d7dfb2b08d7" dependencies = [ "anyhow", + "cfg-if", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli 0.28.0", "log", - "object 0.29.0", + "object", "target-lexicon", "thiserror", - "wasmparser 0.100.0", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6b197d68612f7dc3a17aa9f9587533715ecb8b4755609ce9baf7fb92b74ddc" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli 0.28.0", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" +checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", - "indexmap", + "gimli 0.28.0", + "indexmap 2.1.0", "log", - "object 0.29.0", + "object", "serde", + "serde_derive", "target-lexicon", "thiserror", - "wasmparser 0.100.0", + "wasm-encoder 0.32.0", + "wasmparser 0.112.0", + "wasmprinter", + "wasmtime-component-util", "wasmtime-types", ] +[[package]] +name = "wasmtime-fiber" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a615a2cf64a49c0dc659c7d850c6cd377b975e0abfdcf0888b282d274a82e730" +dependencies = [ + "cc", + "cfg-if", + "rustix 0.38.13", + "wasmtime-asm-macros", + "wasmtime-versioned-export-macros", + "windows-sys 0.48.0", +] + [[package]] name = "wasmtime-jit" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" +checksum = "cd775514b8034b85b0323bfdc60abb1c28d27dbf6e22aad083ed57dac95cf72e" dependencies = [ - "addr2line 0.17.0", + "addr2line", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli 0.26.2", + "gimli 0.28.0", "ittapi", "log", - "object 0.29.0", + "object", "rustc-demangle", + "rustix 0.38.13", "serde", + "serde_derive", "target-lexicon", "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit-debug" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" +checksum = "c054e27c6ce2a6191edabe89e646da013044dd5369e1d203c89f977f9bd32937" dependencies = [ - "object 0.29.0", + "object", "once_cell", - "rustix 0.36.15", + "rustix 0.38.13", + "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +checksum = "7f323977cddf4a262d1b856366b665c5b4d01793c57b79fb42505b9fd9e61e5b" dependencies = [ "cfg-if", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-runtime" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" +checksum = "29e26461bba043f73cb4183f4ce0d606c0eaac112475867b11e5ea36fe1cac8e" dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap", + "encoding_rs", + "indexmap 2.1.0", "libc", "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset", "paste", "rand", - "rustix 0.36.15", + "rustix 0.38.13", + "sptr", + "wasm-encoder 0.32.0", "wasmtime-asm-macros", "wasmtime-environ", + "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" +checksum = "6fd7e9b29fee64eea5058cb5e7cb3480b52c2f1312d431d16ea8617ceebeb421" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", - "wasmparser 0.100.0", + "wasmparser 0.112.0", +] + +[[package]] +name = "wasmtime-versioned-export-macros" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6362c557c36d8ad4aaab735f14ed9e4f78d6b40ec85a02a88fd859af87682e52" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "wasmtime-wasi" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01fe90b8643ef9742e2d9e1c76186b53e0d3c3e81aef1ead89c7a538d48947c9" +checksum = "52c9e79f73320d96cd7644b021502dffee09dd92300b073f3541ae44e9ae377c" dependencies = [ "anyhow", + "async-trait", + "bitflags 2.4.0", + "bytes", + "cap-fs-ext", + "cap-net-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "futures", + "io-extras", + "io-lifetimes 2.0.2", + "is-terminal", + "libc", + "once_cell", + "rustix 0.38.13", + "system-interface", + "thiserror", + "tokio", + "tracing", "wasi-cap-std-sync", "wasi-common", "wasmtime", "wiggle", + "windows-sys 0.48.0", +] + +[[package]] +name = "wasmtime-winch" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa5fc7212424c04c01a20bfa66c4c518e8749dde6546f5e05815dcacbec80723" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli 0.28.0", + "object", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "winch-codegen", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcc03bd58f77a68dc6a0b2ba2f8e64b1f902b50389d21bbcc690ef2f3bb87198" +dependencies = [ + "anyhow", + "heck 0.4.1", + "indexmap 2.1.0", + "wit-parser", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "13.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e485bf54eba675ca615f8f55788d3a8cd44e7bd09b8b4011edc22c2c41d859e" + [[package]] name = "wast" version = "8.0.0" @@ -3538,13 +3675,13 @@ dependencies = [ [[package]] name = "wiggle" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd02c6a8098bc5fce898313df9ed13e3a98afcdb579a393070ee013505ca7ac" +checksum = "e81ddbdc400b38d04241d740d0406ef343bd242c460f252fe59f29ad964ad24c" dependencies = [ "anyhow", "async-trait", - "bitflags 1.3.2", + "bitflags 2.4.0", "thiserror", "tracing", "wasmtime", @@ -3553,28 +3690,28 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b657cf901cbffedfd90ececa74ed835864704562052202514d598930cf80bbaa" +checksum = "7c993123d6db1a1908ef8352aabdf2e681a3dcdedc3656beb747e4db16d3cf08" dependencies = [ "anyhow", "heck 0.4.1", "proc-macro2", "quote", "shellexpand", - "syn 1.0.109", + "syn 2.0.32", "witx", ] [[package]] name = "wiggle-macro" -version = "6.0.2" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd1d09a625f96effa501cdff06192eb6a89eeadd4fd4e2489e0c6907f604307" +checksum = "476e3e09bc68e82624b70a322265515523754cb9e05fcacceabd216e276bc2ed" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.32", "wiggle-generate", ] @@ -3610,36 +3747,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "winch-codegen" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "b9b01ca6722f7421c9cdbe4c9b62342ce864d0a9e8736d56dac717a86b1a65ae" dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "anyhow", + "cranelift-codegen", + "gimli 0.28.0", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser 0.112.0", + "wasmtime-environ", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -3652,18 +3781,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -3682,10 +3805,19 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] [[package]] name = "windows_aarch64_gnullvm" @@ -3694,10 +3826,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -3706,10 +3838,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.42.2" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -3718,10 +3850,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -3730,10 +3862,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -3742,10 +3874,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -3754,10 +3886,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -3766,15 +3898,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winx" -version = "0.35.1" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960" -dependencies = [ - "bitflags 1.3.2", - "io-lifetimes 1.0.11", - "windows-sys 0.48.0", -] +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winx" @@ -3786,6 +3913,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-parser" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.1.0", + "log", + "pulldown-cmark", + "semver", + "serde", + "serde_json", + "unicode-xid", + "url", +] + [[package]] name = "witx" version = "0.9.1" @@ -3807,6 +3952,26 @@ dependencies = [ "tap", ] +[[package]] +name = "zerocopy" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/example/Config.toml b/example/Config.toml index 1e6c2216..013c9afd 100644 --- a/example/Config.toml +++ b/example/Config.toml @@ -1,4 +1,5 @@ modules_dir = "." +total_memory_limit = "Infinity" [[module]] name = "curl_adapter" diff --git a/src/distro/Cargo.lock b/src/distro/Cargo.lock index c49f8094..488898b8 100644 --- a/src/distro/Cargo.lock +++ b/src/distro/Cargo.lock @@ -98,9 +98,9 @@ dependencies = [ [[package]] name = "fluence-spell-dtos" -version = "0.5.31" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3390956b285ef82a40b21593b9f58775cce3853f56d74840387ab7204ad924c0" +checksum = "6bf9c61ee22595ff957be32faa0444758e9b61009eab25cd9596503ba78a1ec0" dependencies = [ "eyre", "marine-rs-sdk", @@ -173,9 +173,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "marine-call-parameters" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979e5c52888bae300c937e36240293c20e34bb7b29d058375b15f85e713dd854" +checksum = "60dfc6d5a00b2d5aadbd60a13bdd6c6d6a5f46b31bf8db9f80ad295032f3bda3" dependencies = [ "marine-macro", "marine-rs-sdk-main", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "marine-macro" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93835918915610947b5ce96a4b3d89268fde2842a6d18d893c86ffe1b605c16e" +checksum = "3f4bef66ff0a930272053bc622e60ae07a444b6bdd6b2406ee2e85ee93fa34a8" dependencies = [ "marine-macro-impl", "marine-rs-sdk-main", @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "marine-macro-impl" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794126e4a2f5b78b43bc7c82329dc6ffa0c2511591803f89a6d97c037feb068" +checksum = "51866ba9045c01e96a716343c30b2d9302d1451c969ceba8f8e3cb52b78053c8" dependencies = [ "proc-macro2", "quote", @@ -207,9 +207,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eeb2e2a1ab3f7a2ba270ff42bc2d4fa0d1a0b0f6bdb377b2db4403030a854a" +checksum = "d189b674dfcebfbb5668ead5335c3ba52fd4f8e8947b6f2d48869765ab403bd9" dependencies = [ "marine-call-parameters", "marine-macro", @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk-main" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997cdfb9fdef7066a527e9436938618d0596e00f4cceea1ab3b5bb32d20947f6" +checksum = "d3b4d597243fa88bf33fe91e080ab155cc1679ac4970e1a20dce6b58df084673" dependencies = [ "log", "serde", @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "marine-sqlite-connector" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92552a0cc893d708ac324f45e687dae9ac9e1333b06ecc7e2c3d81abaf6b2d7d" +checksum = "41e6a51c5a4480dfee082aff7253656ee10aa669631fa9922967f41a70049550" dependencies = [ "bytesize", "marine-rs-sdk", @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "marine-timestamp-macro" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ccb7870fd62eb4cc34a86b0ae8bdca680067138c3bb10fca7fb67e03242ca4" +checksum = "d1465b4dcc7d85940cf33f8d64fd0bb2f98093cc3a5384e2d224bf6e50069adb" dependencies = [ "chrono", "quote", diff --git a/src/distro/Cargo.toml b/src/distro/Cargo.toml index 88be19e2..2a9a422d 100644 --- a/src/distro/Cargo.toml +++ b/src/distro/Cargo.toml @@ -12,7 +12,7 @@ include = [ "/src", "built.rs", "Cargo.toml", "decider-spell" ] [dependencies] maplit = "1.0.2" serde_json = "1.0.96" -fluence-spell-dtos = "0.5.31" +fluence-spell-dtos = "0.6.0" [build-dependencies] built = "0.7.0" diff --git a/src/services/chain-connector/modules/chain_connector/Cargo.toml b/src/services/chain-connector/modules/chain_connector/Cargo.toml index fd6953c3..dec89190 100644 --- a/src/services/chain-connector/modules/chain_connector/Cargo.toml +++ b/src/services/chain-connector/modules/chain_connector/Cargo.toml @@ -9,7 +9,7 @@ name = "chain_connector" path = "src/main.rs" [dependencies] -marine-rs-sdk = { version = "0.7.1", features = ["logger"] } +marine-rs-sdk = { version = "0.10.2", features = ["logger"] } serde_json = "1.0.91" serde = { version = "1", features = ["derive"] } log = "0.4.17" @@ -22,6 +22,6 @@ libp2p-identity = { version = "0.2.1", features = ["peerid"], default-features = clarity = { version = "1.2.3", features = [] } [dev-dependencies] -marine-rs-sdk-test = "0.11.0" +marine-rs-sdk-test = "0.12.0" mockito = "1.1.0" env_logger = "0.10.0" diff --git a/src/services/chain-connector/modules/curl_adapter/Cargo.toml b/src/services/chain-connector/modules/curl_adapter/Cargo.toml index 52273a70..87a9099b 100644 --- a/src/services/chain-connector/modules/curl_adapter/Cargo.toml +++ b/src/services/chain-connector/modules/curl_adapter/Cargo.toml @@ -9,7 +9,7 @@ name = "curl_adapter" path = "src/main.rs" [dependencies] -marine-rs-sdk = "0.7.1" +marine-rs-sdk = "0.10.2" [dev-dependencies] -marine-rs-sdk-test = "0.11.0" +marine-rs-sdk-test = "0.12.0" diff --git a/src/tests/decider-distro-tests-rs/Cargo.lock b/src/tests/decider-distro-tests-rs/Cargo.lock index 3fb078b6..0602d3b5 100644 --- a/src/tests/decider-distro-tests-rs/Cargo.lock +++ b/src/tests/decider-distro-tests-rs/Cargo.lock @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "air-interpreter-fs" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "air-interpreter-wasm", "blake3", @@ -236,7 +236,7 @@ dependencies = [ [[package]] name = "aquamarine" version = "0.2.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "anyhow", "async-trait", @@ -1018,7 +1018,7 @@ dependencies = [ [[package]] name = "cid-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "base64 0.21.5", "bytes", @@ -1142,7 +1142,7 @@ dependencies = [ [[package]] name = "config-utils" version = "0.2.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "libp2p-identity", ] @@ -1150,7 +1150,7 @@ dependencies = [ [[package]] name = "connected-client" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "derivative", "either", @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "connection-pool" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "fluence-libp2p", "futures", @@ -1245,7 +1245,7 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "control-macro" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" [[package]] name = "core-foundation" @@ -1401,7 +1401,7 @@ dependencies = [ [[package]] name = "created-swarm" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "air-interpreter-fs", "aquamarine", @@ -1617,21 +1617,21 @@ dependencies = [ [[package]] name = "decider-distro" version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2222e93a91a282fb033c64f39b0e8a118f15afbc63bed1f0acb76f2b76bd80ef" dependencies = [ "built 0.7.1", - "fluence-spell-dtos", + "fluence-spell-dtos 0.5.33", "maplit", "serde_json", ] [[package]] name = "decider-distro" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2222e93a91a282fb033c64f39b0e8a118f15afbc63bed1f0acb76f2b76bd80ef" +version = "0.5.7" dependencies = [ "built 0.7.1", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "maplit", "serde_json", ] @@ -1642,11 +1642,11 @@ version = "0.1.0" dependencies = [ "connected-client", "created-swarm", - "decider-distro 0.5.6", + "decider-distro 0.5.7", "eyre", "fluence-app-service", "fluence-keypair", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "hyper 0.14.27", "log-utils", "maplit", @@ -1976,9 +1976,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -2133,7 +2133,7 @@ dependencies = [ [[package]] name = "fluence-libp2p" version = "0.2.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "base64 0.21.5", "bs58", @@ -2153,19 +2153,32 @@ dependencies = [ [[package]] name = "fluence-spell-distro" -version = "0.5.32" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38bb3c7c024ba98047785c1e304e8cdb6abf6b7656b082b0ad8fc8d4fab052f" +checksum = "3c4432e1ce493689cf93e4a112ad3970a5b2fd982a89efc0ee33a9f089663b78" dependencies = [ - "built 0.6.1", + "built 0.7.1", "maplit", ] [[package]] name = "fluence-spell-dtos" -version = "0.5.32" +version = "0.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac50ce0a57f54422f4fe79d8f228ea15efc1536b46dabbb10fc0137e56d16a85" +checksum = "ef13cd9b0d2690a8759e0b815712b074469dca183823b70722567d1466de30b9" +dependencies = [ + "eyre", + "marine-rs-sdk", + "marine-sqlite-connector", + "serde", + "thiserror", +] + +[[package]] +name = "fluence-spell-dtos" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf9c61ee22595ff957be32faa0444758e9b61009eab25cd9596503ba78a1ec0" dependencies = [ "eyre", "marine-rs-sdk", @@ -2229,7 +2242,7 @@ dependencies = [ [[package]] name = "fs-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "eyre", "rand 0.8.5", @@ -2536,7 +2549,7 @@ dependencies = [ [[package]] name = "health" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "eyre", ] @@ -3224,7 +3237,7 @@ dependencies = [ [[package]] name = "ivalue-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "fluence-it-types", "serde_json", @@ -3251,7 +3264,7 @@ dependencies = [ [[package]] name = "json-utils" version = "0.0.2" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "base64 0.21.5", "itertools 0.12.0", @@ -3352,7 +3365,7 @@ dependencies = [ [[package]] name = "kademlia" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "bs58", "control-macro", @@ -3390,7 +3403,7 @@ dependencies = [ [[package]] name = "key-manager" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "eyre", "fluence-keypair", @@ -4023,7 +4036,7 @@ checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "local-vm" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "air-interpreter-fs", "air-interpreter-wasm", @@ -4067,7 +4080,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "log-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "console-subscriber", "log", @@ -4207,15 +4220,15 @@ dependencies = [ [[package]] name = "marine-it-parser" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c9bda472e259f5994eaf7cb94fe1fa99add703de35986c1fe17889f60f16cbe" +checksum = "ec9325e7cf7c4e01087be83ae5abb26fe76445b0df517a201fbe6ca298b8661b" dependencies = [ "anyhow", "itertools 0.10.5", "marine-it-interfaces 0.9.0", "marine-module-interface 0.8.0", - "marine-wasm-backend-traits 0.4.0", + "marine-wasm-backend-traits 0.5.0", "nom", "semver", "serde", @@ -4375,9 +4388,9 @@ dependencies = [ [[package]] name = "marine-sqlite-connector" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92552a0cc893d708ac324f45e687dae9ac9e1333b06ecc7e2c3d81abaf6b2d7d" +checksum = "41e6a51c5a4480dfee082aff7253656ee10aa669631fa9922967f41a70049550" dependencies = [ "bytesize", "marine-rs-sdk", @@ -4416,9 +4429,9 @@ dependencies = [ [[package]] name = "marine-wasm-backend-traits" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7523253125d02600f8f8cfe2689620ff3b21dae08bc6708404f9bd7cafabcc" +checksum = "470aaec9c93cec6a4cfd6ce78e338c92e688da14d3203863c517a96027aec417" dependencies = [ "anyhow", "it-memory-traits", @@ -4766,12 +4779,12 @@ dependencies = [ [[package]] name = "now-millis" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" [[package]] name = "nox" -version = "0.16.6" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +version = "0.16.9" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "air-interpreter-fs", "air-interpreter-wasm", @@ -4817,6 +4830,7 @@ dependencies = [ "system-services", "tokio", "tokio-stream", + "tonic 0.9.2", "tracing", "tracing-log", "tracing-logfmt", @@ -5136,7 +5150,7 @@ dependencies = [ [[package]] name = "particle-args" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "avm-server", "bs58", @@ -5152,7 +5166,7 @@ dependencies = [ [[package]] name = "particle-builtins" version = "0.2.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "async-trait", "avm-server", @@ -5198,7 +5212,7 @@ dependencies = [ [[package]] name = "particle-execution" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "async-trait", "fluence-app-service", @@ -5217,7 +5231,7 @@ dependencies = [ [[package]] name = "particle-modules" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "base64 0.21.5", "bytesize", @@ -5230,7 +5244,7 @@ dependencies = [ "json-utils", "libipld", "log", - "marine-it-parser 0.14.0", + "marine-it-parser 0.15.0", "marine-utils", "parking_lot", "particle-args", @@ -5245,7 +5259,7 @@ dependencies = [ [[package]] name = "particle-protocol" version = "0.3.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "asynchronous-codec 0.7.0", "base64 0.21.5", @@ -5265,13 +5279,14 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "tracing", "unsigned-varint 0.8.0", ] [[package]] name = "particle-services" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "derivative", "eyre", @@ -5327,7 +5342,7 @@ dependencies = [ [[package]] name = "peer-metrics" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "bytesize", "fluence-app-service", @@ -6419,7 +6434,7 @@ dependencies = [ [[package]] name = "server-config" version = "0.2.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "air-interpreter-fs", "base64 0.21.5", @@ -6451,7 +6466,7 @@ dependencies = [ [[package]] name = "service-modules" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "cid-utils", "eyre", @@ -6635,14 +6650,14 @@ dependencies = [ [[package]] name = "sorcerer" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "aquamarine", "connection-pool", "eyre", "fluence-keypair", "fluence-libp2p", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "fstrings", "futures", "kademlia", @@ -6674,13 +6689,13 @@ dependencies = [ [[package]] name = "spell-event-bus" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "connection-pool", "derivative", "eyre", "fluence-libp2p", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "fstrings", "futures", "log", @@ -6702,10 +6717,10 @@ dependencies = [ [[package]] name = "spell-service-api" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "fluence-libp2p", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "key-manager", "particle-execution", "particle-services", @@ -6717,7 +6732,7 @@ dependencies = [ [[package]] name = "spell-storage" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "derivative", "eyre", @@ -6782,7 +6797,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subnet-resolver" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "ethabi", "eyre", @@ -6881,13 +6896,13 @@ dependencies = [ [[package]] name = "system-services" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "aqua-ipfs-distro", - "decider-distro 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "decider-distro 0.5.6", "eyre", "fluence-app-service", - "fluence-spell-dtos", + "fluence-spell-dtos 0.6.0", "libp2p", "log", "maplit", @@ -6948,7 +6963,7 @@ dependencies = [ [[package]] name = "test-constants" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" [[package]] name = "textwrap" @@ -6961,18 +6976,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", @@ -7152,7 +7167,7 @@ dependencies = [ [[package]] name = "toml-utils" version = "0.0.1" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "toml 0.5.11", ] @@ -7280,7 +7295,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "toy-vms" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "aquamarine", "avm-server", @@ -7545,7 +7560,7 @@ dependencies = [ [[package]] name = "uuid-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.6#21515a5bf9a324e91fca672bb66510aa4f6659d5" +source = "git+https://github.com/fluencelabs/nox.git?tag=nox-v0.16.9#57a3840e844fb259005241b0c47259f665b7775c" dependencies = [ "uuid", ] diff --git a/src/tests/decider-distro-tests-rs/Cargo.toml b/src/tests/decider-distro-tests-rs/Cargo.toml index d0d10bf2..b27236bf 100644 --- a/src/tests/decider-distro-tests-rs/Cargo.toml +++ b/src/tests/decider-distro-tests-rs/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dev-dependencies] decider-distro = { path = "../../distro" } -created-swarm = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.6" } -connected-client = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.6" } -log-utils = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.6" } -system-services = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.6" } +created-swarm = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.9" } +connected-client = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.9" } +log-utils = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.9" } +system-services = { git = "https://github.com/fluencelabs/nox.git", tag = "nox-v0.16.9" } tempfile = "3.8.1" fluence-app-service = "0.29.0" @@ -25,7 +25,7 @@ toml = "0.5.10" maplit = "1.0.2" serde_json = "1.0.96" serde = { version = "1.0.192", features = ["derive"] } -fluence-spell-dtos = "0.5.31" +fluence-spell-dtos = "0.6.0" mockito = "1.1.0" hyper = "0.14.27" eyre = "0.6.9" diff --git a/src/tests/decider-distro-tests-rs/tests/test_deploy.rs b/src/tests/decider-distro-tests-rs/tests/test_deploy.rs index 0b73520c..75efad3e 100644 --- a/src/tests/decider-distro-tests-rs/tests/test_deploy.rs +++ b/src/tests/decider-distro-tests-rs/tests/test_deploy.rs @@ -123,7 +123,7 @@ async fn test_deploy_a_deal_single() { !counter.absent, "decider hasn't started yet (no counter in kv)" ); - assert_eq!(counter.num, 1, "decider wasn't run"); + assert_eq!(counter.value, 1, "decider wasn't run"); // Analyse joined deals let deal = { @@ -331,9 +331,9 @@ async fn test_deploy_deals_diff_blocks() { let last_seen = serde_json::from_value::(result.remove(0)).unwrap(); let deals = serde_json::from_value::(result.remove(0)).unwrap(); - assert_eq!(deals.strings.len(), 2); + assert_eq!(deals.value.len(), 2); let deals = deals - .strings + .value .iter() .map(|deal| serde_json::from_str::(deal).unwrap()) .collect::>(); @@ -346,7 +346,7 @@ async fn test_deploy_deals_diff_blocks() { (last_seen, deals, workers) }; - assert_eq!(last_seen.str, to_hex(LATEST_BLOCK), "wrong last_seen block"); + assert_eq!(last_seen.value, to_hex(LATEST_BLOCK), "wrong last_seen block"); let mut expected = hashmap! { deal_id_1 => (TestApp::test_app1(), BLOCK_NUMBER_1), @@ -472,9 +472,9 @@ async fn test_deploy_a_deal_in_seq() { let last_seen = serde_json::from_value::(result.remove(0)).unwrap(); let deals = serde_json::from_value::(result.remove(0)).unwrap(); - assert_eq!(deals.strings.len(), 2); + assert_eq!(deals.value.len(), 2); let deals = deals - .strings + .value .iter() .map(|deal| serde_json::from_str::(deal).unwrap()) .collect::>(); @@ -487,7 +487,7 @@ async fn test_deploy_a_deal_in_seq() { (last_seen, deals, workers) }; assert_eq!( - last_seen.str, + last_seen.value, to_hex(LATEST_BLOCK_SECOND_RUN), "saved wrong last_seen_block" ); @@ -614,9 +614,9 @@ async fn test_deploy_deals_in_one_block() { let last_seen = serde_json::from_value::(result.remove(0)).unwrap(); let deals = serde_json::from_value::(result.remove(0)).unwrap(); - assert_eq!(deals.strings.len(), 2); + assert_eq!(deals.value.len(), 2); let deals = deals - .strings + .value .iter() .map(|deal| serde_json::from_str::(deal).unwrap()) .collect::>(); @@ -630,7 +630,7 @@ async fn test_deploy_deals_in_one_block() { }; // TODO: difficult logic with last_seen_block, not sure on what circumstances it should be // incremented and when not - assert_eq!(last_seen.str, to_hex(LATEST_BLOCK), "wrong last seen"); + assert_eq!(last_seen.value, to_hex(LATEST_BLOCK), "wrong last seen"); let mut expected = hashmap! { // It was installed on the first run, so on the second run the window is updated diff --git a/src/tests/decider-distro-tests-rs/tests/test_update.rs b/src/tests/decider-distro-tests-rs/tests/test_update.rs index aa17733e..bdb94582 100644 --- a/src/tests/decider-distro-tests-rs/tests/test_update.rs +++ b/src/tests/decider-distro-tests-rs/tests/test_update.rs @@ -113,7 +113,7 @@ async fn test_update_deal() { .unwrap(); let result = serde_json::from_value::(result[0].clone()).unwrap(); assert!(!result.absent, "no `worker_def_cid` on worker-spell"); - serde_json::from_str::(&result.str).unwrap() + serde_json::from_str::(&result.value).unwrap() }; let original_app = TestApp::test_app2(); let new_app = TestApp::test_app1(); diff --git a/src/tests/decider-distro-tests-rs/tests/tests_basic.rs b/src/tests/decider-distro-tests-rs/tests/tests_basic.rs index bb11d82a..81b70f2a 100644 --- a/src/tests/decider-distro-tests-rs/tests/tests_basic.rs +++ b/src/tests/decider-distro-tests-rs/tests/tests_basic.rs @@ -146,7 +146,7 @@ async fn test_left_boundary_idle() { let last_seen = spell::get_string(&mut client, "decider", "last_seen_block") .await .unwrap(); - assert_eq!(last_seen.str, expected_last_seen[step]); + assert_eq!(last_seen.value, expected_last_seen[step]); } server.shutdown().await; diff --git a/src/tests/decider-distro-tests-rs/tests/utils/control.rs b/src/tests/decider-distro-tests-rs/tests/utils/control.rs index 5a221ecd..cf558dff 100644 --- a/src/tests/decider-distro-tests-rs/tests/utils/control.rs +++ b/src/tests/decider-distro-tests-rs/tests/utils/control.rs @@ -1,7 +1,7 @@ use crate::utils; use crate::utils::spell; use connected_client::ConnectedClient; -use eyre::{ContextCompat, WrapErr}; +use eyre::WrapErr; use fluence_spell_dtos::trigger_config::TriggerConfig; use fluence_spell_dtos::value::ScriptValue; use maplit::hashmap; @@ -11,6 +11,7 @@ use std::path::PathBuf; use std::sync::Arc; use std::time::Duration; use tempfile::TempDir; +use eyre::ContextCompat; pub async fn update_config( client: &mut ConnectedClient, @@ -85,7 +86,7 @@ pub async fn update_decider_script_for_tests(client: &mut ConnectedClient, test_ ) "#, client = client.peer_id, - script = script.source_code, + script = script.value, ); modify_decider_spell_script(test_dir, decider_id, updated_script).await; @@ -113,7 +114,7 @@ pub async fn wait_worker_spell_stopped( strings.error ); - if !strings.strings.is_empty() { + if !strings.value.is_empty() { #[derive(Deserialize, Debug)] struct State { state: String, @@ -122,7 +123,7 @@ pub async fn wait_worker_spell_stopped( // HACK: sometimes sqlite returns trash in the requested lists. // FOR NOW we filter out the trash to avoid parsing errors and CI failures let last_statuses = strings - .strings + .value .iter() .filter_map(|s| serde_json::from_str::(s).ok()) .collect::>(); @@ -131,7 +132,7 @@ pub async fn wait_worker_spell_stopped( .last() .wrap_err(format!( "no installation status parsed, got {:?}", - strings.strings + strings.value )) .unwrap(); let in_progress_statuses = ["INSTALLATION_IN_PROGRESS", "NOT_STARTED"]; diff --git a/src/tests/decider-distro-tests-rs/tests/utils/state/deal.rs b/src/tests/decider-distro-tests-rs/tests/utils/state/deal.rs index 4f58aee6..87c23c4c 100644 --- a/src/tests/decider-distro-tests-rs/tests/utils/state/deal.rs +++ b/src/tests/decider-distro-tests-rs/tests/utils/state/deal.rs @@ -20,7 +20,7 @@ pub async fn get_deal_state(client: &mut ConnectedClient, deal_id: &String) -> D "can't get state for deal {}: {}", deal_id, result.error ); - serde_json::from_str::(&result.str) + serde_json::from_str::(&result.value) .wrap_err("parse deal_state") .unwrap() } @@ -37,7 +37,7 @@ pub async fn get_joined_deals(client: &mut ConnectedClient) -> Vec { .unwrap(); assert!(deals.success, "empty list of joined_deals: {}", deals.error); deals - .strings + .value .iter() .map(|deal| serde_json::from_str::(deal).unwrap()) .collect() @@ -64,7 +64,7 @@ pub async fn get_failed_deals(client: &mut ConnectedClient) -> Vec { .unwrap(); assert!(deals.success, "can't receive failed_deals: {}", deals.error); deals - .strings + .value .iter() .map(|s| serde_json::from_str::(s)) .collect::, _>>() diff --git a/src/tests/decider-distro-tests-rs/tests/utils/state/decider.rs b/src/tests/decider-distro-tests-rs/tests/utils/state/decider.rs index 17cd5f30..7aba5a27 100644 --- a/src/tests/decider-distro-tests-rs/tests/utils/state/decider.rs +++ b/src/tests/decider-distro-tests-rs/tests/utils/state/decider.rs @@ -17,5 +17,5 @@ pub async fn get_sync_info(client: &mut ConnectedClient) -> eyre::Result(&result.str).wrap_err("parse sync_info") + serde_json::from_str::(&result.value).wrap_err("parse sync_info") } diff --git a/src/tests/decider-distro-tests-rs/tests/utils/state/subnet.rs b/src/tests/decider-distro-tests-rs/tests/utils/state/subnet.rs index 86d53f69..db6417c0 100644 --- a/src/tests/decider-distro-tests-rs/tests/utils/state/subnet.rs +++ b/src/tests/decider-distro-tests-rs/tests/utils/state/subnet.rs @@ -19,7 +19,7 @@ pub async fn get_txs(mut client: &mut ConnectedClient) -> Vec { "can't receive `worker_registration_txs`: {}", txs.error ); - txs.strings + txs.value .iter() .map(|tx| serde_json::from_str::(tx).unwrap()) .collect::>() @@ -41,7 +41,7 @@ pub async fn get_txs_statuses(mut client: &mut ConnectedClient) -> Vec(tx).unwrap()) .collect::>() diff --git a/src/tests/decider-distro-tests-rs/tests/utils/state/worker.rs b/src/tests/decider-distro-tests-rs/tests/utils/state/worker.rs index ab657ee3..1bc3f2ee 100644 --- a/src/tests/decider-distro-tests-rs/tests/utils/state/worker.rs +++ b/src/tests/decider-distro-tests-rs/tests/utils/state/worker.rs @@ -11,7 +11,7 @@ pub async fn get_worker_app_cid(client: &mut ConnectedClient, worker_id: &String .wrap_err("get_worker_app_cid failed") .unwrap(); assert!(!result.absent, "worker-spell doesn't have worker_def_cid"); - serde_json::from_str::(&result.str).unwrap() + serde_json::from_str::(&result.value).unwrap() } pub async fn get_worker(mut client: &mut ConnectedClient, deal: &str) -> Vec {