diff --git a/Cargo.lock b/Cargo.lock index 8d94503..6be40d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,7 @@ name = "account_manager" version = "0.1.0" dependencies = [ "bincode", - "bytes", + "bytes 1.3.0", "channels", "config", "dotenv", @@ -25,7 +25,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -40,7 +40,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags", - "bytes", + "bytes 1.3.0", "crossbeam-channel", "futures-core", "futures-sink", @@ -49,10 +49,10 @@ dependencies = [ "log", "once_cell", "parking_lot 0.12.1", - "pin-project-lite", + "pin-project-lite 0.2.9", "smallvec", - "tokio", - "tokio-util", + "tokio 1.22.0", + "tokio-util 0.7.4", ] [[package]] @@ -62,14 +62,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ "bitflags", - "bytes", + "bytes 1.3.0", "futures-core", "futures-sink", "log", "memchr", - "pin-project-lite", - "tokio", - "tokio-util", + "pin-project-lite 0.2.9", + "tokio 1.22.0", + "tokio-util 0.7.4", ] [[package]] @@ -86,24 +86,24 @@ dependencies = [ "base64", "bitflags", "brotli", - "bytes", + "bytes 1.3.0", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.15", "http", "httparse", - "httpdate", - "itoa", + "httpdate 1.0.2", + "itoa 1.0.4", "language-tags", "local-channel", "mime", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "rand 0.8.5", - "sha1", + "sha1 0.10.5", "smallvec", "tracing", "zstd", @@ -140,7 +140,7 @@ checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" dependencies = [ "actix-macros", "futures-core", - "tokio", + "tokio 1.22.0", ] [[package]] @@ -156,8 +156,8 @@ dependencies = [ "futures-util", "mio 0.8.5", "num_cpus", - "socket2", - "tokio", + "socket2 0.4.7", + "tokio 1.22.0", "tracing", ] @@ -169,7 +169,7 @@ checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite", + "pin-project-lite 0.2.9", ] [[package]] @@ -179,7 +179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" dependencies = [ "local-waker", - "pin-project-lite", + "pin-project-lite 0.2.9", ] [[package]] @@ -198,7 +198,7 @@ dependencies = [ "actix-utils", "actix-web-codegen", "ahash", - "bytes", + "bytes 1.3.0", "bytestring", "cfg-if 1.0.0", "cookie", @@ -207,18 +207,18 @@ dependencies = [ "futures-core", "futures-util", "http", - "itoa", + "itoa 1.0.4", "language-tags", "log", "mime", "once_cell", - "pin-project-lite", + "pin-project-lite 0.2.9", "regex", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2", + "socket2 0.4.7", "time 0.3.17", "url", ] @@ -296,12 +296,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "ambient-authority" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -311,6 +305,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -376,7 +379,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi 0.3.9", ] @@ -396,6 +399,27 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide 0.5.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + [[package]] name = "base64" version = "0.13.1" @@ -576,6 +600,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + [[package]] name = "bytes" version = "1.3.0" @@ -588,72 +618,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1" dependencies = [ - "bytes", -] - -[[package]] -name = "cap-fs-ext" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e103ce36d217d568903ad27b14ec2238ecb5d65bad2e756a8f3c0d651506e" -dependencies = [ - "cap-primitives", - "cap-std", - "io-lifetimes 0.7.5", - "windows-sys 0.36.1", -] - -[[package]] -name = "cap-primitives" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3f336aa91cce16033ed3c94ac91d98956c49b420e6d6cd0dd7d0e386a57085" -dependencies = [ - "ambient-authority", - "fs-set-times", - "io-extras", - "io-lifetimes 0.7.5", - "ipnet", - "maybe-owned", - "rustix 0.35.13", - "winapi-util", - "windows-sys 0.36.1", - "winx", -] - -[[package]] -name = "cap-rand" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14b9606aa9550d34651bc481443203bc014237bdb992d201d2afa62d2ec6dea" -dependencies = [ - "ambient-authority", - "rand 0.8.5", -] - -[[package]] -name = "cap-std" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d6e70b626eceac9d6fc790fe2d72cc3f2f7bc3c35f467690c54a526b0f56db" -dependencies = [ - "cap-primitives", - "io-extras", - "io-lifetimes 0.7.5", - "ipnet", - "rustix 0.35.13", -] - -[[package]] -name = "cap-time-ext" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a0524f7c4cff2ea547ae2b652bf7a348fd3e48f76556dc928d8b45ab2f1d50" -dependencies = [ - "cap-primitives", - "once_cell", - "rustix 0.35.13", - "winx", + "bytes 1.3.0", ] [[package]] @@ -677,7 +642,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -710,7 +675,7 @@ name = "channels" version = "0.1.0" dependencies = [ "bincode", - "bytes", + "bytes 1.3.0", "config", "futures 0.3.25", "model", @@ -719,7 +684,7 @@ dependencies = [ "strum", "tarpc", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "whatlang", ] @@ -740,6 +705,21 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -784,6 +764,7 @@ dependencies = [ "lazy_static", "libc", "terminal_size", + "unicode-width", "winapi 0.3.9", ] @@ -797,6 +778,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + [[package]] name = "convert_case" version = "0.4.0" @@ -836,12 +823,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpp_demangle" -version = "0.3.5" +name = "corosensei" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" dependencies = [ + "autocfg 1.1.0", "cfg-if 1.0.0", + "libc", + "scopeguard", + "windows-sys 0.33.0", ] [[package]] @@ -855,25 +846,22 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62c772976416112fa4484cbd688cb6fb35fd430005c1c586224fc014018abad" +checksum = "529ffacce2249ac60edba2941672dfedf3d96558b415d0d8083cd007456e0f55" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b40ed2dd13c2ac7e24f88a3090c68ad3414eb1d066a95f8f1f7b3b819cb4e46" +checksum = "427d105f617efc8cb55f8d036a7fded2e227892d8780b4985e5551f8d27c4a92" dependencies = [ - "arrayvec", - "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", - "cranelift-egraph", "cranelift-entity", "cranelift-isle", "gimli", @@ -885,47 +873,30 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb927a8f1c27c34ee3759b6b0ffa528d2330405d5cc4511f0cab33fe2279f4b5" +checksum = "551674bed85b838d45358e3eab4f0ffaa6790c70dc08184204b9a54b41cdb7d1" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43dfa417b884a9ab488d95fd6b93b25e959321fe7bfd7a0a960ba5d7fb7ab927" - -[[package]] -name = "cranelift-egraph" -version = "0.90.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a66b39785efd8513d2cca967ede56d6cc57c8d7986a595c7c47d0c78de8dce" -dependencies = [ - "cranelift-entity", - "fxhash", - "hashbrown 0.12.3", - "indexmap", - "log", - "smallvec", -] +checksum = "2b3a63ae57498c3eb495360944a33571754241e15e47e3bcae6082f40fec5866" [[package]] name = "cranelift-entity" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0637ffde963cb5d759bc4d454cfa364b6509e6c74cdaa21298add0ed9276f346" -dependencies = [ - "serde", -] +checksum = "11aa8aa624c72cc1c94ea3d0739fa61248260b5b14d3646f51593a88d67f3e6e" [[package]] name = "cranelift-frontend" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb72b8342685e850cb037350418f62cc4fc55d6c2eb9c7ca01b82f9f1a6f3d56" +checksum = "544ee8f4d1c9559c9aa6d46e7aaeac4a13856d620561094f35527356c7d21bd0" dependencies = [ "cranelift-codegen", "log", @@ -935,36 +906,9 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.90.1" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850579cb9e4b448f7c301f1e6e6cbad99abe3f1f1d878a4994cb66e33c6db8cd" - -[[package]] -name = "cranelift-native" -version = "0.90.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a279e5bcba3e0466c734d8d8eb6bfc1ad29e95c37f3e4955b492b5616335e" -dependencies = [ - "cranelift-codegen", - "libc", - "target-lexicon", -] - -[[package]] -name = "cranelift-wasm" -version = "0.90.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b8c5e7ffb754093fb89ec4bd4f9dbb9f1c955427299e334917d284745835c2" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "itertools", - "log", - "smallvec", - "wasmparser", - "wasmtime-types", -] +checksum = "ed16b14363d929b8c37e3c557d0a7396791b383ecc302141643c054343170aad" [[package]] name = "crc" @@ -1103,8 +1047,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +dependencies = [ + "darling_core 0.14.2", + "darling_macro 0.14.2", ] [[package]] @@ -1117,7 +1071,20 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", + "syn", +] + +[[package]] +name = "darling_core" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", "syn", ] @@ -1127,7 +1094,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +dependencies = [ + "darling_core 0.14.2", "quote", "syn", ] @@ -1148,7 +1126,7 @@ dependencies = [ "chrono", "config", "fake", - "itertools", + "itertools 0.10.5", "model", "pretty_env_logger", "rand 0.8.5", @@ -1180,6 +1158,17 @@ dependencies = [ "version_check 0.1.5", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1205,13 +1194,12 @@ dependencies = [ ] [[package]] -name = "directories-next" -version = "2.0.0" +name = "dirs" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", + "dirs-sys", ] [[package]] @@ -1235,15 +1223,10 @@ dependencies = [ ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "discard" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "displaydoc" @@ -1274,7 +1257,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bf5ff6f74150b0bbb6e6057718a903b3d8f3fc7096c9190fc162ca99d3b2273" dependencies = [ - "darling", + "darling 0.13.4", "quote", "syn", ] @@ -1320,7 +1303,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -1348,6 +1331,26 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "enum-iterator" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "enum-ordinalize" version = "3.1.12" @@ -1362,6 +1365,27 @@ dependencies = [ "syn", ] +[[package]] +name = "enumset" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" +dependencies = [ + "darling 0.14.2", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.7.1" @@ -1375,40 +1399,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime 2.1.0", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -1506,13 +1496,15 @@ dependencies = [ ] [[package]] -name = "file-per-thread-logger" -version = "0.1.5" +name = "filetime" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ - "env_logger 0.9.3", - "log", + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys 0.42.0", ] [[package]] @@ -1522,7 +1514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.6.2", ] [[package]] @@ -1613,15 +1605,10 @@ dependencies = [ ] [[package]] -name = "fs-set-times" -version = "0.17.1" +name = "fs_extra" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" -dependencies = [ - "io-lifetimes 0.7.5", - "rustix 0.35.13", - "windows-sys 0.36.1", -] +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "fs_manager" @@ -1630,7 +1617,7 @@ dependencies = [ "actix", "actix-rt", "actix-web", - "bytes", + "bytes 1.3.0", "chrono", "config", "fibers_rpc", @@ -1639,7 +1626,7 @@ dependencies = [ "rumqttc", "serde", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "uuid 1.2.2", ] @@ -1767,7 +1754,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] @@ -1781,6 +1768,15 @@ dependencies = [ "byteorder", ] +[[package]] +name = "generational-arena" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601" +dependencies = [ + "cfg-if 0.1.10", +] + [[package]] name = "generic-array" version = "0.14.6" @@ -1828,6 +1824,12 @@ dependencies = [ "url", ] +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + [[package]] name = "gloo-events" version = "0.1.2" @@ -1898,11 +1900,11 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -1910,8 +1912,28 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", + "tracing", + "tracing-futures", +] + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes 1.3.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.22.0", + "tokio-util 0.7.4", "tracing", ] @@ -1921,7 +1943,7 @@ version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "756e9dfbaf90887b69ea8113ef9d04a9fec0ec4ac17b84a95006381f6f7966f9" dependencies = [ - "bytes", + "bytes 1.3.0", "fnv", "futures-core", "futures-sink", @@ -1975,6 +1997,15 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.4.0" @@ -1993,15 +2024,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - [[package]] name = "hex" version = "0.4.3" @@ -2032,9 +2054,19 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes", + "bytes 1.3.0", "fnv", - "itoa", + "itoa 1.0.4", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", ] [[package]] @@ -2043,9 +2075,9 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes", + "bytes 1.3.0", "http", - "pin-project-lite", + "pin-project-lite 0.2.9", ] [[package]] @@ -2054,6 +2086,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + [[package]] name = "httpdate" version = "1.0.2" @@ -2075,40 +2113,77 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.2.7", + "http", + "http-body 0.3.1", + "httparse", + "httpdate 0.3.2", + "itoa 0.4.8", + "pin-project", + "socket2 0.3.19", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper" version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ - "bytes", + "bytes 1.3.0", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.15", "http", - "http-body", + "http-body 0.4.5", "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", + "httpdate 1.0.2", + "itoa 1.0.4", + "pin-project-lite 0.2.9", + "socket2 0.4.7", + "tokio 1.22.0", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper 0.13.10", + "native-tls", + "tokio 0.2.25", + "tokio-tls", +] + [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes", - "hyper", + "bytes 1.3.0", + "hyper 0.14.23", "native-tls", - "tokio", + "tokio 1.22.0", "tokio-native-tls", ] @@ -2118,17 +2193,17 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b903a973bd98c326103ea94336a9ffe44c57c71517d6be7639438021053dc6e" dependencies = [ - "bytes", + "bytes 1.3.0", "futures-channel", "futures-core", "futures-util", "h2_wasi", "http", - "http-body", + "http-body 0.4.5", "httparse", - "httpdate", - "itoa", - "pin-project-lite", + "httpdate 1.0.2", + "itoa 1.0.4", + "pin-project-lite 0.2.9", "tokio_wasi", "tower-service", "tracing", @@ -2160,6 +2235,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + [[package]] name = "ident_case" version = "1.0.1" @@ -2198,6 +2279,18 @@ dependencies = [ "serde", ] +[[package]] +name = "indicatif" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + [[package]] name = "insta" version = "1.21.2" @@ -2245,36 +2338,6 @@ dependencies = [ "unic-langid", ] -[[package]] -name = "io-extras" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" -dependencies = [ - "io-lifetimes 0.7.5", - "windows-sys 0.36.1", -] - -[[package]] -name = "io-lifetimes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - [[package]] name = "iovec" version = "0.1.4" @@ -2297,15 +2360,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f84f1612606f3753f205a4e9a2efd6fe5b4c573a6269b2cc6c3003d44a0d127" [[package]] -name = "is-terminal" -version = "0.3.0" +name = "itertools" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes 0.7.5", - "rustix 0.35.13", - "windows-sys 0.36.1", + "either", ] [[package]] @@ -2317,32 +2377,18 @@ dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + [[package]] name = "itoa" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" -[[package]] -name = "ittapi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4f6ff06169ce7048dac5150b1501c7e3716a929721aeb06b87e51a43e42f4" -dependencies = [ - "anyhow", - "ittapi-sys", - "log", -] - -[[package]] -name = "ittapi-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e078cce01485f418bae3beb34dd604aaedf2065502853c7da17fbce8e64eda" -dependencies = [ - "cc", -] - [[package]] name = "jobserver" version = "0.1.25" @@ -2481,16 +2527,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] -name = "linux-raw-sys" -version = "0.0.46" +name = "llvmenv" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - -[[package]] -name = "linux-raw-sys" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "4f0a76e15802ea3f937731a680e37c3e8abfc4a36ecc3c15371f69333e424a05" +dependencies = [ + "bytes 0.5.6", + "dirs 3.0.2", + "fs_extra", + "futures 0.3.25", + "glob", + "indicatif", + "itertools 0.9.0", + "lazy_static", + "log", + "num_cpus", + "regex", + "reqwest 0.10.10", + "semver 0.11.0", + "serde", + "serde_derive", + "shellexpand", + "simplelog", + "structopt", + "tar", + "tempfile", + "thiserror", + "tokio 0.2.25", + "toml", + "url", + "which", + "xz2", +] [[package]] name = "local-channel" @@ -2529,6 +2597,17 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "mac_address" version = "1.1.4" @@ -2563,12 +2642,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-owned" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" - [[package]] name = "md-5" version = "0.10.5" @@ -2585,12 +2658,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "memfd" -version = "0.6.2" +name = "memmap2" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ - "rustix 0.36.4", + "libc", ] [[package]] @@ -2633,6 +2706,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2718,6 +2800,12 @@ dependencies = [ "validator", ] +[[package]] +name = "more-asserts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" + [[package]] name = "nanorand" version = "0.7.0" @@ -2837,19 +2925,22 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", ] +[[package]] +name = "number_prefix" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + [[package]] name = "object" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ - "crc32fast", - "hashbrown 0.12.3", - "indexmap", "memchr", ] @@ -2863,7 +2954,7 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" name = "openapi" version = "1.0.0" dependencies = [ - "reqwest", + "reqwest 0.11.13", "serde", "serde_derive", "serde_json", @@ -2902,6 +2993,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.24.0+1.1.1s" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.78" @@ -2911,6 +3011,7 @@ dependencies = [ "autocfg 1.1.0", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -2980,7 +3081,7 @@ dependencies = [ "indexmap", "js-sys", "once_cell", - "pin-project-lite", + "pin-project-lite 0.2.9", "thiserror", ] @@ -3021,7 +3122,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -3120,7 +3221,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio", + "tokio 1.22.0", ] [[package]] @@ -3129,17 +3230,6 @@ version = "0.1.0" dependencies = [ "config", "model", - "wasmtime", -] - -[[package]] -name = "payment_adapter_pay_u" -version = "0.1.0" -dependencies = [ - "pay_u", - "payment_adapter", - "wasmtime", - "wasmtime-api", ] [[package]] @@ -3152,7 +3242,10 @@ dependencies = [ "db-utils", "fake", "gumdrop", + "llvmenv", "model", + "openssl-src", + "openssl-sys", "opentelemetry 0.17.0", "opentelemetry-jaeger", "payment_adapter", @@ -3163,13 +3256,13 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", "uuid 1.2.2", - "wasmtime", - "wasmtime-wasi", + "wasmer", + "wasmer-wasi", ] [[package]] @@ -3219,7 +3312,7 @@ checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" dependencies = [ "once_cell", "pest", - "sha1", + "sha1 0.10.5", ] [[package]] @@ -3242,6 +3335,12 @@ dependencies = [ "syn", ] +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -3278,7 +3377,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", ] @@ -3291,6 +3390,36 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check 0.9.4", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check 0.9.4", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + [[package]] name = "proc-macro2" version = "1.0.47" @@ -3325,15 +3454,6 @@ dependencies = [ "trackable 0.2.24", ] -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - [[package]] name = "ptr_meta" version = "0.1.4" @@ -3354,6 +3474,17 @@ dependencies = [ "syn", ] +[[package]] +name = "pulldown-cmark" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +dependencies = [ + "bitflags", + "memchr", + "unicase", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -3582,9 +3713,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.4.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b2eab54204ea0117fe9a060537e0b07a4e72f7c7d182361ecc346cab2240e5" +checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" dependencies = [ "fxhash", "log", @@ -3618,6 +3749,18 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +[[package]] +name = "region" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" +dependencies = [ + "bitflags", + "libc", + "mach", + "winapi 0.3.9", +] + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -3636,6 +3779,41 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body 0.3.1", + "hyper 0.13.10", + "hyper-tls 0.4.3", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.9", + "serde", + "serde_urlencoded", + "tokio 0.2.25", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.7.0", +] + [[package]] name = "reqwest" version = "0.11.13" @@ -3643,15 +3821,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "base64", - "bytes", + "bytes 1.3.0", "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.15", "http", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.4.5", + "hyper 0.14.23", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -3660,18 +3838,18 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 1.22.0", "tokio-native-tls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -3681,13 +3859,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c1c0524070b75dc4a924bdaac56d5c874205497fb3132f09f3270e4efb188d" dependencies = [ "base64", - "bytes", + "bytes 1.3.0", "encoding_rs", "futures-core", "futures-util", "h2_wasi", "http", - "http-body", + "http-body 0.4.5", "hyper_wasi", "ipnet", "js-sys", @@ -3696,7 +3874,7 @@ dependencies = [ "mime", "once_cell", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "serde", "serde_json", "serde_urlencoded", @@ -3706,7 +3884,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.10.1", ] [[package]] @@ -3732,6 +3910,7 @@ checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" dependencies = [ "bytecheck", "hashbrown 0.12.3", + "indexmap", "ptr_meta", "rend", "rkyv_derive", @@ -3755,7 +3934,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1514bbc994fc9f36ab7f7ae067b3e4758c717aff7a06c4818c6787cad8b086e1" dependencies = [ - "bytes", + "bytes 1.3.0", "flume", "futures 0.3.25", "log", @@ -3763,7 +3942,7 @@ dependencies = [ "rustls-native-certs", "rustls-pemfile 0.3.0", "thiserror", - "tokio", + "tokio 1.22.0", "tokio-rustls", ] @@ -3777,7 +3956,7 @@ dependencies = [ "borsh", "bytecheck", "byteorder", - "bytes", + "bytes 1.3.0", "num-traits", "rand 0.8.5", "rkyv", @@ -3825,36 +4004,6 @@ dependencies = [ "semver 1.0.14", ] -[[package]] -name = "rustix" -version = "0.35.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 0.7.5", - "itoa", - "libc", - "linux-raw-sys 0.0.46", - "once_cell", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustix" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 1.0.3", - "libc", - "linux-raw-sys 0.1.3", - "windows-sys 0.42.0", -] - [[package]] name = "rustls" version = "0.20.7" @@ -3981,7 +4130,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -4051,7 +4200,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser", + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", ] [[package]] @@ -4066,6 +4224,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "sendgrid" version = "0.18.1" @@ -4073,7 +4240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6ba8c048dc4beab827cebc1d54f1007f5ebdfa240812ed6faa89452fd34ba0" dependencies = [ "data-encoding", - "reqwest", + "reqwest 0.11.13", "serde", "serde_json", "thiserror", @@ -4117,7 +4284,7 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "itoa", + "itoa 1.0.4", "ryu", "serde", ] @@ -4129,11 +4296,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.4", "ryu", "serde", ] +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + [[package]] name = "sha1" version = "0.10.5" @@ -4177,7 +4353,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" dependencies = [ - "dirs", + "dirs 4.0.0", ] [[package]] @@ -4195,6 +4371,17 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +[[package]] +name = "simplelog" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2736f58087298a448859961d3f4a0850b832e72619d75adc69da7993c2cd3c" +dependencies = [ + "chrono", + "log", + "termcolor", +] + [[package]] name = "simplerand" version = "1.3.0" @@ -4231,6 +4418,17 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "winapi 0.3.9", +] + [[package]] name = "socket2" version = "0.4.7" @@ -4278,7 +4476,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" dependencies = [ - "itertools", + "itertools 0.10.5", "nom 7.1.1", "unicode_categories", ] @@ -4307,11 +4505,11 @@ dependencies = [ "bitflags", "bstr", "byteorder", - "bytes", + "bytes 1.3.0", "chrono", "crc", "crossbeam-queue", - "dirs", + "dirs 4.0.0", "dotenvy", "either", "event-listener", @@ -4326,7 +4524,7 @@ dependencies = [ "hmac", "indexmap", "ipnetwork", - "itoa", + "itoa 1.0.4", "libc", "log", "mac_address", @@ -4342,7 +4540,7 @@ dependencies = [ "rustls-pemfile 1.0.1", "serde", "serde_json", - "sha1", + "sha1 0.10.5", "sha2", "smallvec", "sqlformat", @@ -4365,7 +4563,7 @@ checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" dependencies = [ "dotenvy", "either", - "heck", + "heck 0.4.0", "once_cell", "proc-macro2", "quote", @@ -4384,7 +4582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ "once_cell", - "tokio", + "tokio 1.22.0", "tokio-rustls", ] @@ -4394,12 +4592,70 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check 0.9.4", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1 0.6.1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "stock_manager" version = "0.1.0" @@ -4424,7 +4680,7 @@ dependencies = [ "tarpc", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -4441,12 +4697,42 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "strum" version = "0.24.1" @@ -4462,7 +4748,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro2", "quote", "rustversion", @@ -4487,19 +4773,14 @@ dependencies = [ ] [[package]] -name = "system-interface" -version = "0.23.0" +name = "tar" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92adbaf536f5aff6986e1e62ba36cee72b1718c5153eee08b9e728ddde3f6029" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" dependencies = [ - "atty", - "bitflags", - "cap-fs-ext", - "cap-std", - "io-lifetimes 0.7.5", - "rustix 0.35.13", - "windows-sys 0.36.1", - "winx", + "filetime", + "libc", + "xattr", ] [[package]] @@ -4525,9 +4806,9 @@ dependencies = [ "static_assertions", "tarpc-plugins", "thiserror", - "tokio", + "tokio 1.22.0", "tokio-serde", - "tokio-util", + "tokio-util 0.7.4", "tracing", "tracing-opentelemetry", ] @@ -4590,6 +4871,15 @@ dependencies = [ name = "testx" version = "0.1.0" +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + [[package]] name = "thiserror" version = "1.0.37" @@ -4652,16 +4942,31 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros 0.1.1", + "version_check 0.9.4", + "winapi 0.3.9", +] + [[package]] name = "time" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "itoa", + "itoa 1.0.4", "serde", "time-core", - "time-macros", + "time-macros 0.2.6", ] [[package]] @@ -4670,6 +4975,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + [[package]] name = "time-macros" version = "0.2.6" @@ -4679,6 +4994,19 @@ dependencies = [ "time-core", ] +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + [[package]] name = "tinystr" version = "0.7.0" @@ -4729,11 +5057,29 @@ dependencies = [ "sha2", "testx", "thiserror", - "tokio", + "tokio 1.22.0", "tracing", "uuid 1.2.2", ] +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "memchr", + "mio 0.6.23", + "num_cpus", + "pin-project-lite 0.1.12", + "slab", +] + [[package]] name = "tokio" version = "1.22.0" @@ -4741,15 +5087,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg 1.1.0", - "bytes", + "bytes 1.3.0", "libc", "memchr", "mio 0.8.5", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite", + "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2", + "socket2 0.4.7", "tokio-macros", "winapi 0.3.9", ] @@ -4772,7 +5118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio", + "tokio 1.22.0", ] [[package]] @@ -4782,7 +5128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", - "tokio", + "tokio 1.22.0", "webpki", ] @@ -4793,7 +5139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" dependencies = [ "bincode", - "bytes", + "bytes 1.3.0", "educe", "futures-core", "futures-sink", @@ -4809,8 +5155,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", - "pin-project-lite", - "tokio", + "pin-project-lite 0.2.9", + "tokio 1.22.0", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio 0.2.25", ] [[package]] @@ -4819,12 +5189,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" dependencies = [ - "bytes", + "bytes 1.3.0", "futures-core", "futures-sink", - "pin-project-lite", + "pin-project-lite 0.2.9", "slab", - "tokio", + "tokio 1.22.0", "tracing", ] @@ -4834,10 +5204,10 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4e7e921c33dc681c0b01aa4c5aa1bf619f46a7040a1565ddb1f84bc4666c1bd" dependencies = [ - "bytes", + "bytes 1.3.0", "futures-core", "futures-sink", - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio_wasi", "tracing", ] @@ -4849,13 +5219,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68e9a04f238fa1676caa7c897bf1dbe7a82269b675aca14176a028af7a2167d2" dependencies = [ "autocfg 1.1.0", - "bytes", + "bytes 1.3.0", "libc", "memchr", "mio_wasi", "num_cpus", - "pin-project-lite", - "socket2", + "pin-project-lite 0.2.9", + "socket2 0.4.7", "wasmedge_wasi_socket", "winapi 0.3.9", ] @@ -4883,7 +5253,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] @@ -4909,6 +5279,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "tracing-log" version = "0.1.3" @@ -5068,6 +5448,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + [[package]] name = "unicode_categories" version = "0.1.1" @@ -5141,6 +5527,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.1.5" @@ -5175,49 +5567,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasi-cap-std-sync" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbeebb8985a5423f36f976b2f4a0b3c6ce38d7d9a7247e1ce07aa2880e4f29b" -dependencies = [ - "anyhow", - "async-trait", - "cap-fs-ext", - "cap-rand", - "cap-std", - "cap-time-ext", - "fs-set-times", - "io-extras", - "io-lifetimes 0.7.5", - "is-terminal", - "once_cell", - "rustix 0.35.13", - "system-interface", - "tracing", - "wasi-common", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasi-common" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e2171f3783fe6600ee24ff6c58ca1b329c55e458cc1622ecc1fd0427648607" -dependencies = [ - "anyhow", - "bitflags", - "cap-rand", - "cap-std", - "io-extras", - "rustix 0.35.13", - "thiserror", - "tracing", - "wasmtime", - "wiggle", - "windows-sys 0.36.1", -] - [[package]] name = "wasm-bindgen" version = "0.2.83" @@ -5305,241 +5654,282 @@ dependencies = [ ] [[package]] -name = "wasmparser" -version = "0.93.0" +name = "wasmer" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a4460aa3e271fa180b6a5d003e728f3963fb30e3ba0fa7c9634caa06049328" +checksum = "4927f95d9f17b9a3b123c99ca9d9d45952a7df1b97826545212d9517e1c54ec3" dependencies = [ - "indexmap", -] - -[[package]] -name = "wasmtime" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18265705b1c49218776577d9f301d79ab06888c7f4a32e2ed24e68a55738ce7" -dependencies = [ - "anyhow", - "async-trait", - "bincode", + "bytes 1.3.0", "cfg-if 1.0.0", "indexmap", - "libc", - "log", - "object", - "once_cell", - "paste", - "psm", - "rayon", + "js-sys", + "more-asserts", "serde", + "serde-wasm-bindgen", "target-lexicon", - "wasmparser", - "wasmtime-cache", - "wasmtime-cranelift", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit", - "wasmtime-runtime", + "thiserror", + "wasm-bindgen", + "wasmer-compiler", + "wasmer-compiler-cranelift", + "wasmer-derive", + "wasmer-types", + "wasmer-vm", "wat", - "windows-sys 0.36.1", + "winapi 0.3.9", ] [[package]] -name = "wasmtime-api" -version = "0.4.0" +name = "wasmer-compiler" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6db9127057c8be35bf5e4dd3d124b99ffe65db4b5631e701a115e3fb4d92590" - -[[package]] -name = "wasmtime-asm-macros" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a201583f6c79b96e74dcce748fa44fb2958f474ef13c93f880ea4d3bed31ae4f" +checksum = "50749ff89787ebce029e83b77cfb1585c1eb67ff7cb34aaa7ba64ebeb2b474f2" dependencies = [ + "backtrace", "cfg-if 1.0.0", + "enum-iterator", + "enumset", + "lazy_static", + "leb128", + "memmap2", + "more-asserts", + "region", + "rustc-demangle", + "smallvec", + "thiserror", + "wasmer-types", + "wasmer-vm", + "wasmparser", + "winapi 0.3.9", ] [[package]] -name = "wasmtime-cache" -version = "3.0.1" +name = "wasmer-compiler-cranelift" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f37efc6945b08fcb634cffafc438dd299bac55a27c836954656c634d3e63c31" +checksum = "009219b2cb6e5e7f398249d16293940a21f16536f3831ce1a140e503ccab76e5" dependencies = [ - "anyhow", - "base64", - "bincode", - "directories-next", - "file-per-thread-logger", - "log", - "rustix 0.35.13", - "serde", - "sha2", - "toml", - "windows-sys 0.36.1", - "zstd", -] - -[[package]] -name = "wasmtime-cranelift" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe208297e045ea0ee6702be88772ea40f918d55fbd4163981a4699aff034b634" -dependencies = [ - "anyhow", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", "gimli", - "log", - "object", + "more-asserts", + "rayon", + "smallvec", "target-lexicon", - "thiserror", - "wasmparser", - "wasmtime-environ", + "tracing", + "wasmer-compiler", + "wasmer-types", ] [[package]] -name = "wasmtime-environ" -version = "3.0.1" +name = "wasmer-derive" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b97f7441ac780a7fa738db5b9c23c1b70ef4abccd8ad205ada5669d196ba2" +checksum = "d19406a021b637c2d46d202a96f15d7d27b2762af7aeeb2ebcb5896b329ab313" dependencies = [ - "anyhow", - "cranelift-entity", - "gimli", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "wasmer-types" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bfa18d5568dec7df1bc92023bee9adcb135a2d59288e080788add89705262b4" +dependencies = [ + "enum-iterator", + "enumset", "indexmap", - "log", - "object", - "serde", + "more-asserts", + "rkyv", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", ] [[package]] -name = "wasmtime-fiber" -version = "3.0.1" +name = "wasmer-vbus" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f54abc960b4a055ba16b942cbbd1da641e0ad44cc97a7608f3d43c069b120e" +checksum = "c49a4f8e2ff517eb63a9e04329e16f79a6f1281d438c788229bb046076622346" dependencies = [ + "thiserror", + "wasmer-vfs", +] + +[[package]] +name = "wasmer-vfs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03215f8640183464fb824a6a64fb467db8e189ef22f5ffe744533c073ce7b425" +dependencies = [ + "libc", + "thiserror", + "tracing", +] + +[[package]] +name = "wasmer-vm" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2ab5dbf2886cf842f1edfde10d8cbeb687fe2f27a5f7b23b5058bed1696441" +dependencies = [ + "backtrace", "cc", "cfg-if 1.0.0", - "rustix 0.35.13", - "wasmtime-asm-macros", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasmtime-jit" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32800cb6e29faabab7056593f70a4c00c65c75c365aaf05406933f2169d0c22f" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "gimli", - "ittapi", - "log", - "object", - "rustc-demangle", - "serde", - "target-lexicon", - "thiserror", - "wasmtime-environ", - "wasmtime-jit-debug", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe057012a0ba6cee3685af1e923d6e0a6cb9baf15fb3ffa4be3d7f712c7dec42" -dependencies = [ - "object", - "once_cell", - "rustix 0.35.13", -] - -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6bbabb309c06cc238ee91b1455b748c45f0bdcab0dda2c2db85b0a1e69fcb66" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "windows-sys 0.36.1", -] - -[[package]] -name = "wasmtime-runtime" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a23b6e138e89594c0189162e524a29e217aec8f9a4e1959a34f74c64e8d17d" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", + "corosensei", + "enum-iterator", "indexmap", + "lazy_static", "libc", - "log", "mach", - "memfd", "memoffset 0.6.5", - "paste", - "rand 0.8.5", - "rustix 0.35.13", + "more-asserts", + "region", + "scopeguard", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-fiber", - "wasmtime-jit-debug", - "windows-sys 0.36.1", + "wasmer-types", + "winapi 0.3.9", ] [[package]] -name = "wasmtime-types" -version = "3.0.1" +name = "wasmer-vnet" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ec7615fde8c79737f1345d81f0b18da83b3db929a87b4604f27c932246d1e2" +checksum = "988238083832d04de32e9c06d1ba548f9e45558d50a70ec45dae7ee1741a6f0c" dependencies = [ - "cranelift-entity", - "serde", + "bytes 1.3.0", "thiserror", - "wasmparser", + "wasmer-vfs", ] [[package]] -name = "wasmtime-wasi" -version = "3.0.1" +name = "wasmer-wasi" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca539adf155dca1407aa3656e5661bf2364b1f3ebabc7f0a8bd62629d876acfa" +checksum = "cd64af37eaa01ff9c14df0da7d5b22cbd9b013ceffb5afd02136d0d6b78b0bcd" +dependencies = [ + "bytes 1.3.0", + "cfg-if 1.0.0", + "derivative", + "generational-arena", + "getrandom", + "libc", + "thiserror", + "tracing", + "wasm-bindgen", + "wasmer", + "wasmer-vbus", + "wasmer-vfs", + "wasmer-vnet", + "wasmer-wasi-local-networking", + "wasmer-wasi-types", + "winapi 0.3.9", +] + +[[package]] +name = "wasmer-wasi-local-networking" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3cf40684789eec48efc28ede87bd284e43a298a3080653f3f78e2f5df7f28" +dependencies = [ + "bytes 1.3.0", + "tracing", + "wasmer-vfs", + "wasmer-vnet", +] + +[[package]] +name = "wasmer-wasi-types" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6299be55d7fb5e998b3e765d4918ae6741b87c8645788a5ed246895aecc4d2ce" +dependencies = [ + "byteorder", + "time 0.2.27", + "wasmer", + "wasmer-derive", + "wasmer-types", + "wasmer-wit-bindgen-gen-core", + "wasmer-wit-bindgen-gen-rust-wasm", + "wasmer-wit-bindgen-rust", + "wasmer-wit-parser", +] + +[[package]] +name = "wasmer-wit-bindgen-gen-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff8aa5be5ae5d61f5e151dc2c0e603093fe28395d2083b65ef7a3547844054fe" dependencies = [ "anyhow", - "wasi-cap-std-sync", - "wasi-common", - "wasmtime", - "wiggle", + "wasmer-wit-parser", ] [[package]] -name = "wast" -version = "35.0.2" +name = "wasmer-wit-bindgen-gen-rust" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" +checksum = "438bce7c4589842bf100cc9b312443a9b5fc6440e58ab0b8c114e460219c3c3b" dependencies = [ - "leb128", + "heck 0.3.3", + "wasmer-wit-bindgen-gen-core", ] +[[package]] +name = "wasmer-wit-bindgen-gen-rust-wasm" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "505f5168cfee591840e13e158a5c5e2f95d6df1df710839021564f36bee7bafc" +dependencies = [ + "heck 0.3.3", + "wasmer-wit-bindgen-gen-core", + "wasmer-wit-bindgen-gen-rust", +] + +[[package]] +name = "wasmer-wit-bindgen-rust" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968747f1271f74aab9b70d9c5d4921db9bd13b4ec3ba5506506e6e7dc58c918c" +dependencies = [ + "async-trait", + "bitflags", + "wasmer-wit-bindgen-rust-impl", +] + +[[package]] +name = "wasmer-wit-bindgen-rust-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd26fe00d08bd2119870b017d13413dfbd51e7750b6634d649fc7a7bbc057b85" +dependencies = [ + "proc-macro2", + "syn", + "wasmer-wit-bindgen-gen-core", + "wasmer-wit-bindgen-gen-rust-wasm", +] + +[[package]] +name = "wasmer-wit-parser" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46c9a15086be8a2eb3790613902b9d3a9a687833b17cd021de263a20378585a" +dependencies = [ + "anyhow", + "id-arena", + "pulldown-cmark", + "unicode-normalization", + "unicode-xid", +] + +[[package]] +name = "wasmparser" +version = "0.83.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" + [[package]] name = "wast" version = "50.0.0" @@ -5558,7 +5948,7 @@ version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "584aaf7a1ecf4d383bbe1a25eeab0cbb8ff96acc6796707ff65cde48f4632f15" dependencies = [ - "wast 50.0.0", + "wast", ] [[package]] @@ -5620,6 +6010,17 @@ dependencies = [ "once_cell", ] +[[package]] +name = "which" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "whoami" version = "1.2.3" @@ -5631,48 +6032,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wiggle" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da09ca5b8bb9278a2123e8c36342166b9aaa55a0dbab18b231f46d6f6ab85bc" -dependencies = [ - "anyhow", - "async-trait", - "bitflags", - "thiserror", - "tracing", - "wasmtime", - "wiggle-macro", -] - -[[package]] -name = "wiggle-generate" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5796f53b429df7d44cfdaae8f6d9cd981d82aec3516561352ca9c5e73ee185" -dependencies = [ - "anyhow", - "heck", - "proc-macro2", - "quote", - "shellexpand", - "syn", - "witx", -] - -[[package]] -name = "wiggle-macro" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b830eb7203d48942fb8bc8bb105f76e7d09c33a082d638e990e02143bb2facd" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wiggle-generate", -] - [[package]] name = "winapi" version = "0.2.8" @@ -5716,6 +6075,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" +dependencies = [ + "windows_aarch64_msvc 0.33.0", + "windows_i686_gnu 0.33.0", + "windows_i686_msvc 0.33.0", + "windows_x86_64_gnu 0.33.0", + "windows_x86_64_msvc 0.33.0", +] + [[package]] name = "windows-sys" version = "0.36.1" @@ -5750,6 +6122,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +[[package]] +name = "windows_aarch64_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -5762,6 +6140,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +[[package]] +name = "windows_i686_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" + [[package]] name = "windows_i686_gnu" version = "0.36.1" @@ -5774,6 +6158,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +[[package]] +name = "windows_i686_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" + [[package]] name = "windows_i686_msvc" version = "0.36.1" @@ -5786,6 +6176,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +[[package]] +name = "windows_x86_64_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -5804,6 +6200,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +[[package]] +name = "windows_x86_64_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -5818,34 +6220,20 @@ checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" [[package]] name = "winreg" -version = "0.10.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ "winapi 0.3.9", ] [[package]] -name = "winx" -version = "0.33.0" +name = "winreg" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "bitflags", - "io-lifetimes 0.7.5", - "windows-sys 0.36.1", -] - -[[package]] -name = "witx" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" -dependencies = [ - "anyhow", - "log", - "thiserror", - "wast 35.0.2", + "winapi 0.3.9", ] [[package]] @@ -5858,6 +6246,24 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 82a4087..8fa45b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,6 @@ members = [ "crates/fs_manager", "crates/lang_provider", "crates/payment_adapter", - "crates/payment_adapter_pay_u", # artifacts # "crates/db-seed", # "crates/api", @@ -28,6 +27,9 @@ members = [ "vendor/t_pay", "vendor/pay_u", ] +exclude = [ + "crates/payment_adapter_pay_u", +] [profile.release] lto = true diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 7c5815d..e0d438d 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -12,7 +12,6 @@ actix-web = { version = "4.0", features = [], optional = true } cookie = { version = "0.16.1", features = ["signed"], optional = true } parking_lot = { version = "0.12", features = [] } password-hash = { version = "0.4", features = ["alloc"] } -#pay_u = { path = "../../vendor/pay_u", features = ["single-client"] } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = [] } thiserror = { version = "1.0" } diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index 8e63472..f59ac48 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -510,7 +510,7 @@ impl OrderConfig { } } -#[derive(Serialize, Deserialize, Default)] +#[derive(Default, Clone, Serialize, Deserialize)] pub struct PaymentProviderConfig { pub client_id: Option, pub client_secret: Option, @@ -519,7 +519,7 @@ pub struct PaymentProviderConfig { pub custom: HashMap, } -#[derive(Serialize, Deserialize, Default)] +#[derive(Default, Clone, Serialize, Deserialize)] pub struct PaymentConfig { pub rpc_port: u16, pub rpc_bind: String, diff --git a/crates/payment_adapter/Cargo.toml b/crates/payment_adapter/Cargo.toml index 431677d..703987e 100644 --- a/crates/payment_adapter/Cargo.toml +++ b/crates/payment_adapter/Cargo.toml @@ -6,5 +6,3 @@ edition = "2021" [dependencies] config = { path = "../config", default-features = false, features = [] } model = { path = "../model" } -wasmtime = { version = "3.0.1" } -#socket2 = { version = "0.4.7", default-features = false, features = [] } diff --git a/crates/payment_adapter/src/lib.rs b/crates/payment_adapter/src/lib.rs index fa50f5b..801b3a6 100644 --- a/crates/payment_adapter/src/lib.rs +++ b/crates/payment_adapter/src/lib.rs @@ -2,7 +2,8 @@ use std::collections::HashMap; pub use config::PaymentProviderConfig; pub use model::*; -use wasmtime::WasmResults; + +pub const CONFIG_POS: u32 = 3; #[derive(Debug)] #[repr(C)] @@ -12,6 +13,7 @@ pub enum Status { } #[derive(Debug)] +#[repr(C)] pub struct Buyer { /// Required customer e-mail pub email: String, @@ -26,6 +28,7 @@ pub struct Buyer { } #[derive(Debug)] +#[repr(C)] pub struct Product { pub id: ProductId, pub name: String, @@ -34,6 +37,8 @@ pub struct Product { pub quantity: Quantity, } +#[derive(Debug)] +#[repr(C)] pub struct CreatePayment { // pub client: PayUClient, pub buyer: Buyer, diff --git a/crates/payment_adapter_pay_u/Cargo.toml b/crates/payment_adapter_pay_u/Cargo.toml index e9c609b..dee9def 100644 --- a/crates/payment_adapter_pay_u/Cargo.toml +++ b/crates/payment_adapter_pay_u/Cargo.toml @@ -7,7 +7,11 @@ edition = "2021" crate-type = ['cdylib'] [dependencies] -payment_adapter = { path = "../payment_adapter" } pay_u = { path = "../../vendor/pay_u" } -wasmtime = { version = "3.0.1" } -wasmtime-api = { version = "0.4.0" } +payment_adapter = { path = "../payment_adapter" } +#wasmer-wasi = { version = "3.0.2" } +wasmer = { version = "3.0.2", default-features = false, features = ['js', 'std', 'wasmer-compiler-llvm', 'enable-serde'] } +#wasm-bindgen = { version = "0.2.83", features = [] } +#js-sys = { version = "0.3.60", features = [] } +#web-sys = { version = "0.3.60", features = [] } +wee_alloc = { version = "0.4.5" } diff --git a/crates/payment_adapter_pay_u/src/lib.rs b/crates/payment_adapter_pay_u/src/lib.rs index 4778b6b..153e06f 100644 --- a/crates/payment_adapter_pay_u/src/lib.rs +++ b/crates/payment_adapter_pay_u/src/lib.rs @@ -1,28 +1,20 @@ -use payment_adapter::{CreatePayment, PaymentAdapter, PaymentProviderConfig, Status}; -use wasmtime::{ValType, WasmParams, WasmResults}; +use std::os::wasi::prelude::*; -#[derive(Default)] -pub struct PayUAdapter {} +use payment_adapter::{CreatePayment, Status}; +// use wasm_bindgen::prelude::*; -impl PayUAdapter { - pub fn new() -> Self { - Self::default() - } -} - -impl PaymentAdapter for PayUAdapter { - fn name() -> &'static str { - "pay_u" - } - - fn init(&mut self, config: PaymentProviderConfig) {} - - fn create_payment(&self, msg: CreatePayment) -> Status { - Status::Failure - } -} +#[global_allocator] +static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT; +// #[wasm_bindgen] #[no_mangle] -pub fn adapter() -> PayUAdapter { - PayUAdapter::new() +pub extern "C" fn name() -> String { + "pay_u".into() +} + +// #[wasm_bindgen] +#[no_mangle] +pub extern "C" fn create_payment(msg: *const CreatePayment) -> i32 { + eprintln!("{:?}", msg); + Status::Failure as i32 } diff --git a/crates/payment_manager/Cargo.toml b/crates/payment_manager/Cargo.toml index c1fcc3c..3880623 100644 --- a/crates/payment_manager/Cargo.toml +++ b/crates/payment_manager/Cargo.toml @@ -12,9 +12,14 @@ channels = { path = "../channels" } chrono = { version = "0.4", features = ["serde"] } config = { path = "../config" } db-utils = { path = "../db-utils" } +gumdrop = { version = "0.8.1", features = [] } +llvmenv = { version = "0.3.2" } model = { path = "../model", features = ["db"] } +openssl-src = { version = "111" } +openssl-sys = { version = "0.9", features = ['openssl-src'] } opentelemetry = { version = "0.17.0" } opentelemetry-jaeger = { version = "0.17.0" } +payment_adapter = { path = "../payment_adapter" } rumqttc = { version = "*" } serde = { version = "1.0.137", features = ["derive"] } sqlx = { version = "0.6.2", features = ["migrate", "runtime-actix-rustls", "all-types", "postgres"] } @@ -26,10 +31,8 @@ tracing = { version = "0.1.6" } tracing-opentelemetry = { version = "0.17.4" } tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } uuid = { version = "1.2.1", features = ["serde"] } -wasmtime = { version = "3.0.0", default-features = false, features = ['cranelift', 'parallel-compilation', 'pooling-allocator'] } -wasmtime-wasi = { version = "3.0.0" } -gumdrop = { version = "0.8.1", features = [] } -payment_adapter = { path = "../payment_adapter" } +wasmer = { version = "3", default-features = false, features = ['sys-default', 'wasmer-compiler-cranelift'] } +wasmer-wasi = { version = "3.0.2", default-features = false, features = ['host-fs', 'host-vnet'] } [dev-dependencies] fake = { version = "2.5.0" } diff --git a/crates/payment_manager/src/main.rs b/crates/payment_manager/src/main.rs index f96a2a4..63ab942 100644 --- a/crates/payment_manager/src/main.rs +++ b/crates/payment_manager/src/main.rs @@ -2,7 +2,7 @@ use std::fs::read_dir; use std::path::PathBuf; use config::{AppConfig, UpdateConfig}; -use payment_adapter::PaymentAdapter; +// use payment_adapter::{CreatePayment, PaymentAdapter, Status}; // mod actions; // mod context; @@ -30,18 +30,18 @@ async fn main() { let opts: Opts = gumdrop::parse_args_default_or_exit(); let config = config::default_load(&opts); + let payment_config = { config.lock().payment().clone() }; - let engine = wasmtime::Engine::default(); - let mut linker = wasmtime::Linker::new(&engine); - wasmtime_wasi::add_to_linker(&mut linker, |cx| cx).unwrap(); - - let wasi_ctx = wasmtime_wasi::WasiCtxBuilder::new() - .inherit_env() - .unwrap() - .inherit_stdio() - .inherit_stdio() - .build(); - let mut store = wasmtime::Store::new(&engine, wasi_ctx); + use wasmer::{Instance, Module, Store, Value}; + let imports = wasmer::imports! { + // "" => { "name" => name, "create_payment" => create_payment, } + }; + let mut store = wasmer::Store::default(); + // store.add_fuel(u64::MAX).unwrap(); + // store.data_mut().table().insert_at( + // payment_adapter::CONFIG_POS, + // Box::new(payment_config.clone()), + // ); { let adapters_path = config.lock().payment().adapters_path.clone(); @@ -53,23 +53,60 @@ async fn main() { ) }); for file in dir.filter_map(|r| r.map(|r| r.path()).ok()) { - let module = wasmtime::Module::from_file(&engine, file).unwrap(); - let instance = linker.instantiate(&mut store, &module).unwrap(); - let fnc = - match instance.get_typed_func::<(), dyn PaymentAdapter, _>(&mut store, "adapter") { - Err(e) => { - tracing::error!("{}", e); - continue; - } - Ok(fnc) => fnc, + eprintln!("{:?}", file.extension()); + if file.extension().and_then(|s| s.to_str()) != Some("wasm") { + continue; + } + // let module = wasmtime::Module::from_file(&engine, file).unwrap(); + // let instance = linker.instantiate(&mut store, &module).unwrap(); + // // let config = wasmtime::ExternRef::new(payment_config.clone()); + // + // let f = instance + // .get_typed_func::, i32, _>(&mut store, + // "create_payment") .unwrap(); + + let module = wasmer::Module::from_file(&store, file).unwrap(); + let instance = Instance::new(&mut store, &module, &imports).unwrap(); + + { + let msg = payment_adapter::CreatePayment { + buyer: payment_adapter::Buyer { + email: "email".to_string(), + phone: "phone".to_string(), + first_name: "first_name".to_string(), + last_name: "last_name".to_string(), + language: "language".to_string(), + }, + customer_ip: "customer_ip".to_string(), + currency: "currency".to_string(), + description: "description".to_string(), + cart_products: vec![], + items: Default::default(), + order_ext_id: "order_ext_id".to_string(), + notify_uri: "notify_uri".to_string(), + continue_uri: "continue_uri".to_string(), }; - let adapter = match fnc.call(&mut store, ()) { - Err(e) => { - tracing::error!("{}", e); - continue; - } - Ok(adapter) => adapter, - }; + + let create_payment = instance.exports.get_function("create_payment").unwrap(); + let ext = wasmer::ExternRef::new(&mut store, msg); + let result = create_payment.call(&mut store, &[Value::ExternRef(Some(ext))]); + eprintln!("create payment res {:?}", result) + } + // let fnc = + // match instance.get_typed_func::<(), dyn PaymentAdapter, + // _>(&mut store, "adapter") { Err(e) => { + // tracing::error!("{}", e); + // continue; + // } + // Ok(fnc) => fnc, + // }; + // let adapter = match fnc.call(&mut store, ()) { + // Err(e) => { + // tracing::error!("{}", e); + // continue; + // } + // Ok(adapter) => adapter, + // }; } }