From 5b372e7365a3b73407119c3573d021df62befde2 Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Fri, 15 Dec 2023 17:55:46 +0400 Subject: [PATCH] update marine and stuff --- Cargo.lock | 179 ++++++++++++++++++++++++++++---------------- distro/Config.toml | 1 + service/Cargo.toml | 4 +- service/Config.toml | 1 + 4 files changed, 118 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02b4433..192702e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,7 +129,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -271,9 +271,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytesize" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" dependencies = [ "serde", ] @@ -370,18 +370,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] @@ -644,7 +643,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -692,7 +691,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -714,7 +713,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -1551,9 +1550,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mach" @@ -1579,6 +1578,17 @@ dependencies = [ "marine-test-macro-impl", ] +[[package]] +name = "marine-call-parameters" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60dfc6d5a00b2d5aadbd60a13bdd6c6d6a5f46b31bf8db9f80ad295032f3bda3" +dependencies = [ + "marine-macro 0.10.2", + "marine-rs-sdk-main 0.10.2", + "serde", +] + [[package]] name = "marine-core" version = "0.20.3" @@ -1616,7 +1626,7 @@ checksum = "a2042bcddb83455ba3bf4619fa732b0d61ae52b66fbfd5f3f39397553474658e" dependencies = [ "it-lilo", "marine-it-parser", - "marine-macro-impl", + "marine-macro-impl 0.7.1", "once_cell", "serde", "serde_json", @@ -1660,8 +1670,18 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e03da22f641984aad5229f780d190502196d1c0bf908d3d17f5d6bcba73e525" dependencies = [ - "marine-macro-impl", - "marine-rs-sdk-main", + "marine-macro-impl 0.7.1", + "marine-rs-sdk-main 0.7.1", +] + +[[package]] +name = "marine-macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4bef66ff0a930272053bc622e60ae07a444b6bdd6b2406ee2e85ee93fa34a8" +dependencies = [ + "marine-macro-impl 0.10.2", + "marine-rs-sdk-main 0.10.2", ] [[package]] @@ -1677,6 +1697,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "marine-macro-impl" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51866ba9045c01e96a716343c30b2d9302d1451c969ceba8f8e3cb52b78053c8" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + [[package]] name = "marine-min-it-version" version = "0.3.0" @@ -1695,7 +1728,7 @@ checksum = "b0aab6b0bc63685a4d51d7ec5876b8a0330264d72be09f579fb3a71e9eed4076" dependencies = [ "anyhow", "chrono", - "marine-rs-sdk-main", + "marine-rs-sdk-main 0.7.1", "marine-wasm-backend-traits", "semver", "serde", @@ -1726,13 +1759,26 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cfeeb7b8cd98e32276fabfe6ab095a6aae793f3f080e7eb1c3d36b1b762397c" dependencies = [ - "marine-macro", - "marine-rs-sdk-main", - "marine-timestamp-macro", + "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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d189b674dfcebfbb5668ead5335c3ba52fd4f8e8947b6f2d48869765ab403bd9" +dependencies = [ + "marine-call-parameters", + "marine-macro 0.10.2", + "marine-rs-sdk-main 0.10.2", + "marine-timestamp-macro 0.10.2", + "serde", +] + [[package]] name = "marine-rs-sdk-main" version = "0.7.1" @@ -1743,6 +1789,16 @@ dependencies = [ "serde", ] +[[package]] +name = "marine-rs-sdk-main" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b4d597243fa88bf33fe91e080ab155cc1679ac4970e1a20dce6b58df084673" +dependencies = [ + "log", + "serde", +] + [[package]] name = "marine-rs-sdk-test" version = "0.9.1" @@ -1770,8 +1826,8 @@ dependencies = [ "log", "marine-core", "marine-module-interface", - "marine-rs-sdk", - "marine-rs-sdk-main", + "marine-rs-sdk 0.7.1", + "marine-rs-sdk-main 0.7.1", "marine-utils", "marine-wasm-backend-traits", "marine-wasmtime-backend", @@ -1788,12 +1844,12 @@ dependencies = [ [[package]] name = "marine-sqlite-connector" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ebecc037ef73b87d4e7f71d9925f0457230d22f1bdabbc5c962ec34932e88e" +checksum = "92552a0cc893d708ac324f45e687dae9ac9e1333b06ecc7e2c3d81abaf6b2d7d" dependencies = [ "bytesize", - "marine-rs-sdk", + "marine-rs-sdk 0.10.2", ] [[package]] @@ -1837,6 +1893,16 @@ dependencies = [ "quote", ] +[[package]] +name = "marine-timestamp-macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1465b4dcc7d85940cf33f8d64fd0bb2f98093cc3a5384e2d224bf6e50069adb" +dependencies = [ + "chrono", + "quote", +] + [[package]] name = "marine-utils" version = "0.5.0" @@ -2116,8 +2182,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c051f220264e391afae06b6dceda199d523ee1dc7ae8e8cba4119a378dd411f" dependencies = [ - "marine-macro", - "marine-rs-sdk-main", + "marine-macro 0.7.1", + "marine-rs-sdk-main 0.7.1", "serde", ] @@ -2163,9 +2229,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2201,9 +2267,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2338,7 +2404,7 @@ checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -2495,9 +2561,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -2513,20 +2579,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2555,7 +2621,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.21", + "time", ] [[package]] @@ -2567,7 +2633,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -2690,9 +2756,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -2759,18 +2825,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "syn 2.0.41", ] [[package]] @@ -2879,7 +2934,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] @@ -2929,7 +2984,7 @@ dependencies = [ "fluence-keypair", "libp2p-identity", "log", - "marine-rs-sdk", + "marine-rs-sdk 0.10.2", "marine-rs-sdk-test", "marine-sqlite-connector", "once_cell", @@ -3071,12 +3126,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -3147,7 +3196,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", "wasm-bindgen-shared", ] @@ -3169,7 +3218,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3757,7 +3806,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.41", ] [[package]] diff --git a/distro/Config.toml b/distro/Config.toml index dc90cff..e1ed98e 100644 --- a/distro/Config.toml +++ b/distro/Config.toml @@ -1,4 +1,5 @@ modules_dir = "." +total_memory_limit = "Infinity" [[module]] name = "sqlite3" diff --git a/service/Cargo.toml b/service/Cargo.toml index 4598881..4137f1f 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -14,8 +14,8 @@ path = "src/main.rs" [dependencies] trust-graph = { version = "0.4.7", path = "../trust-graph" } fluence-keypair = { version = "0.10.3", path = "../keypair" } -marine-rs-sdk = { version = "0.7.1", features = ["logger"] } -marine-sqlite-connector = "0.8.0" +marine-rs-sdk = { version = "0.10.2", features = ["logger"] } +marine-sqlite-connector = "0.9.0" libp2p-identity = { workspace = true } diff --git a/service/Config.toml b/service/Config.toml index 2db7d30..22939e9 100644 --- a/service/Config.toml +++ b/service/Config.toml @@ -1,4 +1,5 @@ modules_dir = "artifacts/" +total_memory_limit = "Infinity" [[module]] name = "sqlite3"