From 3912a7571389294c39baf00a2b2453daaa38771f Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Thu, 4 Jan 2024 14:27:44 +0100 Subject: [PATCH 1/2] Bump ya-client to 0.8 & ya-client-model to 0.6 --- Cargo.lock | 275 ++++++++++++++++++----- Cargo.toml | 8 +- agent/provider/Cargo.toml | 2 +- core/activity/Cargo.toml | 4 +- core/gsb-api/Cargo.toml | 2 +- core/identity/Cargo.toml | 2 +- core/market/Cargo.toml | 2 +- core/model/Cargo.toml | 6 +- core/net/Cargo.toml | 2 +- core/payment-driver/base/Cargo.toml | 2 +- core/payment-driver/dummy/Cargo.toml | 8 +- core/payment-driver/erc20/Cargo.toml | 2 +- core/payment-driver/erc20next/Cargo.toml | 2 +- core/payment/Cargo.toml | 4 +- core/persistence/Cargo.toml | 9 +- core/serv-api/web/Cargo.toml | 2 +- core/sgx/Cargo.toml | 4 +- core/version/Cargo.toml | 2 +- core/vpn/Cargo.toml | 8 +- exe-unit/Cargo.toml | 2 +- utils/agreement-utils/Cargo.toml | 6 +- utils/manifest-utils/Cargo.toml | 2 +- utils/transfer/Cargo.toml | 11 +- 23 files changed, 278 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0427fe400..74962ac85f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -639,6 +639,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -1353,7 +1362,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg", + "autocfg 1.1.0", "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", @@ -1389,7 +1398,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg", + "autocfg 1.1.0", "cfg-if 0.1.10", "lazy_static", ] @@ -2748,7 +2757,7 @@ dependencies = [ "sha3 0.10.8", "thiserror", "url", - "ya-client-model", + "ya-client-model 0.5.0", ] [[package]] @@ -2782,7 +2791,7 @@ dependencies = [ "strum_macros 0.24.3", "tokio", "url", - "ya-client", + "ya-client 0.7.1", "ya-compile-time-utils", "ya-core-model", "ya-provider", @@ -3256,7 +3265,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg", + "autocfg 1.1.0", "hashbrown 0.12.3", "serde", ] @@ -3534,7 +3543,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "autocfg", + "autocfg 1.1.0", "scopeguard", ] @@ -3627,7 +3636,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3636,7 +3645,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3645,7 +3654,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3999,7 +4008,7 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "autocfg", + "autocfg 1.1.0", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -4065,7 +4074,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4076,7 +4085,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-integer", "num-traits", "serde", @@ -4088,7 +4097,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4127,7 +4136,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-traits", ] @@ -4137,7 +4146,7 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -4148,7 +4157,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ - "autocfg", + "autocfg 1.1.0", "libm", ] @@ -5047,6 +5056,25 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi 0.3.9", +] + [[package]] name = "rand" version = "0.7.3" @@ -5057,7 +5085,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc", + "rand_hc 0.2.0", ] [[package]] @@ -5071,6 +5099,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -5124,6 +5162,15 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -5133,6 +5180,59 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi 0.3.9", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -5887,6 +5987,17 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + [[package]] name = "serde_qs" version = "0.12.0" @@ -6258,7 +6369,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -6637,6 +6748,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" + [[package]] name = "strum" version = "0.24.1" @@ -6652,6 +6769,18 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +[[package]] +name = "strum_macros" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "strum_macros" version = "0.24.3" @@ -7415,7 +7544,7 @@ checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" dependencies = [ "bitflags 1.3.2", "chrono", - "rustc_version 0.4.0", + "rustc_version 0.2.3", ] [[package]] @@ -7945,7 +8074,7 @@ dependencies = [ "tokio", "tokio-stream", "uuid 0.8.2", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-net", "ya-persistence", @@ -7969,13 +8098,14 @@ dependencies = [ "shlex 1.1.0", "tempdir", "thiserror", - "ya-client-model", + "ya-client-model 0.6.0", ] [[package]] name = "ya-client" -version = "0.7.0" -source = "git+https://github.com/golemfactory/ya-client.git?rev=afdc1daf1f17a5128d911f8fff9d55c4f213e9af#afdc1daf1f17a5128d911f8fff9d55c4f213e9af" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b90678d1068fc53bd898b32d5990eec77fdf5b1585f59267258863e727a1b5" dependencies = [ "actix-codec", "awc", @@ -7983,23 +8113,64 @@ dependencies = [ "chrono", "envy", "futures 0.3.28", - "heck 0.4.1", + "heck 0.3.3", "hex", "log", "mime", + "rand 0.6.5", "serde", "serde_json", - "serde_qs", + "serde_qs 0.8.5", "structopt", "thiserror", "url", - "ya-client-model", + "ya-client-model 0.5.0", +] + +[[package]] +name = "ya-client" +version = "0.8.0" +source = "git+https://github.com/golemfactory/ya-client.git?rev=a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db#a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" +dependencies = [ + "actix-codec", + "awc", + "bytes 1.4.0", + "chrono", + "envy", + "futures 0.3.28", + "heck 0.4.1", + "hex", + "log", + "mime", + "serde", + "serde_json", + "serde_qs 0.12.0", + "thiserror", + "url", + "ya-client-model 0.6.0", ] [[package]] name = "ya-client-model" version = "0.5.0" -source = "git+https://github.com/golemfactory/ya-client.git?rev=afdc1daf1f17a5128d911f8fff9d55c4f213e9af#afdc1daf1f17a5128d911f8fff9d55c4f213e9af" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a4a2f46bc12b1c747495c7911a844e7dc2c879826993426d568b9b594c26a1" +dependencies = [ + "bigdecimal 0.2.2", + "chrono", + "derive_more", + "rand 0.8.5", + "serde", + "serde_json", + "strum 0.19.5", + "strum_macros 0.19.4", + "thiserror", +] + +[[package]] +name = "ya-client-model" +version = "0.6.0" +source = "git+https://github.com/golemfactory/ya-client.git?rev=a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db#a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" dependencies = [ "bigdecimal 0.2.2", "chrono", @@ -8042,7 +8213,7 @@ dependencies = [ "strum 0.24.1", "strum_macros 0.24.3", "thiserror", - "ya-client-model", + "ya-client-model 0.6.0", "ya-service-bus", ] @@ -8070,7 +8241,7 @@ dependencies = [ "serde_json", "tokio", "uuid 0.8.2", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-payment-driver", "ya-persistence", @@ -8116,7 +8287,7 @@ dependencies = [ "url", "uuid 0.8.2", "web3", - "ya-client-model", + "ya-client-model 0.6.0", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8160,7 +8331,7 @@ dependencies = [ "tokio-util", "uuid 0.8.2", "web3", - "ya-client-model", + "ya-client-model 0.6.0", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8215,7 +8386,7 @@ dependencies = [ "url", "winapi 0.3.9", "ya-agreement-utils", - "ya-client-model", + "ya-client-model 0.6.0", "ya-compile-time-utils", "ya-core-model", "ya-manifest-utils", @@ -8284,7 +8455,7 @@ dependencies = [ "thiserror", "tokio", "uuid 1.4.1", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-persistence", "ya-service-api", @@ -8324,7 +8495,7 @@ dependencies = [ "thiserror", "tokio", "uuid 0.8.2", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-persistence", "ya-sb-router", @@ -8377,7 +8548,7 @@ dependencies = [ "thiserror", "url", "ya-agreement-utils", - "ya-client-model", + "ya-client-model 0.6.0", "ya-manifest-test-utils", "ya-utils-path", ] @@ -8424,7 +8595,7 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-agreement-utils", - "ya-client", + "ya-client 0.8.0", "ya-core-model", "ya-diesel-utils", "ya-market-resolver", @@ -8507,7 +8678,7 @@ dependencies = [ "tokio-stream", "tokio-util", "url", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-relay-client", @@ -8575,8 +8746,8 @@ dependencies = [ "uint 0.7.1", "uuid 0.8.2", "ya-agreement-utils", - "ya-client", - "ya-client-model", + "ya-client 0.8.0", + "ya-client-model 0.6.0", "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", @@ -8614,7 +8785,7 @@ dependencies = [ "sha3 0.9.1", "thiserror", "tokio", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-persistence", "ya-service-bus", @@ -8638,7 +8809,7 @@ dependencies = [ "test-case 2.2.2", "thiserror", "tokio", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-service-api", "ya-service-api-interfaces", @@ -8702,8 +8873,8 @@ dependencies = [ "walkdir", "winapi 0.3.9", "ya-agreement-utils", - "ya-client", - "ya-client-model", + "ya-client 0.7.1", + "ya-client-model 0.6.0", "ya-compile-time-utils", "ya-core-model", "ya-file-logging", @@ -8772,7 +8943,7 @@ dependencies = [ "tokio-util", "url", "uuid 0.8.2", - "ya-client-model", + "ya-client-model 0.5.0", "ya-relay-proto", "ya-relay-stack 0.5.0 (git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a)", ] @@ -8985,7 +9156,7 @@ dependencies = [ "serde", "structopt", "url", - "ya-client", + "ya-client 0.8.0", "ya-core-model", "ya-identity", "ya-persistence", @@ -9026,7 +9197,7 @@ version = "0.2.0" dependencies = [ "anyhow", "graphene-sgx", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-service-bus", ] @@ -9105,7 +9276,7 @@ dependencies = [ "tokio-util", "url", "walkdir", - "ya-client-model", + "ya-client-model 0.6.0", "ya-core-model", "ya-service-bus", "ya-utils-path", @@ -9203,7 +9374,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "ya-client", + "ya-client 0.8.0", "ya-compile-time-utils", "ya-core-model", "ya-persistence", @@ -9239,8 +9410,8 @@ dependencies = [ "tokio-stream", "url", "uuid 0.8.2", - "ya-client", - "ya-client-model", + "ya-client 0.8.0", + "ya-client-model 0.6.0", "ya-core-model", "ya-net", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", @@ -9281,8 +9452,8 @@ dependencies = [ "tokio-util", "url", "ya-activity", - "ya-client", - "ya-client-model", + "ya-client 0.8.0", + "ya-client-model 0.6.0", "ya-compile-time-utils", "ya-core-model", "ya-dummy-driver", diff --git a/Cargo.toml b/Cargo.toml index 0b3b10abfe..372a79a5f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,8 +60,8 @@ ya-utils-networking = "0.2" ya-fd-metrics = { path = "utils/fd-metrics" } ya-version = "0.2" ya-vpn = "0.2" -ya-client = "0.7" -ya-client-model = "0.5" +ya-client = "0.8" +ya-client-model = "0.6" gftp = { workspace = true, optional = true } # just to enable gftp build for cargo-deb ya-provider = { version = "0.3", optional = true } # just to enable conditionally running some tests @@ -280,8 +280,8 @@ ya-sb-util = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = #ya-sb-util = { path = "../ya-service-bus/crates/util" } ## CLIENT -ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "afdc1daf1f17a5128d911f8fff9d55c4f213e9af" } -ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "afdc1daf1f17a5128d911f8fff9d55c4f213e9af" } +ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" } +ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" } ## RELAY and networking stack diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml index df7415bac8..a5b217c0c3 100644 --- a/agent/provider/Cargo.toml +++ b/agent/provider/Cargo.toml @@ -16,7 +16,7 @@ path = "src/main.rs" ya-agreement-utils = { workspace = true } ya-manifest-utils = { version = "0.2" } ya-client = { version = "0.7", features = ['cli'] } -ya-client-model = "0.5" +ya-client-model = "0.6" ya-compile-time-utils = "0.2" ya-core-model = { version = "^0.9", features = ['activity', 'payment'] } ya-file-logging = "0.1" diff --git a/core/activity/Cargo.toml b/core/activity/Cargo.toml index 9f1633af05..387f65f34a 100644 --- a/core/activity/Cargo.toml +++ b/core/activity/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] ya-core-model = { version = "0.9", features = ["activity", "market"] } -ya-client-model = { version = "0.5", features = ["sgx"] } +ya-client-model = { version = "0.6", features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" ya-service-api = "0.1" @@ -23,7 +23,7 @@ diesel_migrations = "1.4" env_logger = "0.7" futures = "0.3" hex = "0.4" -metrics="0.12" +metrics = "0.12" lazy_static = "1.4" libsqlite3-sys = { workspace = true } log = "0.4" diff --git a/core/gsb-api/Cargo.toml b/core/gsb-api/Cargo.toml index 8d1db889b9..df32d0c860 100644 --- a/core/gsb-api/Cargo.toml +++ b/core/gsb-api/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client-model = "0.5" +ya-client-model = "0.6" ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" diff --git a/core/identity/Cargo.toml b/core/identity/Cargo.toml index c78db1c600..afd523c56b 100644 --- a/core/identity/Cargo.toml +++ b/core/identity/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client-model = { version = "0.5", features = ["with-diesel"] } +ya-client-model = { version = "0.6", features = ["with-diesel"] } ya-core-model = { version = "^0.9", features = ["identity", "appkey"] } ya-persistence = "0.3" ya-service-api = "0.1" diff --git a/core/market/Cargo.toml b/core/market/Cargo.toml index 5eb13843d6..9b7cd586dc 100644 --- a/core/market/Cargo.toml +++ b/core/market/Cargo.toml @@ -11,7 +11,7 @@ bcast-singleton = [] [dependencies] ya-agreement-utils = { workspace = true } -ya-client = "0.7" +ya-client = "0.8" ya-core-model = { version = "^0.9", features = ["market", "net"] } ya-diesel-utils = { version = "0.1" } ya-market-resolver = "0.2" diff --git a/core/model/Cargo.toml b/core/model/Cargo.toml index 8d6f99ad92..a2f860f3e1 100644 --- a/core/model/Cargo.toml +++ b/core/model/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" homepage = "https://github.com/golemfactory/yagna" repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" -description="Yagna protocol messages" -keywords=["golem", "yagna"] +description = "Yagna protocol messages" +keywords = ["golem", "yagna"] [features] default = [] @@ -35,7 +35,7 @@ sgx = ['graphene-sgx'] version = [] [dependencies] -ya-client-model = "0.5" +ya-client-model = "0.6" ya-service-bus = "0.6.1" bigdecimal = { version = "0.2", features = ["serde"], optional = true } diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml index 0d51a93bab..e4f3824923 100644 --- a/core/net/Cargo.toml +++ b/core/net/Cargo.toml @@ -15,7 +15,7 @@ packet-trace-enable = [ ] [dependencies] -ya-client-model = "0.5" +ya-client-model = "0.6" ya-core-model = { version = "^0.9", features = ["net", "identity"] } ya-relay-client = { workspace = true } diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml index 25fcf53c2f..ed80dd6da0 100644 --- a/core/payment-driver/base/Cargo.toml +++ b/core/payment-driver/base/Cargo.toml @@ -29,7 +29,7 @@ thiserror = "1.0" tokio = { version = "1", features = ["macros"] } ## yagna dependencies -ya-client-model = "0.5" +ya-client-model = "0.6" ya-core-model = { version = "^0.9", features = [ "driver", "identity", diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml index 3f406fea3d..93783da312 100644 --- a/core/payment-driver/dummy/Cargo.toml +++ b/core/payment-driver/dummy/Cargo.toml @@ -8,8 +8,12 @@ edition = "2018" default = [] [dependencies] -ya-core-model = { version = "^0.9", features = ["driver", "identity", "payment"] } -ya-client-model = { version = "0.5" } +ya-core-model = { version = "^0.9", features = [ + "driver", + "identity", + "payment", +] } +ya-client-model = { version = "0.6" } ya-payment-driver = "0.3" ya-persistence = "0.3" ya-service-api-interfaces = "0.2" diff --git a/core/payment-driver/erc20/Cargo.toml b/core/payment-driver/erc20/Cargo.toml index 2f3abba888..50c1f2b861 100644 --- a/core/payment-driver/erc20/Cargo.toml +++ b/core/payment-driver/erc20/Cargo.toml @@ -43,7 +43,7 @@ url = { workspace = true } trust-dns-resolver = { workspace = true } ## yagna dependencies ya-payment-driver = "0.3" -ya-client-model = "0.5" +ya-client-model = "0.6" ya-service-api-interfaces = "0.2" ya-utils-futures = "0.2" ya-utils-networking = "0.2" diff --git a/core/payment-driver/erc20next/Cargo.toml b/core/payment-driver/erc20next/Cargo.toml index e6193c5ed7..7c73d6c172 100644 --- a/core/payment-driver/erc20next/Cargo.toml +++ b/core/payment-driver/erc20next/Cargo.toml @@ -43,7 +43,7 @@ rust_decimal = "1" ## yagna dependencies ya-payment-driver = "0.3" -ya-client-model = "0.5" +ya-client-model = "0.6" ya-service-api-interfaces = "0.2" ya-utils-futures = "0.2" ya-utils-networking = "0.2" diff --git a/core/payment/Cargo.toml b/core/payment/Cargo.toml index 45f6f590ea..e40d06a4d2 100644 --- a/core/payment/Cargo.toml +++ b/core/payment/Cargo.toml @@ -9,7 +9,7 @@ default = [] [dependencies] ya-agreement-utils = { workspace = true } -ya-client-model = { version = "0.5", features = ["with-diesel"] } +ya-client-model = { version = "0.6", features = ["with-diesel"] } ya-core-model = { version = "^0.9", features = [ "activity", "driver", @@ -58,7 +58,7 @@ humantime = "2.0.1" erc20_payment_lib = { workspace = true } [dev-dependencies] -ya-client = "0.7" +ya-client = "0.8" ya-dummy-driver = "0.3" ya-erc20-driver = "0.4" ya-erc20next-driver = "0.4" diff --git a/core/persistence/Cargo.toml b/core/persistence/Cargo.toml index 21cf823a7e..57dce85c8f 100644 --- a/core/persistence/Cargo.toml +++ b/core/persistence/Cargo.toml @@ -6,10 +6,15 @@ edition = "2018" [features] default = [] -service = ["ya-service-api", "ya-service-api-interfaces", "ya-utils-process", "structopt"] +service = [ + "ya-service-api", + "ya-service-api-interfaces", + "ya-utils-process", + "structopt", +] [dependencies] -ya-client-model = { version = "0.5", features = [ "with-diesel" ] } +ya-client-model = { version = "0.6", features = ["with-diesel"] } ya-core-model = { version = "0.9" } ya-service-api = { version = "0.1", optional = true } ya-service-api-interfaces = { version = "0.2", optional = true } diff --git a/core/serv-api/web/Cargo.toml b/core/serv-api/web/Cargo.toml index 1148c348e2..2a1424e2ca 100644 --- a/core/serv-api/web/Cargo.toml +++ b/core/serv-api/web/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client = "0.7" +ya-client = "0.8" ya-core-model = { version = "^0.9", features = ["appkey"] } ya-service-api = "0.1" ya-service-bus = "0.6.1" diff --git a/core/sgx/Cargo.toml b/core/sgx/Cargo.toml index 79f64cf9cd..63481335ab 100644 --- a/core/sgx/Cargo.toml +++ b/core/sgx/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] anyhow = "1.0" -graphene-sgx = { version = "0.3.3", features = [ "ias" ] } -ya-client-model = "0.5" +graphene-sgx = { version = "0.3.3", features = ["ias"] } +ya-client-model = "0.6" ya-core-model = { version = "^0.9", features = ["sgx"] } ya-service-bus = "0.6.1" diff --git a/core/version/Cargo.toml b/core/version/Cargo.toml index 7e4653fc4f..b177d4cc31 100644 --- a/core/version/Cargo.toml +++ b/core/version/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client = "0.7" +ya-client = "0.8" ya-compile-time-utils = "0.2" ya-core-model = { version = "^0.9", features = ["version"] } ya-persistence = "0.3" diff --git a/core/vpn/Cargo.toml b/core/vpn/Cargo.toml index e53f46653e..bb8181d457 100644 --- a/core/vpn/Cargo.toml +++ b/core/vpn/Cargo.toml @@ -6,14 +6,16 @@ edition = "2018" [dependencies] ya-core-model = { version = "^0.9", features = ["activity", "market"] } -ya-client-model = { version = "0.5", features = ["sgx"] } +ya-client-model = { version = "0.6", features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" ya-service-api-web = "0.2" ya-service-bus = "0.6.1" -ya-utils-networking = { version = "0.2", default-features = false, features = ["vpn"]} +ya-utils-networking = { version = "0.2", default-features = false, features = [ + "vpn", +] } ya-packet-trace = { git = "https://github.com/golemfactory/ya-packet-trace" } actix = "0.13" @@ -42,7 +44,7 @@ packet-trace-enable = ["ya-packet-trace/enable"] default = [] [dev-dependencies] -ya-client = "0.7" +ya-client = "0.8" actix-rt = "2.7" sha3 = "0.8.2" structopt = "0.3" diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml index 6e06cf4c76..5c9357c18e 100644 --- a/exe-unit/Cargo.toml +++ b/exe-unit/Cargo.toml @@ -38,7 +38,7 @@ winapi = { version = "0.3.8", features = ["jobapi2", "processthreadsapi"] } [dependencies] ya-agreement-utils = { workspace = true } ya-manifest-utils = { version = "0.2" } -ya-client-model = "0.5" +ya-client-model = "0.6" ya-compile-time-utils = "0.2" ya-core-model = { version = "^0.9", features = ["activity", "appkey"] } ya-runtime-api = { version = "0.7", path = "runtime-api", features = [ diff --git a/utils/agreement-utils/Cargo.toml b/utils/agreement-utils/Cargo.toml index 43e0aadabc..c519e45980 100644 --- a/utils/agreement-utils/Cargo.toml +++ b/utils/agreement-utils/Cargo.toml @@ -6,14 +6,14 @@ edition = "2018" homepage = "https://github.com/golemfactory/yagna" repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" -description="Yagna agreement utils" -keywords=["golem", "yagna"] +description = "Yagna agreement utils" +keywords = ["golem", "yagna"] [features] default = [] [dependencies] -ya-client-model = "0.5" +ya-client-model = "0.6" chrono = "0.4" regex = "1.5.4" diff --git a/utils/manifest-utils/Cargo.toml b/utils/manifest-utils/Cargo.toml index c5d584cd5e..4b08b3c87e 100644 --- a/utils/manifest-utils/Cargo.toml +++ b/utils/manifest-utils/Cargo.toml @@ -22,7 +22,7 @@ schema = ["schemars"] [dependencies] ya-agreement-utils = { workspace = true } ya-utils-path = "0.1" -ya-client-model = "0.5" +ya-client-model = "0.6" golem-certificate = "0.1.1" regex = "1.5" diff --git a/utils/transfer/Cargo.toml b/utils/transfer/Cargo.toml index 5f8ec80a2a..70cdc1ac2c 100644 --- a/utils/transfer/Cargo.toml +++ b/utils/transfer/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client-model = "0.5" +ya-client-model = "0.6" ya-core-model = { version = "^0.9" } ya-service-bus = "0.6.1" ya-utils-path = "0.1" @@ -17,7 +17,14 @@ actix-web = "4" actix-rt = "2.7" awc = { version = "3.0", features = ["openssl"] } # async-compression 0.3.8+ deprecates the "stream" module -async-compression = { version = "=0.3.7", features = ["tokio", "futures-io", "stream", "bzip2", "gzip", "xz"] } +async-compression = { version = "=0.3.7", features = [ + "tokio", + "futures-io", + "stream", + "bzip2", + "gzip", + "xz", +] } bytes = "1.0" futures = "0.3.4" globset = "0.4.5" From 8bfde92c90c8cc3c08ce71eef303b52f64360ee0 Mon Sep 17 00:00:00 2001 From: "nieznany.sprawiciel" Date: Mon, 8 Jan 2024 12:40:41 +0100 Subject: [PATCH 2/2] Update golem-certificates dependency --- Cargo.lock | 306 +++++++++----------------------------- Cargo.toml | 3 +- agent/provider/Cargo.toml | 2 +- golem_cli/Cargo.toml | 2 +- 4 files changed, 71 insertions(+), 242 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74962ac85f..cd53feb178 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -639,15 +639,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -1362,7 +1353,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", @@ -1398,7 +1389,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if 0.1.10", "lazy_static", ] @@ -2741,8 +2732,7 @@ dependencies = [ [[package]] name = "golem-certificate" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2a95278fbde2e90fdbd44ab54e2723344e7c20d7c08c837c60f9f07c2e5f51" +source = "git+https://github.com/golemfactory/golem-certificate.git?rev=f2d7514c18fc066e9cfb796090b90f5b27cfe1c6#f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" dependencies = [ "anyhow", "chrono", @@ -2757,7 +2747,7 @@ dependencies = [ "sha3 0.10.8", "thiserror", "url", - "ya-client-model 0.5.0", + "ya-client-model", ] [[package]] @@ -2791,7 +2781,7 @@ dependencies = [ "strum_macros 0.24.3", "tokio", "url", - "ya-client 0.7.1", + "ya-client", "ya-compile-time-utils", "ya-core-model", "ya-provider", @@ -3265,7 +3255,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg", "hashbrown 0.12.3", "serde", ] @@ -3543,7 +3533,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "autocfg 1.1.0", + "autocfg", "scopeguard", ] @@ -3636,7 +3626,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3645,7 +3635,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3654,7 +3644,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -4008,7 +3998,7 @@ version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "autocfg 1.1.0", + "autocfg", "bitflags 1.3.2", "cfg-if 1.0.0", "libc", @@ -4074,7 +4064,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] @@ -4085,7 +4075,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", "serde", @@ -4097,7 +4087,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] @@ -4136,7 +4126,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-traits", ] @@ -4146,7 +4136,7 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] @@ -4157,7 +4147,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ - "autocfg 1.1.0", + "autocfg", "libm", ] @@ -5056,25 +5046,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -5085,7 +5056,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] @@ -5099,16 +5070,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -5162,15 +5123,6 @@ dependencies = [ "getrandom 0.2.10", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -5180,59 +5132,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_xoshiro" version = "0.6.0" @@ -5987,17 +5886,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_qs" version = "0.12.0" @@ -6369,7 +6257,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -6748,12 +6636,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" - [[package]] name = "strum" version = "0.24.1" @@ -6769,18 +6651,6 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -[[package]] -name = "strum_macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "strum_macros" version = "0.24.3" @@ -8074,7 +7944,7 @@ dependencies = [ "tokio", "tokio-stream", "uuid 0.8.2", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-net", "ya-persistence", @@ -8098,33 +7968,7 @@ dependencies = [ "shlex 1.1.0", "tempdir", "thiserror", - "ya-client-model 0.6.0", -] - -[[package]] -name = "ya-client" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b90678d1068fc53bd898b32d5990eec77fdf5b1585f59267258863e727a1b5" -dependencies = [ - "actix-codec", - "awc", - "bytes 1.4.0", - "chrono", - "envy", - "futures 0.3.28", - "heck 0.3.3", - "hex", - "log", - "mime", - "rand 0.6.5", - "serde", - "serde_json", - "serde_qs 0.8.5", - "structopt", - "thiserror", - "url", - "ya-client-model 0.5.0", + "ya-client-model", ] [[package]] @@ -8144,27 +7988,11 @@ dependencies = [ "mime", "serde", "serde_json", - "serde_qs 0.12.0", + "serde_qs", + "structopt", "thiserror", "url", - "ya-client-model 0.6.0", -] - -[[package]] -name = "ya-client-model" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a4a2f46bc12b1c747495c7911a844e7dc2c879826993426d568b9b594c26a1" -dependencies = [ - "bigdecimal 0.2.2", - "chrono", - "derive_more", - "rand 0.8.5", - "serde", - "serde_json", - "strum 0.19.5", - "strum_macros 0.19.4", - "thiserror", + "ya-client-model", ] [[package]] @@ -8213,7 +8041,7 @@ dependencies = [ "strum 0.24.1", "strum_macros 0.24.3", "thiserror", - "ya-client-model 0.6.0", + "ya-client-model", "ya-service-bus", ] @@ -8241,7 +8069,7 @@ dependencies = [ "serde_json", "tokio", "uuid 0.8.2", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-payment-driver", "ya-persistence", @@ -8287,7 +8115,7 @@ dependencies = [ "url", "uuid 0.8.2", "web3", - "ya-client-model 0.6.0", + "ya-client-model", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8331,7 +8159,7 @@ dependencies = [ "tokio-util", "uuid 0.8.2", "web3", - "ya-client-model 0.6.0", + "ya-client-model", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8386,7 +8214,7 @@ dependencies = [ "url", "winapi 0.3.9", "ya-agreement-utils", - "ya-client-model 0.6.0", + "ya-client-model", "ya-compile-time-utils", "ya-core-model", "ya-manifest-utils", @@ -8455,7 +8283,7 @@ dependencies = [ "thiserror", "tokio", "uuid 1.4.1", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-persistence", "ya-service-api", @@ -8495,7 +8323,7 @@ dependencies = [ "thiserror", "tokio", "uuid 0.8.2", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-persistence", "ya-sb-router", @@ -8548,7 +8376,7 @@ dependencies = [ "thiserror", "url", "ya-agreement-utils", - "ya-client-model 0.6.0", + "ya-client-model", "ya-manifest-test-utils", "ya-utils-path", ] @@ -8595,7 +8423,7 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-agreement-utils", - "ya-client 0.8.0", + "ya-client", "ya-core-model", "ya-diesel-utils", "ya-market-resolver", @@ -8678,7 +8506,7 @@ dependencies = [ "tokio-stream", "tokio-util", "url", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-relay-client", @@ -8746,8 +8574,8 @@ dependencies = [ "uint 0.7.1", "uuid 0.8.2", "ya-agreement-utils", - "ya-client 0.8.0", - "ya-client-model 0.6.0", + "ya-client", + "ya-client-model", "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", @@ -8785,7 +8613,7 @@ dependencies = [ "sha3 0.9.1", "thiserror", "tokio", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-persistence", "ya-service-bus", @@ -8809,7 +8637,7 @@ dependencies = [ "test-case 2.2.2", "thiserror", "tokio", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-service-api", "ya-service-api-interfaces", @@ -8873,8 +8701,8 @@ dependencies = [ "walkdir", "winapi 0.3.9", "ya-agreement-utils", - "ya-client 0.7.1", - "ya-client-model 0.6.0", + "ya-client", + "ya-client-model", "ya-compile-time-utils", "ya-core-model", "ya-file-logging", @@ -8890,8 +8718,8 @@ dependencies = [ [[package]] name = "ya-relay-client" -version = "0.6.0" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a#785c9c4271f514d47fe18018efb9438007ae611a" +version = "0.6.1" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a#8d544dd766e14479519437d0bf4f2879e6a6de5a" dependencies = [ "anyhow", "async-trait", @@ -8915,13 +8743,13 @@ dependencies = [ "ya-packet-trace 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ya-relay-core", "ya-relay-proto", - "ya-relay-stack 0.5.0 (git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a)", + "ya-relay-stack 0.5.1", ] [[package]] name = "ya-relay-core" -version = "0.4.0" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a#785c9c4271f514d47fe18018efb9438007ae611a" +version = "0.4.1" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a#8d544dd766e14479519437d0bf4f2879e6a6de5a" dependencies = [ "anyhow", "chrono", @@ -8943,15 +8771,15 @@ dependencies = [ "tokio-util", "url", "uuid 0.8.2", - "ya-client-model 0.5.0", + "ya-client-model", "ya-relay-proto", - "ya-relay-stack 0.5.0 (git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a)", + "ya-relay-stack 0.5.1", ] [[package]] name = "ya-relay-proto" -version = "0.4.2" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a#785c9c4271f514d47fe18018efb9438007ae611a" +version = "0.4.3" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a#8d544dd766e14479519437d0bf4f2879e6a6de5a" dependencies = [ "anyhow", "bytes 1.4.0", @@ -8965,13 +8793,13 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "ya-relay-util 0.1.0 (git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a)", + "ya-relay-util 0.1.0 (git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a)", ] [[package]] name = "ya-relay-stack" version = "0.5.0" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a#785c9c4271f514d47fe18018efb9438007ae611a" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5#c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" dependencies = [ "derive_more", "futures 0.3.28", @@ -8981,17 +8809,17 @@ dependencies = [ "num-derive", "num-traits", "rand 0.8.5", - "smoltcp", "thiserror", "tokio", "tokio-stream", - "ya-relay-util 0.1.0 (git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a)", + "ya-relay-util 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ya-smoltcp", ] [[package]] name = "ya-relay-stack" -version = "0.5.0" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5#c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" +version = "0.5.1" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a#8d544dd766e14479519437d0bf4f2879e6a6de5a" dependencies = [ "derive_more", "futures 0.3.28", @@ -9001,11 +8829,11 @@ dependencies = [ "num-derive", "num-traits", "rand 0.8.5", + "smoltcp", "thiserror", "tokio", "tokio-stream", - "ya-relay-util 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ya-smoltcp", + "ya-relay-util 0.1.0 (git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a)", ] [[package]] @@ -9021,7 +8849,7 @@ dependencies = [ [[package]] name = "ya-relay-util" version = "0.1.0" -source = "git+https://github.com/golemfactory/ya-relay.git?rev=785c9c4271f514d47fe18018efb9438007ae611a#785c9c4271f514d47fe18018efb9438007ae611a" +source = "git+https://github.com/golemfactory/ya-relay.git?rev=8d544dd766e14479519437d0bf4f2879e6a6de5a#8d544dd766e14479519437d0bf4f2879e6a6de5a" dependencies = [ "bytes 1.4.0", "derive_more", @@ -9156,7 +8984,7 @@ dependencies = [ "serde", "structopt", "url", - "ya-client 0.8.0", + "ya-client", "ya-core-model", "ya-identity", "ya-persistence", @@ -9197,7 +9025,7 @@ version = "0.2.0" dependencies = [ "anyhow", "graphene-sgx", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-service-bus", ] @@ -9276,7 +9104,7 @@ dependencies = [ "tokio-util", "url", "walkdir", - "ya-client-model 0.6.0", + "ya-client-model", "ya-core-model", "ya-service-bus", "ya-utils-path", @@ -9329,7 +9157,7 @@ dependencies = [ "thiserror", "trust-dns-resolver", "url", - "ya-relay-stack 0.5.0 (git+https://github.com/golemfactory/ya-relay.git?rev=c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5)", + "ya-relay-stack 0.5.0", ] [[package]] @@ -9374,7 +9202,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "ya-client 0.8.0", + "ya-client", "ya-compile-time-utils", "ya-core-model", "ya-persistence", @@ -9410,8 +9238,8 @@ dependencies = [ "tokio-stream", "url", "uuid 0.8.2", - "ya-client 0.8.0", - "ya-client-model 0.6.0", + "ya-client", + "ya-client-model", "ya-core-model", "ya-net", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", @@ -9452,8 +9280,8 @@ dependencies = [ "tokio-util", "url", "ya-activity", - "ya-client 0.8.0", - "ya-client-model 0.6.0", + "ya-client", + "ya-client-model", "ya-compile-time-utils", "ya-core-model", "ya-dummy-driver", diff --git a/Cargo.toml b/Cargo.toml index 372a79a5f6..a49c6bc532 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -238,7 +238,7 @@ trust-dns-resolver = "0.22" derive_more = "0.99.11" ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" } -ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "785c9c4271f514d47fe18018efb9438007ae611a" } +ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "8d544dd766e14479519437d0bf4f2879e6a6de5a" } gftp = { version = "0.4.0", path = "core/gftp" } ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" } @@ -282,6 +282,7 @@ ya-sb-util = { git = "https://github.com/golemfactory/ya-service-bus.git", rev = ## CLIENT ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" } ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" } +golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" } ## RELAY and networking stack diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml index a5b217c0c3..78c15149a2 100644 --- a/agent/provider/Cargo.toml +++ b/agent/provider/Cargo.toml @@ -15,7 +15,7 @@ path = "src/main.rs" [dependencies] ya-agreement-utils = { workspace = true } ya-manifest-utils = { version = "0.2" } -ya-client = { version = "0.7", features = ['cli'] } +ya-client = { version = "0.8", features = ['cli'] } ya-client-model = "0.6" ya-compile-time-utils = "0.2" ya-core-model = { version = "^0.9", features = ['activity', 'payment'] } diff --git a/golem_cli/Cargo.toml b/golem_cli/Cargo.toml index 1fde23a1b2..63c9525804 100644 --- a/golem_cli/Cargo.toml +++ b/golem_cli/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-client = { version = "0.7", features = ['cli'] } +ya-client = { version = "0.8", features = ['cli'] } ya-compile-time-utils = "0.2" ya-core-model = { version = "^0.9", features=["payment", "version"] } ya-provider = "0.3"