From ffe68ebf332c6af3b5a3adf3aba30a66c3b12942 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 21 Aug 2024 12:32:47 +0200 Subject: [PATCH] bump ya-core-model to 0.10.0 --- Cargo.lock | 166 +++++++-------------------- Cargo.toml | 2 +- agent/provider/Cargo.toml | 2 +- core/activity/Cargo.toml | 2 +- core/gftp/Cargo.toml | 14 +-- core/gsb-api/Cargo.toml | 2 +- core/identity/Cargo.toml | 2 +- core/market/Cargo.toml | 6 +- core/metrics/Cargo.toml | 12 +- core/net/Cargo.toml | 2 +- core/payment-driver/base/Cargo.toml | 2 +- core/payment-driver/dummy/Cargo.toml | 2 +- core/payment-driver/erc20/Cargo.toml | 2 +- core/payment/Cargo.toml | 2 +- core/persistence/Cargo.toml | 2 +- core/serv-api/web/Cargo.toml | 4 +- core/sgx/Cargo.toml | 6 +- core/version/Cargo.toml | 4 +- core/vpn/Cargo.toml | 2 +- exe-unit/Cargo.toml | 4 +- golem_cli/Cargo.toml | 25 ++-- utils/transfer/Cargo.toml | 2 +- 22 files changed, 94 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14c0242fdd..51d8bf00ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2823,8 +2823,8 @@ dependencies = [ "tokio", "url", "ya-compile-time-utils", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", ] [[package]] @@ -2926,7 +2926,7 @@ dependencies = [ "url", "ya-client 0.8.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-provider", "ya-utils-path", "ya-utils-process", @@ -6896,12 +6896,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" @@ -6917,18 +6911,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" @@ -8342,14 +8324,14 @@ dependencies = [ "tokio-stream", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-net", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8417,23 +8399,6 @@ dependencies = [ "ya-client-model 0.7.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", -] - [[package]] name = "ya-client-model" version = "0.6.0" @@ -8483,28 +8448,6 @@ dependencies = [ "vergen", ] -[[package]] -name = "ya-core-model" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dddc3bccc5be20eb58baa2f1bc61d62221b28e4d307c5c4bdf363e3c3149ddaa" -dependencies = [ - "bigdecimal 0.2.2", - "bitflags 1.3.2", - "chrono", - "derive_more", - "graphene-sgx", - "log", - "serde", - "serde_bytes", - "structopt", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "ya-client-model 0.5.0", - "ya-service-bus 0.6.3", -] - [[package]] name = "ya-core-model" version = "0.10.0" @@ -8524,7 +8467,7 @@ dependencies = [ "strum_macros 0.24.3", "thiserror", "ya-client-model 0.7.0", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8552,11 +8495,11 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-payment-driver", "ya-persistence", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8597,7 +8540,7 @@ dependencies = [ "uuid 0.8.2", "web3", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8654,12 +8597,12 @@ dependencies = [ "ya-agreement-utils", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-manifest-utils", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-runtime-api", "ya-sb-router", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-std-utils", "ya-transfer", "ya-utils-networking", @@ -8722,12 +8665,12 @@ dependencies = [ "tokio", "uuid 1.8.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8763,13 +8706,13 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", "yansi", ] @@ -8867,7 +8810,7 @@ dependencies = [ "uuid 0.8.2", "ya-agreement-utils", "ya-client 0.9.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-diesel-utils", "ya-market-resolver", "ya-net", @@ -8875,7 +8818,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-std-utils", "ya-utils-actix", ] @@ -8915,10 +8858,10 @@ dependencies = [ "structopt", "tokio", "url", - "ya-core-model 0.9.0", + "ya-core-model", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8950,7 +8893,7 @@ dependencies = [ "tokio-util", "url", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-relay-client", "ya-sb-proto", @@ -8958,7 +8901,7 @@ dependencies = [ "ya-sb-util 0.4.1", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-utils-networking", ] @@ -9023,7 +8966,7 @@ dependencies = [ "ya-agreement-utils", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", "ya-metrics", @@ -9033,7 +8976,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9060,9 +9003,9 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9084,7 +9027,7 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-service-api", "ya-service-api-interfaces", "ya-utils-process", @@ -9150,7 +9093,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-file-logging", "ya-manifest-test-utils", "ya-manifest-utils", @@ -9369,12 +9312,6 @@ name = "ya-sb-util" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c525504f7ca7d13825ef10a44005663b91b4b9f3eeebd6768188884bec78a37d" -dependencies = [ - "actix", - "bitflags 1.3.2", - "futures 0.3.30", - "pin-project 0.4.30", -] [[package]] name = "ya-sb-util" @@ -9447,39 +9384,14 @@ dependencies = [ "structopt", "url", "ya-client 0.9.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-identity", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", -] - -[[package]] -name = "ya-service-bus" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f791365387355ca43c844e3709bb72e5538db1009ece21cc2ea538a2bb63722" -dependencies = [ - "actix", - "flexbuffers", - "futures 0.3.30", - "lazy_static", - "log", - "miniz_oxide 0.5.4", - "rand 0.8.5", - "semver 0.11.0", - "serde", - "thiserror", - "tokio", - "tokio-util", - "url", - "uuid 0.8.2", - "ya-packet-trace 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ya-sb-proto", - "ya-sb-util 0.4.1", + "ya-service-bus", ] [[package]] @@ -9514,8 +9426,8 @@ dependencies = [ "anyhow", "graphene-sgx", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", ] [[package]] @@ -9593,8 +9505,8 @@ dependencies = [ "url", "walkdir", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", "ya-utils-path", "zip 0.5.6", ] @@ -9693,11 +9605,11 @@ dependencies = [ "tokio", "ya-client 0.9.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9729,14 +9641,14 @@ dependencies = [ "uuid 0.8.2", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-net", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-smoltcp", "ya-utils-networking", ] @@ -9773,7 +9685,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", "ya-fd-metrics", @@ -9792,7 +9704,7 @@ dependencies = [ "ya-service-api-derive", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-sgx", "ya-test-framework", "ya-utils-futures", diff --git a/Cargo.toml b/Cargo.toml index dbbd78dd5c..d2dbfe9da3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ path = "core/serv/src/main.rs" [dependencies] ya-activity = "0.4" ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9" } +ya-core-model = { version = "0.10" } ya-dummy-driver = { version = "0.3", optional = true } ya-file-logging = "0.1" ya-gsb-api = "0.1" diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml index 0b4cd97685..05e8119b29 100644 --- a/agent/provider/Cargo.toml +++ b/agent/provider/Cargo.toml @@ -18,7 +18,7 @@ ya-manifest-utils = { version = "0.2" } ya-client = { workspace = true, features = ['cli'] } ya-client-model.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ['activity', 'payment'] } +ya-core-model = { version = "0.10", features = ['activity', 'payment'] } ya-file-logging = "0.1" ya-utils-actix = "0.2" ya-utils-cli = "0.1" diff --git a/core/activity/Cargo.toml b/core/activity/Cargo.toml index 0be65b2168..5e7dd17994 100644 --- a/core/activity/Cargo.toml +++ b/core/activity/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-core-model = { version = "0.9", features = ["activity", "market"] } +ya-core-model = { version = "0.10", features = ["activity", "market"] } ya-client-model = { workspace = true, features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" diff --git a/core/gftp/Cargo.toml b/core/gftp/Cargo.toml index 9b4508ea4e..bfa0765619 100644 --- a/core/gftp/Cargo.toml +++ b/core/gftp/Cargo.toml @@ -6,20 +6,20 @@ edition = "2018" homepage = "https://github.com/golemfactory/yagna" repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" -description="Golem File Transfer Protocol" -keywords=["golem", "yagna"] +description = "Golem File Transfer Protocol" +keywords = ["golem", "yagna"] [features] -default=[] -bin=['env_logger', 'dotenv'] +default = [] +bin = ['env_logger', 'dotenv'] [[bin]] -name="gftp" -required-features=['bin'] +name = "gftp" +required-features = ['bin'] [dependencies] ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["gftp", "identity", "net"] } +ya-core-model = { version = "0.10", features = ["gftp", "identity", "net"] } ya-service-bus = { workspace = true } actix-rt = "2.7" diff --git a/core/gsb-api/Cargo.toml b/core/gsb-api/Cargo.toml index 2746d0814d..21cd9f47fa 100644 --- a/core/gsb-api/Cargo.toml +++ b/core/gsb-api/Cargo.toml @@ -31,7 +31,7 @@ bytes = "1" tokio = { version = "1", features = ["macros"] } [dev-dependencies] -ya-core-model = { version = "^0.9", features = ["gftp"] } +ya-core-model = { version = "0.10", features = ["gftp"] } actix-test = "0.1" awc = "3" diff --git a/core/identity/Cargo.toml b/core/identity/Cargo.toml index 950b802155..d7aaf8b5a3 100644 --- a/core/identity/Cargo.toml +++ b/core/identity/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "^0.9", features = ["identity", "appkey"] } +ya-core-model = { version = "0.10", features = ["identity", "appkey"] } ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" diff --git a/core/market/Cargo.toml b/core/market/Cargo.toml index 9c1f298aff..8561881e76 100644 --- a/core/market/Cargo.toml +++ b/core/market/Cargo.toml @@ -12,7 +12,7 @@ bcast-singleton = [] [dependencies] ya-agreement-utils = { workspace = true } ya-client.workspace = true -ya-core-model = { version = "^0.9", features = ["market", "net"] } +ya-core-model = { version = "0.10", features = ["market", "net"] } ya-diesel-utils = { version = "0.1" } ya-market-resolver = "0.2" ya-net = "0.3" @@ -20,11 +20,11 @@ ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" ya-service-api-web = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } ya-std-utils = "0.1" ya-utils-actix = "0.2" parking_lot.workspace = true -tracing = { version = "0.1.40", features=["log"] } +tracing = { version = "0.1.40", features = ["log"] } bincode = "1.3.3" actix = { version = "0.13", default-features = false } diff --git a/core/metrics/Cargo.toml b/core/metrics/Cargo.toml index a059a0d554..47142e7f4c 100644 --- a/core/metrics/Cargo.toml +++ b/core/metrics/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "ya-metrics" version = "0.2.0" -description="Yagna metrics service" -keywords=["golem", "yagna", "metrics"] +description = "Yagna metrics service" +keywords = ["golem", "yagna", "metrics"] authors = ["Golem Factory "] edition = "2018" homepage = "https://github.com/golemfactory/yagna" @@ -10,10 +10,10 @@ repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" [dependencies] -ya-core-model = { version = "^0.9", features = ["identity"] } +ya-core-model = { version = "0.10", features = ["identity"] } ya-service-api = "0.1" ya-service-api-interfaces = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } awc = "3" actix-web = { version = "4", features = ["openssl"] } @@ -24,7 +24,9 @@ lazy_static = "1.4" log = "0.4" metrics = "0.16" metrics-core = "0.5.2" -metrics-runtime = { version = "0.13.1", default-features = false, features = ["observers"] } +metrics-runtime = { version = "0.13.1", default-features = false, features = [ + "observers", +] } percent-encoding = "2.1.0" structopt = "0.3" tokio = { version = "1", features = ["time", "sync"] } diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml index bad480307d..6d6c21c8b0 100644 --- a/core/net/Cargo.toml +++ b/core/net/Cargo.toml @@ -16,7 +16,7 @@ packet-trace-enable = [ [dependencies] ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = ["net", "identity"] } +ya-core-model = { version = "0.10", features = ["net", "identity"] } ya-relay-client = { workspace = true } #ya-relay-client = "0.6" diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml index 80e6c7be43..cc07eaa81d 100644 --- a/core/payment-driver/base/Cargo.toml +++ b/core/payment-driver/base/Cargo.toml @@ -30,7 +30,7 @@ tokio = { version = "1", features = ["macros"] } ## yagna dependencies ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "driver", "identity", "payment", diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml index 1cd8c995fd..766dd956ad 100644 --- a/core/payment-driver/dummy/Cargo.toml +++ b/core/payment-driver/dummy/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" default = [] [dependencies] -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "driver", "identity", "payment", diff --git a/core/payment-driver/erc20/Cargo.toml b/core/payment-driver/erc20/Cargo.toml index 55fda1513e..0c8ea58979 100644 --- a/core/payment-driver/erc20/Cargo.toml +++ b/core/payment-driver/erc20/Cargo.toml @@ -43,7 +43,7 @@ rust_decimal = "1" ## yagna dependencies ya-payment-driver = "0.3" -ya-core-model = { version = "0.9" } +ya-core-model = { version = "0.10" } ya-client-model.workspace = true ya-service-api-interfaces = "0.2" ya-utils-futures = "0.2" diff --git a/core/payment/Cargo.toml b/core/payment/Cargo.toml index 9bab963fb1..aa020edf92 100644 --- a/core/payment/Cargo.toml +++ b/core/payment/Cargo.toml @@ -10,7 +10,7 @@ default = [] [dependencies] ya-agreement-utils = { workspace = true } ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "activity", "driver", "identity", diff --git a/core/persistence/Cargo.toml b/core/persistence/Cargo.toml index 9d100343ab..232f80bfb7 100644 --- a/core/persistence/Cargo.toml +++ b/core/persistence/Cargo.toml @@ -15,7 +15,7 @@ service = [ [dependencies] ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "0.9" } +ya-core-model = { version = "0.10" } ya-service-api = { version = "0.1", optional = true } ya-service-api-interfaces = { version = "0.2", optional = true } ya-utils-process = { version = "0.2", features = ["lock"], optional = true } diff --git a/core/serv-api/web/Cargo.toml b/core/serv-api/web/Cargo.toml index aab9107955..82721b37d9 100644 --- a/core/serv-api/web/Cargo.toml +++ b/core/serv-api/web/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] ya-client.workspace = true -ya-core-model = { version = "^0.9", features = ["appkey"] } +ya-core-model = { version = "0.10", features = ["appkey"] } ya-service-api = "0.1" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } actix-cors = "0.6" actix-service = "2" diff --git a/core/sgx/Cargo.toml b/core/sgx/Cargo.toml index 605b6b99c0..f30bf5dc01 100644 --- a/core/sgx/Cargo.toml +++ b/core/sgx/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] anyhow = "1.0" graphene-sgx = { version = "0.3.3", features = ["ias"] } -ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = ["sgx"] } -ya-service-bus = { workspace = true } +ya-client-model.workspace = true +ya-core-model = { version = "0.10", features = ["sgx"] } +ya-service-bus = { workspace = true } diff --git a/core/version/Cargo.toml b/core/version/Cargo.toml index e7e908febb..6c62525b39 100644 --- a/core/version/Cargo.toml +++ b/core/version/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" [dependencies] ya-client.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["version"] } +ya-core-model = { version = "0.10", features = ["version"] } ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } actix-web = "4" anyhow = "1.0" diff --git a/core/vpn/Cargo.toml b/core/vpn/Cargo.toml index d7eb363ebb..93accdb754 100644 --- a/core/vpn/Cargo.toml +++ b/core/vpn/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-core-model = { version = "^0.9", features = ["activity", "market"] } +ya-core-model = { version = "0.10", features = ["activity", "market"] } ya-client-model = { workspace = true, features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml index d20e6fb7a7..6c049a77e3 100644 --- a/exe-unit/Cargo.toml +++ b/exe-unit/Cargo.toml @@ -38,9 +38,9 @@ winapi = { version = "0.3.8", features = ["jobapi2", "processthreadsapi"] } [dependencies] ya-agreement-utils = { workspace = true } ya-manifest-utils = { version = "0.2" } -ya-client-model.workspace = true +ya-client-model.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["activity", "appkey"] } +ya-core-model = { version = "0.10", features = ["activity", "appkey"] } ya-runtime-api = { version = "0.7", path = "runtime-api", features = [ "server", ] } diff --git a/golem_cli/Cargo.toml b/golem_cli/Cargo.toml index 2561ba785b..a65f863e30 100644 --- a/golem_cli/Cargo.toml +++ b/golem_cli/Cargo.toml @@ -8,18 +8,18 @@ edition = "2018" [dependencies] ya-client = { version = "0.8", features = ['cli'] } ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features=["payment", "version"] } +ya-core-model = { version = "0.10", features = ["payment", "version"] } ya-provider = "0.3" ya-utils-path = "0.1.0" ya-utils-process = { version = "0.2", features = ["lock"] } -actix-rt="2.7" -ansi_term="0.12.1" +actix-rt = "2.7" +ansi_term = "0.12.1" anyhow = "1.0" bigdecimal = "0.2" byte-unit = "4.0" -chrono = { version = "0.4", features=["serde"] } -crossterm="0.23" +chrono = { version = "0.4", features = ["serde"] } +crossterm = "0.23" directories = "2.0.2" dotenv = "0.15" env_logger = "0.7" @@ -29,16 +29,23 @@ log = "0.4" names = "0.10.0" prettytable-rs = "0.10.0" promptly = "0.3.0" -rustyline="6.3.0" +rustyline = "6.3.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" strip-ansi-escapes = "0.1" structopt = "0.3" strum = { workspace = true } strum_macros = "0.24" -tokio = { version = "1", features = ["process", "signal", "time", "io-util", "io-std", "macros"] } +tokio = { version = "1", features = [ + "process", + "signal", + "time", + "io-util", + "io-std", + "macros", +] } url = "2.1" [target.'cfg(target_family = "unix")'.dependencies] -libc="0.2.73" -nix="0.22.0" +libc = "0.2.73" +nix = "0.22.0" diff --git a/utils/transfer/Cargo.toml b/utils/transfer/Cargo.toml index 7fde6fdbd7..cd92860961 100644 --- a/utils/transfer/Cargo.toml +++ b/utils/transfer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] ya-client-model.workspace = true -ya-core-model = { version = "^0.9" } +ya-core-model = { version = "0.10" } ya-service-bus = { workspace = true } ya-utils-path = "0.1" gftp = { workspace = true }