From 6339b9e9f0643438169f7004838cb02eb9faeb8f Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 17:25:12 +0200 Subject: [PATCH 1/4] Update yagna dependency to include proxy logs and sha2 checksum --- Cargo.lock | 2214 ++++------------------------------------------------ Cargo.toml | 18 +- 2 files changed, 154 insertions(+), 2078 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d886696..09aee70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,14 +13,14 @@ dependencies = [ "actix_derive", "bitflags 2.5.0", "bytes 1.6.0", - "crossbeam-channel 0.5.12", + "crossbeam-channel", "futures-core", "futures-sink", "futures-task", "futures-util", "log", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "smallvec", "tokio", @@ -44,29 +44,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "actix-files" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" -dependencies = [ - "actix-http", - "actix-service", - "actix-utils", - "actix-web", - "bitflags 2.5.0", - "bytes 1.6.0", - "derive_more", - "futures-core", - "http-range", - "log", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "v_htmlescape", -] - [[package]] name = "actix-http" version = "3.6.0" @@ -77,7 +54,7 @@ dependencies = [ "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.11", + "ahash", "base64 0.21.7", "bitflags 2.5.0", "brotli", @@ -185,12 +162,10 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-openssl", - "tokio-rustls 0.23.4", "tokio-rustls 0.24.1", "tokio-util", "tracing", - "webpki-roots 0.22.6", - "webpki-roots 0.25.4", + "webpki-roots", ] [[package]] @@ -218,7 +193,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.8.11", + "ahash", "bytes 1.6.0", "bytestring", "cfg-if 1.0.0", @@ -243,24 +218,6 @@ dependencies = [ "url", ] -[[package]] -name = "actix-web-actors" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420b001bb709d8510c3e2659dae046e54509ff9528018d09c78381e765a1f9fa" -dependencies = [ - "actix", - "actix-codec", - "actix-http", - "actix-web", - "bytes 1.6.0", - "bytestring", - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - [[package]] name = "actix-web-codegen" version = "4.2.2" @@ -299,17 +256,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -347,12 +293,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - [[package]] name = "android-tzdata" version = "0.1.1" @@ -432,16 +372,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] -name = "arc-swap" -version = "0.4.8" +name = "arrayref" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" @@ -508,24 +448,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-shim" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20fdac7156779a1a30d970e838195558b4810dd06aa69e7c7461bdc518edf9b" -dependencies = [ - "crossbeam", -] - [[package]] name = "atty" version = "0.2.14" @@ -571,7 +493,6 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rand 0.8.5", - "rustls 0.20.9", "rustls 0.21.10", "serde", "serde_json", @@ -594,12 +515,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -612,12 +527,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bigdecimal" version = "0.2.2" @@ -641,41 +550,28 @@ name = "bitflags" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -dependencies = [ - "serde", -] [[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] -name = "bitvec" -version = "1.0.1" +name = "blake2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "funty", - "radium", - "tap", - "wyz", + "digest", ] [[package]] -name = "block-buffer" -version = "0.7.3" +name = "blake3" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", + "arrayref", + "arrayvec", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "digest", ] [[package]] @@ -684,79 +580,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "bollard" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" -dependencies = [ - "base64 0.21.7", - "bollard-stubs", - "bytes 1.6.0", - "futures-core", - "futures-util", - "hex", - "http 0.2.12", - "hyper 0.14.28", - "hyperlocal", - "log", - "pin-project-lite", - "serde", - "serde_derive", - "serde_json", - "serde_repr", - "serde_urlencoded", - "thiserror", - "tokio", - "tokio-util", - "url", - "winapi 0.3.9", -] - -[[package]] -name = "bollard-stubs" -version = "1.42.0-rc.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602bda35f33aeb571cef387dcd4042c643a8bf689d8aaac2cc47ea24cb7bc7e0" -dependencies = [ - "serde", - "serde_with", -] - -[[package]] -name = "borsh" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" -dependencies = [ - "once_cell", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.57", - "syn_derive", + "generic-array", ] [[package]] @@ -797,40 +621,6 @@ version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" -[[package]] -name = "byte-slice-cast" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "byteorder" version = "1.5.0" @@ -911,12 +701,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "chrono" version = "0.4.37" @@ -987,15 +771,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "cmake" version = "0.1.50" @@ -1012,10 +787,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "const-oid" -version = "0.9.6" +name = "constant_time_eq" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1059,21 +834,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" version = "1.4.0" @@ -1083,94 +843,13 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-channel" version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils 0.8.19", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", + "crossbeam-utils", ] [[package]] @@ -1179,32 +858,16 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.7", + "generic-array", "typenum", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "darling" version = "0.20.8" @@ -1240,23 +903,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "deranged" version = "0.3.11" @@ -1264,7 +910,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", ] [[package]] @@ -1286,23 +931,13 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", - "const-oid", + "block-buffer", "crypto-common", "subtle", ] @@ -1340,12 +975,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - [[package]] name = "dummy" version = "0.1.0" @@ -1358,9 +987,6 @@ name = "either" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" -dependencies = [ - "serde", -] [[package]] name = "encoding_rs" @@ -1371,18 +997,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.57", -] - [[package]] name = "env_filter" version = "0.1.0" @@ -1420,134 +1034,19 @@ dependencies = [ ] [[package]] -name = "equivalent" -version = "1.0.1" +name = "envy" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "erc20_payment_lib" -version = "0.4.1" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=6ebed672cb970ae2cbb18dbdf76a242ec3b02d03#6ebed672cb970ae2cbb18dbdf76a242ec3b02d03" -dependencies = [ - "actix", - "actix-files", - "actix-web", - "actix-web-actors", - "awc", - "chrono", - "dotenv", - "erc20_payment_lib_common", - "erc20_rpc_pool", - "fastrand", - "futures 0.3.30", - "futures-util", - "hex", - "humantime", - "lazy_static", - "log", - "metrics", - "rand 0.8.5", - "regex", - "rust_decimal", - "rustc-hex", - "secp256k1", - "serde", - "serde_json", - "sha3 0.10.8", - "sqlx", - "structopt", - "thunderdome", - "tokio", - "tokio-stream", - "toml", - "trust-dns-resolver", - "url", - "uuid 1.8.0", - "web3", -] - -[[package]] -name = "erc20_payment_lib_common" -version = "0.4.1" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=6ebed672cb970ae2cbb18dbdf76a242ec3b02d03#6ebed672cb970ae2cbb18dbdf76a242ec3b02d03" +checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965" dependencies = [ - "actix-files", - "actix-web", - "anyhow", - "awc", - "chrono", - "dotenv", - "env_logger 0.10.2", - "fastrand", - "futures 0.3.30", - "futures-util", - "hex", - "humantime", - "lazy_static", - "log", - "metrics", - "metrics-core", - "metrics-runtime", - "rand 0.8.5", - "regex", - "rust_decimal", - "rustc-hex", - "secp256k1", "serde", - "serde_json", - "sha3 0.10.8", - "sqlx", - "structopt", - "thunderdome", - "tokio", - "toml", - "trust-dns-resolver", - "url", - "uuid 1.8.0", - "web3", ] [[package]] -name = "erc20_rpc_pool" -version = "0.4.1" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=6ebed672cb970ae2cbb18dbdf76a242ec3b02d03#6ebed672cb970ae2cbb18dbdf76a242ec3b02d03" -dependencies = [ - "actix-files", - "actix-web", - "anyhow", - "awc", - "bollard", - "chrono", - "dotenv", - "env_logger 0.10.2", - "erc20_payment_lib_common", - "fastrand", - "futures 0.3.30", - "futures-util", - "hex", - "humantime", - "lazy_static", - "log", - "metrics", - "parking_lot 0.12.1", - "rand 0.8.5", - "reqwest 0.11.27", - "rust_decimal", - "rustc-hex", - "secp256k1", - "serde", - "serde_json", - "sha3 0.10.8", - "sqlx", - "structopt", - "thunderdome", - "tokio", - "toml", - "trust-dns-resolver", - "uuid 1.8.0", - "web3", -] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -1570,67 +1069,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if 1.0.0", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "ethabi" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898" -dependencies = [ - "ethereum-types", - "hex", - "once_cell", - "regex", - "serde", - "serde_json", - "sha3 0.10.8", - "thiserror", - "uint", -] - -[[package]] -name = "ethbloom" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "fastrand" version = "2.0.2" @@ -1649,24 +1087,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixed-hash" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" -dependencies = [ - "byteorder", - "rand 0.8.5", - "rustc-hex", - "static_assertions", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1720,17 +1140,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1767,12 +1176,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.1.31" @@ -1821,17 +1224,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api 0.4.11", - "parking_lot 0.12.1", -] - [[package]] name = "futures-io" version = "0.3.30" @@ -1861,12 +1253,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.30" @@ -1895,15 +1281,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1927,24 +1304,24 @@ dependencies = [ [[package]] name = "gftp" -version = "0.4.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +version = "0.4.1" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "actix-rt", "anyhow", - "digest 0.8.1", + "digest", "futures 0.3.30", "log", "rand 0.8.5", "serde", "serde_json", - "sha3 0.8.2", + "sha3", "structopt", "thiserror", "tokio", "url", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-service-bus", ] @@ -2046,62 +1423,12 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "hdrhistogram" -version = "6.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d331ebcdbca4acbefe5da8c3299b2e246f198a8294cc5163354e743398b89d" -dependencies = [ - "byteorder", - "num-traits", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes 1.6.0", - "headers-core", - "http 0.2.12", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.12", -] [[package]] name = "heck" @@ -2117,9 +1444,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -2148,24 +1472,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "home" version = "0.5.9" @@ -2175,17 +1481,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - [[package]] name = "http" version = "0.2.12" @@ -2242,12 +1537,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - [[package]] name = "httparse" version = "1.8.0" @@ -2278,9 +1567,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes 1.6.0", "futures-channel", @@ -2320,20 +1609,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.28", - "rustls 0.21.10", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -2341,7 +1616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.6.0", - "hyper 0.14.28", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -2384,23 +1659,10 @@ dependencies = [ ] [[package]] -name = "hyperlocal" -version = "0.8.0" +name = "iana-time-zone" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" -dependencies = [ - "futures-util", - "hex", - "hyper 0.14.28", - "pin-project 1.1.5", - "tokio", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2425,16 +1687,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -2445,64 +1697,12 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "impl-codec" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" -dependencies = [ - "parity-scale-codec", -] - [[package]] name = "impl-more" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" -dependencies = [ - "serde", -] - -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2511,7 +1711,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -2524,18 +1723,6 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2562,15 +1749,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -2595,21 +1773,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.30", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "keccak" version = "0.1.5" @@ -2640,9 +1803,6 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] [[package]] name = "libc" @@ -2660,12 +1820,6 @@ dependencies = [ "windows-targets 0.52.4", ] -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - [[package]] name = "libproc" version = "0.7.2" @@ -2686,17 +1840,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2726,15 +1869,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.11" @@ -2751,15 +1885,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "lzma-sys" version = "0.1.20" @@ -2771,43 +1896,12 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if 1.0.0", - "digest 0.10.7", -] - [[package]] name = "memchr" version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.6.5" @@ -2832,93 +1926,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c064b3a1ff41f4bf6c91185c8a0caeccf8a8a27e9d0f92cc54cf3dbec812f48" -[[package]] -name = "metrics-observer-json" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe930460a6c336b8f873dcfb28da3f805fd0dbadbea7beaf3042c7fb1d9fcd3" -dependencies = [ - "hdrhistogram", - "metrics-core", - "metrics-util", - "serde_json", -] - -[[package]] -name = "metrics-observer-prometheus" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfe24ad8285ef8b239232135a65f89cc5fa4690bbfaf8907f4bef38f8b08eba" -dependencies = [ - "hdrhistogram", - "metrics-core", - "metrics-util", -] - -[[package]] -name = "metrics-observer-yaml" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f66811013592560efc75d75a92d6e2f415a11b52f085e51d9fb4d1edec6335" -dependencies = [ - "hdrhistogram", - "metrics-core", - "metrics-util", - "serde_yaml 0.8.26", -] - -[[package]] -name = "metrics-runtime" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e4f69639ccc0c6b2f0612164f9817349eb25545ed1ffb5ef3e1e1c1d220b4" -dependencies = [ - "arc-swap", - "atomic-shim", - "crossbeam-utils 0.7.2", - "im", - "metrics", - "metrics-core", - "metrics-observer-json", - "metrics-observer-prometheus", - "metrics-observer-yaml", - "metrics-util", - "parking_lot 0.10.2", - "quanta", -] - -[[package]] -name = "metrics-util" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277619f040719a5a23d75724586d5601286e8fa53451cfaaca3b8c627c2c2378" -dependencies = [ - "crossbeam-epoch", - "serde", -] - [[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.5.4" @@ -2983,17 +1996,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", + "memoffset", ] [[package]] @@ -3022,23 +2025,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -3054,17 +2040,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.18" @@ -3072,7 +2047,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3100,7 +2074,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", @@ -3144,12 +2118,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "openssl" version = "0.10.64" @@ -3194,64 +2162,14 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "parity-scale-codec" -version = "3.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" -dependencies = [ - "arrayvec", - "bitvec", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", - "serde", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "3.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.3", -] - [[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "lock_api 0.4.11", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f386bb233083c799e6e642a9d73db98c24a5deeb95ffc85bf281255dffc98" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -3273,15 +2191,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -3362,29 +2271,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" +name = "pkg-config" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" @@ -3430,19 +2318,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "primitive-types" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" -dependencies = [ - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "uint", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -3450,16 +2325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -3515,7 +2381,7 @@ dependencies = [ "cfg-if 1.0.0", "cmake", "heck 0.4.1", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "multimap", @@ -3534,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -3550,44 +2416,6 @@ dependencies = [ "prost", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quanta" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21484fda3d8ad7affee37755c77a5d0da527543f0af0c7f731c14e2215645d39" -dependencies = [ - "atomic-shim", - "ctor", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.35" @@ -3597,12 +2425,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.4.6" @@ -3661,15 +2483,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "rdrand" version = "0.4.0" @@ -3679,12 +2492,6 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.3.5" @@ -3752,15 +2559,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "reqwest" version = "0.11.27" @@ -3775,8 +2573,7 @@ dependencies = [ "h2 0.3.25", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls", + "hyper 0.14.30", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -3786,7 +2583,6 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -3795,7 +2591,6 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -3803,7 +2598,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.4", "winreg 0.50.0", ] @@ -3850,31 +2644,6 @@ dependencies = [ "winreg 0.52.0", ] -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi 0.3.9", -] - [[package]] name = "ring" version = "0.17.8" @@ -3885,98 +2654,17 @@ dependencies = [ "cfg-if 1.0.0", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" -dependencies = [ - "bitvec", - "bytecheck", - "bytes 1.6.0", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid 1.8.0", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes 1.6.0", - "rustc-hex", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rust_decimal" -version = "1.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" -dependencies = [ - "arrayvec", - "borsh", - "bytes 1.6.0", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - [[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - [[package]] name = "rustc_version" version = "0.4.0" @@ -3999,18 +2687,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.10" @@ -4018,7 +2694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-webpki 0.101.7", "sct", ] @@ -4030,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.8", + "ring", "rustls-pki-types", "rustls-webpki 0.102.3", "subtle", @@ -4068,8 +2744,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -4078,9 +2754,9 @@ version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ - "ring 0.17.8", + "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -4131,32 +2807,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "secp256k1" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" -dependencies = [ - "secp256k1-sys", -] - -[[package]] -name = "secp256k1-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" -dependencies = [ - "cc", + "ring", + "untrusted", ] [[package]] @@ -4258,23 +2910,14 @@ dependencies = [ ] [[package]] -name = "serde_repr" -version = "0.1.19" +name = "serde_qs" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c" dependencies = [ + "percent-encoding", "serde", + "thiserror", ] [[package]] @@ -4289,21 +2932,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "indexmap 1.9.3", - "serde", - "serde_json", - "time 0.3.34", -] - [[package]] name = "serde_yaml" version = "0.8.26" @@ -4337,7 +2965,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -4348,20 +2976,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf" -dependencies = [ - "block-buffer 0.7.3", - "byte-tools", - "digest 0.8.1", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -4370,7 +2985,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -4393,32 +3008,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.9" @@ -4439,245 +3028,17 @@ name = "socket2" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api 0.4.11", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.1", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" -dependencies = [ - "ahash 0.8.11", - "atoi", - "byteorder", - "bytes 1.6.0", - "chrono", - "crc", - "crossbeam-queue 0.3.11", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.2.6", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" -dependencies = [ - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.5.0", - "byteorder", - "bytes 1.6.0", - "chrono", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array 0.14.7", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.5.0", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", +dependencies = [ + "libc", + "windows-sys 0.52.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "static_assertions" version = "1.1.0" @@ -4690,17 +3051,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b" -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "strsim" version = "0.8.0" @@ -4811,18 +3161,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.57", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -4850,12 +3188,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tempdir" version = "0.3.7" @@ -4955,12 +3287,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "thunderdome" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e170f93360bf9ae6fe3c31116bbf27adb1d054cedd6bc3d7857e34f2d98d0b" - [[package]] name = "time" version = "0.1.45" @@ -5003,15 +3329,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -5038,7 +3355,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -5089,17 +3406,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -5130,7 +3436,6 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", ] [[package]] @@ -5162,26 +3467,11 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.13", -] - [[package]] name = "toml_datetime" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -5191,31 +3481,7 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.2.6", "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.8", + "winnow", ] [[package]] @@ -5254,21 +3520,9 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", - "tracing-attributes", "tracing-core", ] -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -5278,52 +3532,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "trust-dns-proto" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" -dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" -dependencies = [ - "cfg-if 1.0.0", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot 0.12.1", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -5342,27 +3550,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" -[[package]] -name = "uint" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -5396,24 +3583,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "unsafe-libyaml" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5427,17 +3602,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf8parse" version = "0.2.1" @@ -5453,22 +3622,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "uuid" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "v_htmlescape" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" - [[package]] name = "vcpkg" version = "0.2.15" @@ -5538,12 +3691,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -5633,56 +3780,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web3" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5388522c899d1e1c96a4c307e3797e0f697ba7c77dd8e0e625ecba9dd0342937" -dependencies = [ - "arrayvec", - "base64 0.21.7", - "bytes 1.6.0", - "derive_more", - "ethabi", - "ethereum-types", - "futures 0.3.30", - "futures-timer", - "headers", - "hex", - "idna 0.4.0", - "jsonrpc-core", - "log", - "once_cell", - "parking_lot 0.12.1", - "pin-project 1.1.5", - "reqwest 0.11.27", - "rlp", - "secp256k1", - "serde", - "serde_json", - "tiny-keccak", - "url", -] - -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.25.4" @@ -5701,22 +3798,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", -] - -[[package]] -name = "widestring" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" - [[package]] name = "winapi" version = "0.2.8" @@ -5910,15 +3991,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.50.0" @@ -5951,15 +4023,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xattr" version = "1.3.1" @@ -5997,7 +4060,7 @@ dependencies = [ [[package]] name = "ya-agreement-utils" version = "0.6.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "chrono", "regex", @@ -6005,7 +4068,31 @@ dependencies = [ "serde_json", "serde_yaml 0.9.34+deprecated", "thiserror", - "ya-client-model 0.6.0", + "ya-client-model 0.7.0", +] + +[[package]] +name = "ya-client" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1db3f27d04b90bdd62583dee20684a6f147afdc26ebed1d4869d302d51f935" +dependencies = [ + "actix-codec", + "awc", + "bytes 1.6.0", + "chrono", + "envy", + "futures 0.3.30", + "heck 0.4.1", + "hex", + "log", + "mime", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "url", + "ya-client-model 0.7.0", ] [[package]] @@ -6027,15 +4114,16 @@ dependencies = [ [[package]] name = "ya-client-model" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe85a762be0297b9848ad0b7f1c73cb2afe778bb8eb3a952efd032792631a3e0" +checksum = "b5a2f88152c30056f988a530ae6a3ac117979efddb35c4ac8cac7e41bbe317af" dependencies = [ "bigdecimal", "chrono", "derive_more", "rand 0.8.5", "serde", + "serde_bytes", "serde_json", "strum 0.24.1", "strum_macros 0.24.3", @@ -6056,29 +4144,8 @@ dependencies = [ [[package]] name = "ya-core-model" -version = "0.9.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=891f319668add90938183d7f266790329bcb5f08#891f319668add90938183d7f266790329bcb5f08" -dependencies = [ - "chrono", - "derive_more", - "erc20_payment_lib", - "log", - "serde", - "serde_bytes", - "serde_json", - "serde_json_canonicalizer", - "structopt", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "ya-client-model 0.6.0", - "ya-service-bus", -] - -[[package]] -name = "ya-core-model" -version = "0.9.1" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +version = "0.10.0" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "chrono", "derive_more", @@ -6091,14 +4158,14 @@ dependencies = [ "strum 0.24.1", "strum_macros 0.24.3", "thiserror", - "ya-client-model 0.6.0", + "ya-client-model 0.7.0", "ya-service-bus", ] [[package]] name = "ya-counters" version = "0.2.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "actix", "actix-rt", @@ -6116,7 +4183,7 @@ dependencies = [ [[package]] name = "ya-gsb-http-proxy" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "actix", "actix-http", @@ -6140,8 +4207,8 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "ya-client-model 0.6.0", - "ya-core-model 0.9.0", + "ya-client-model 0.7.0", + "ya-core-model", "ya-counters", "ya-service-bus", ] @@ -6191,8 +4258,8 @@ dependencies = [ "tokio-stream", "tokio-util", "ya-agreement-utils 0.5.0", - "ya-client-model 0.6.0", - "ya-core-model 0.9.1", + "ya-client-model 0.7.0", + "ya-core-model", "ya-counters", "ya-gsb-http-proxy", "ya-runtime-api", @@ -6205,7 +4272,7 @@ dependencies = [ [[package]] name = "ya-runtime-api" version = "0.7.1" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "anyhow", "bytes 1.6.0", @@ -6247,7 +4314,7 @@ dependencies = [ "futures 0.3.30", "hex", "pin-project 0.4.30", - "ring 0.17.8", + "ring", "rustls 0.22.4", "sha2", ] @@ -6273,7 +4340,7 @@ dependencies = [ "tokio-rustls 0.25.0", "tokio-util", "url", - "uuid 0.8.2", + "uuid", "ya-packet-trace", "ya-sb-proto", "ya-sb-util", @@ -6282,7 +4349,7 @@ dependencies = [ [[package]] name = "ya-transfer" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "actix", "actix-http", @@ -6292,6 +4359,8 @@ dependencies = [ "async-compression", "async-trait", "awc", + "blake2", + "blake3", "bytes 1.6.0", "futures 0.3.30", "gftp", @@ -6304,7 +4373,8 @@ dependencies = [ "rand 0.8.5", "regex", "serde", - "sha3 0.8.2", + "sha2", + "sha3", "tempdir", "thiserror", "tokio", @@ -6312,8 +4382,9 @@ dependencies = [ "tokio-util", "url", "walkdir", - "ya-client-model 0.6.0", - "ya-core-model 0.9.0", + "ya-client", + "ya-client-model 0.7.0", + "ya-core-model", "ya-runtime-api", "ya-service-bus", "ya-utils-futures", @@ -6324,7 +4395,7 @@ dependencies = [ [[package]] name = "ya-utils-futures" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "futures 0.3.30", "tokio", @@ -6333,7 +4404,7 @@ dependencies = [ [[package]] name = "ya-utils-path" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "anyhow", "directories", @@ -6343,7 +4414,7 @@ dependencies = [ [[package]] name = "ya-utils-process" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-ai-rc20#df5e1046cdb9232614eec463c3f383625f0b287f" +source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" dependencies = [ "actix", "anyhow", @@ -6445,3 +4516,8 @@ dependencies = [ "cc", "pkg-config", ] + +[[patch.unused]] +name = "ya-core-model" +version = "0.10.0" +source = "git+https://github.com/golemfactory/yagna.git?rev=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" diff --git a/Cargo.toml b/Cargo.toml index a4e5bbe..845a1cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,20 +6,21 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [workspace] -members = [ +members = [ "gpu-detection", "runtimes/dummy", ] [dependencies] -ya-core-model = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20", features = ["activity", "appkey"] } -ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20" } -ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20" } +ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } +ya-core-model = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46", features = ["activity", "appkey"] } +ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } +ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } ya-service-bus = "0.7.3" -ya-client-model = "0.6.0" +ya-client-model = "0.7" ya-agreement-utils = "0.5" -ya-transfer = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20" } -ya-counters = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20" } +ya-transfer = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } +ya-counters = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } gpu-detection = { path = "gpu-detection" } actix = "0.13" @@ -42,7 +43,6 @@ flexi_logger = { version = "0.28", features = ["colors"] } regex = "1" reqwest = { version = "0.12", features = ["blocking", "json"] } async-stream = "0.3" -ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-ai-rc20" } http = "1.1" bytes = "1.5" humantime = "2.1" @@ -55,7 +55,7 @@ predicates = "3.1" test-case = "3.3" [patch.crates-io] -ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "891f319668add90938183d7f266790329bcb5f08" } +ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "pre-rel-v0.16.0-preview.ai.46" } [build-dependencies] static_vcruntime = "2.0" From 5c634ab930295fc63a9509bbcce788af551236ad Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 17:41:00 +0200 Subject: [PATCH 2/4] Fix problems with ya-process-utils --- Cargo.lock | 25 ++++++++++--------------- Cargo.toml | 14 ++++++-------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 09aee70..f145e45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1305,7 +1305,7 @@ dependencies = [ [[package]] name = "gftp" version = "0.4.1" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "actix-rt", "anyhow", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "ya-agreement-utils" version = "0.6.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "chrono", "regex", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "ya-core-model" version = "0.10.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "chrono", "derive_more", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "ya-counters" version = "0.2.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "actix", "actix-rt", @@ -4183,7 +4183,7 @@ dependencies = [ [[package]] name = "ya-gsb-http-proxy" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "actix", "actix-http", @@ -4272,7 +4272,7 @@ dependencies = [ [[package]] name = "ya-runtime-api" version = "0.7.1" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "anyhow", "bytes 1.6.0", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "ya-transfer" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "actix", "actix-http", @@ -4395,7 +4395,7 @@ dependencies = [ [[package]] name = "ya-utils-futures" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "futures 0.3.30", "tokio", @@ -4404,7 +4404,7 @@ dependencies = [ [[package]] name = "ya-utils-path" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "anyhow", "directories", @@ -4414,7 +4414,7 @@ dependencies = [ [[package]] name = "ya-utils-process" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?tag=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" +source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" dependencies = [ "actix", "anyhow", @@ -4516,8 +4516,3 @@ dependencies = [ "cc", "pkg-config", ] - -[[patch.unused]] -name = "ya-core-model" -version = "0.10.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=pre-rel-v0.16.0-preview.ai.46#44b0397208cba6bb0468caca8d7fab267991fe36" diff --git a/Cargo.toml b/Cargo.toml index 845a1cb..e689d64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,15 +12,15 @@ members = [ ] [dependencies] -ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } -ya-core-model = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46", features = ["activity", "appkey"] } -ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } -ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } +ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } +ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f", features = ["activity", "appkey"] } +ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } +ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } ya-service-bus = "0.7.3" ya-client-model = "0.7" ya-agreement-utils = "0.5" -ya-transfer = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } -ya-counters = { git = "https://github.com/golemfactory/yagna.git", tag = "pre-rel-v0.16.0-preview.ai.46" } +ya-transfer = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } +ya-counters = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } gpu-detection = { path = "gpu-detection" } actix = "0.13" @@ -54,8 +54,6 @@ assert_cmd = "2.0" predicates = "3.1" test-case = "3.3" -[patch.crates-io] -ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "pre-rel-v0.16.0-preview.ai.46" } [build-dependencies] static_vcruntime = "2.0" From 15614dbe82a7616d78f8ef7e8b4e1225cff6e4ed Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 18:07:58 +0200 Subject: [PATCH 3/4] Split clippy and formatting from real tests --- .github/workflows/fmt-clippy.yml | 49 ++++++++++++++++++++++++++++++++ .github/workflows/tests.yml | 4 --- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/fmt-clippy.yml diff --git a/.github/workflows/fmt-clippy.yml b/.github/workflows/fmt-clippy.yml new file mode 100644 index 0000000..ac2ae35 --- /dev/null +++ b/.github/workflows/fmt-clippy.yml @@ -0,0 +1,49 @@ +name: Check code integrity (lock, fmt, clippy) + +on: + push: + branches: [ "main" ] + tags: + - v* + - pre-rel-* + pull_request: + branches: [ "main" ] +env: + CARGO_TERM_COLOR: always + rust_stable: 1.76.0 + +jobs: + check_format: + name: Check formatting + runs-on: [ ubuntu-latest ] + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Install Rust ${{ env.rust_stable }} + uses: actions-rs/toolchain@v1 + with: + toolchain: ${{ env.rust_stable }} + components: rustfmt, clippy + + - name: Setup cache + uses: Swatinem/rust-cache@v2 + + - name: Check lockfile + uses: actions-rs/cargo@v1 + with: + command: tree + args: --locked + save-if: ${{ github.ref == 'refs/heads/master' }} + + - name: Check formatting + uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + + - name: Check clippy lints + uses: actions-rs/cargo@v1 + with: + command: clippy + args: --all-targets --all-features --workspace -- -D warnings diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 17382c9..2310e93 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,15 +25,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ env.rust_stable }} components: clippy, rustfmt - - uses: Swatinem/rust-cache@v2 - run: cargo tree --locked - - run: cargo fmt --all -- --check - - run: cargo clippy --all-targets --all-features --workspace -- -D warnings - run: cargo test --all-features --workspace From eccb309f2a3830f352714438f675de85268e56e5 Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Tue, 10 Sep 2024 18:24:41 +0200 Subject: [PATCH 4/4] Revision with lacking feature flag --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f145e45..952e40a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1305,7 +1305,7 @@ dependencies = [ [[package]] name = "gftp" version = "0.4.1" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "actix-rt", "anyhow", @@ -4060,7 +4060,7 @@ dependencies = [ [[package]] name = "ya-agreement-utils" version = "0.6.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "chrono", "regex", @@ -4145,7 +4145,7 @@ dependencies = [ [[package]] name = "ya-core-model" version = "0.10.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "chrono", "derive_more", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "ya-counters" version = "0.2.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "actix", "actix-rt", @@ -4183,7 +4183,7 @@ dependencies = [ [[package]] name = "ya-gsb-http-proxy" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "actix", "actix-http", @@ -4272,7 +4272,7 @@ dependencies = [ [[package]] name = "ya-runtime-api" version = "0.7.1" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "anyhow", "bytes 1.6.0", @@ -4349,7 +4349,7 @@ dependencies = [ [[package]] name = "ya-transfer" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "actix", "actix-http", @@ -4395,7 +4395,7 @@ dependencies = [ [[package]] name = "ya-utils-futures" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "futures 0.3.30", "tokio", @@ -4404,7 +4404,7 @@ dependencies = [ [[package]] name = "ya-utils-path" version = "0.1.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "anyhow", "directories", @@ -4414,7 +4414,7 @@ dependencies = [ [[package]] name = "ya-utils-process" version = "0.3.0" -source = "git+https://github.com/golemfactory/yagna.git?rev=239a359184cd428eff17dedc45cbee5e9bf6053f#239a359184cd428eff17dedc45cbee5e9bf6053f" +source = "git+https://github.com/golemfactory/yagna.git?rev=ca8082417c353862a21beff5d3a6e08441ba1e20#ca8082417c353862a21beff5d3a6e08441ba1e20" dependencies = [ "actix", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index e689d64..a50f45f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,15 +12,15 @@ members = [ ] [dependencies] -ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } -ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f", features = ["activity", "appkey"] } -ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } -ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } +ya-gsb-http-proxy = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20" } +ya-core-model = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20", features = ["activity", "appkey"] } +ya-runtime-api = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20" } +ya-utils-process = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20" } ya-service-bus = "0.7.3" ya-client-model = "0.7" ya-agreement-utils = "0.5" -ya-transfer = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } -ya-counters = { git = "https://github.com/golemfactory/yagna.git", rev = "239a359184cd428eff17dedc45cbee5e9bf6053f" } +ya-transfer = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20" } +ya-counters = { git = "https://github.com/golemfactory/yagna.git", rev = "ca8082417c353862a21beff5d3a6e08441ba1e20" } gpu-detection = { path = "gpu-detection" } actix = "0.13"