From 9c7cdf4f8b659e4a0a9ef56ccd99d7ecaa4adfd5 Mon Sep 17 00:00:00 2001
From: Kamil Koczurek <koczurekk@gmail.com>
Date: Thu, 22 Aug 2024 15:22:58 +0200
Subject: [PATCH 1/8] bump ya-client

---
 Cargo.lock | 38 +++++++++++++++++++++-----------------
 Cargo.toml | 10 +++++++---
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69fe9a0d9..2ca29c98f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1144,6 +1144,9 @@ name = "bytesize"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bytestring"
@@ -1684,12 +1687,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core 0.20.9",
- "darling_macro 0.20.9",
+ "darling_core 0.20.10",
+ "darling_macro 0.20.10",
 ]
 
 [[package]]
@@ -1708,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
@@ -1733,11 +1736,11 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core 0.20.9",
+ "darling_core 0.20.10",
  "quote",
  "syn 2.0.60",
 ]
@@ -6442,9 +6445,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -6460,11 +6463,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
- "darling 0.20.9",
+ "darling 0.20.10",
  "proc-macro2",
  "quote",
  "syn 2.0.60",
@@ -8757,7 +8760,7 @@ dependencies = [
 [[package]]
 name = "ya-client"
 version = "0.8.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=a2fa0d54fe47a013add90b7ae687afe4f08ce7a2#a2fa0d54fe47a013add90b7ae687afe4f08ce7a2"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43#aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43"
 dependencies = [
  "actix-codec",
  "awc",
@@ -8781,9 +8784,10 @@ dependencies = [
 [[package]]
 name = "ya-client-model"
 version = "0.6.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=a2fa0d54fe47a013add90b7ae687afe4f08ce7a2#a2fa0d54fe47a013add90b7ae687afe4f08ce7a2"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43#aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43"
 dependencies = [
  "bigdecimal 0.2.2",
+ "bytesize",
  "chrono",
  "derive_more",
  "diesel",
@@ -8794,7 +8798,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "thiserror",
diff --git a/Cargo.toml b/Cargo.toml
index d0a44fd20..cee42dda9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,11 @@ static-openssl = ["openssl/vendored", "openssl-probe"]
 dummy-driver = ['ya-dummy-driver']
 erc20-driver = ['ya-erc20-driver']
 tos = []
-framework-test = ['ya-exe-unit/framework-test', 'ya-payment/framework-test', 'ya-identity/framework-test']
+framework-test = [
+    'ya-exe-unit/framework-test',
+    'ya-payment/framework-test',
+    'ya-identity/framework-test',
+]
 # Temporary to make goth integration tests work
 central-net = ['ya-net/central-net']
 packet-trace-enable = [
@@ -287,9 +291,9 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
 ya-service-api-web = { path = "core/serv-api/web" }
 
 ## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "a2fa0d54fe47a013add90b7ae687afe4f08ce7a2" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "a2fa0d54fe47a013add90b7ae687afe4f08ce7a2" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43" }
 #ya-client-model = { path = "../ya-client/model" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 

From 1c1f3401f8be32433fa2c4bc06f597d469967799 Mon Sep 17 00:00:00 2001
From: Kamil Koczurek <koczurekk@gmail.com>
Date: Thu, 22 Aug 2024 15:41:18 +0200
Subject: [PATCH 2/8] exe-unit: forward volumes to ya-runtime-vm

---
 exe-unit/src/lib.rs             |  2 +-
 exe-unit/src/manifest.rs        |  1 +
 exe-unit/src/runtime/process.rs | 20 +++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/exe-unit/src/lib.rs b/exe-unit/src/lib.rs
index 90c63adff..3bd6218c3 100644
--- a/exe-unit/src/lib.rs
+++ b/exe-unit/src/lib.rs
@@ -311,7 +311,7 @@ impl<R: Runtime> RuntimeRef<R> {
                 };
                 transfer_service.send(msg).await??;
             }
-            ExeScriptCommand::Deploy { net, hosts } => {
+            ExeScriptCommand::Deploy { net, hosts, .. } => {
                 // TODO: We should pass `task_package` here not in `TransferService` initialization.
                 let task_package = transfer_service
                     .send(DeployImage { task_package: None })
diff --git a/exe-unit/src/manifest.rs b/exe-unit/src/manifest.rs
index 300bcd4e5..49826f9cd 100644
--- a/exe-unit/src/manifest.rs
+++ b/exe-unit/src/manifest.rs
@@ -503,6 +503,7 @@ mod tests {
             ExeScriptCommand::Deploy {
                 net: Default::default(),
                 hosts: Default::default(),
+                volumes: Default::default(),
             },
             ExeScriptCommand::Start {
                 args: Default::default(),
diff --git a/exe-unit/src/runtime/process.rs b/exe-unit/src/runtime/process.rs
index 7c0fd1c9f..1c6354919 100644
--- a/exe-unit/src/runtime/process.rs
+++ b/exe-unit/src/runtime/process.rs
@@ -12,6 +12,7 @@ use futures::{FutureExt, TryFutureExt};
 use tokio::process::Command;
 
 use ya_agreement_utils::agreement::OfferTemplate;
+use ya_client_model::activity::exe_script_command::{VolumeInfo, Volumes};
 use ya_client_model::activity::{CommandOutput, ExeScriptCommand};
 use ya_manifest_utils::Feature;
 use ya_runtime_api::server::{spawn, RunProcess, RuntimeControl, RuntimeService};
@@ -205,7 +206,24 @@ impl RuntimeProcess {
 
         let (cmd, ctx) = cmd.split();
         match cmd {
-            ExeScriptCommand::Deploy { .. } => rt_args.args(["deploy", "--"]),
+            ExeScriptCommand::Deploy { volumes, .. } => {
+                if let Some(volumes) = volumes {
+                    let volumes_cannonical = match volumes {
+                        Volumes::Simple(paths) => paths
+                            .into_iter()
+                            .map(|path| (path, VolumeInfo::Override {}))
+                            .collect(),
+                        Volumes::Detailed { volumes } => volumes,
+                    };
+
+                    let vol_override_json = serde_json::to_string(&volumes_cannonical)
+                        .expect("failed to serialize volume info");
+
+                    rt_args.arg("--volume-override");
+                    rt_args.arg(vol_override_json);
+                }
+                rt_args.args(["deploy", "--"])
+            }
             ExeScriptCommand::Start { args } => rt_args.args(["start", "--"]).args(args),
             ExeScriptCommand::Run {
                 entry_point, args, ..

From 4327888a237a1d86926cdef19b4739df0df6f5fc Mon Sep 17 00:00:00 2001
From: Kamil Koczurek <koczurekk@gmail.com>
Date: Tue, 27 Aug 2024 13:22:38 +0200
Subject: [PATCH 3/8] bump ya-client

---
 Cargo.lock | 4 ++--
 Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ca29c98f..99231d3d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8760,7 +8760,7 @@ dependencies = [
 [[package]]
 name = "ya-client"
 version = "0.8.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43#aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=8d1a7e549b9febeda20008215e08bea5e8375751#8d1a7e549b9febeda20008215e08bea5e8375751"
 dependencies = [
  "actix-codec",
  "awc",
@@ -8784,7 +8784,7 @@ dependencies = [
 [[package]]
 name = "ya-client-model"
 version = "0.6.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43#aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=8d1a7e549b9febeda20008215e08bea5e8375751#8d1a7e549b9febeda20008215e08bea5e8375751"
 dependencies = [
  "bigdecimal 0.2.2",
  "bytesize",
diff --git a/Cargo.toml b/Cargo.toml
index cee42dda9..7b1b2ce50 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -291,9 +291,9 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
 ya-service-api-web = { path = "core/serv-api/web" }
 
 ## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "8d1a7e549b9febeda20008215e08bea5e8375751" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "aaed04e3c85d3091dbea9ce9a1cc7b3821f56c43" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "8d1a7e549b9febeda20008215e08bea5e8375751" }
 #ya-client-model = { path = "../ya-client/model" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 

From d2ca45fda884893581cb710024096aac6e8262f9 Mon Sep 17 00:00:00 2001
From: Kamil Koczurek <koczurekk@gmail.com>
Date: Tue, 3 Sep 2024 21:15:15 +0200
Subject: [PATCH 4/8] Update ya-client

---
 Cargo.lock                       |  4 ++--
 Cargo.toml                       |  4 ++--
 core/payment/src/api/payments.rs | 11 ++++-------
 exe-unit/src/runtime/process.rs  | 11 +----------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99231d3d0..b971fc92a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8760,7 +8760,7 @@ dependencies = [
 [[package]]
 name = "ya-client"
 version = "0.8.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=8d1a7e549b9febeda20008215e08bea5e8375751#8d1a7e549b9febeda20008215e08bea5e8375751"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=44746845a559d40faa2a81d41c6f663d38361286#44746845a559d40faa2a81d41c6f663d38361286"
 dependencies = [
  "actix-codec",
  "awc",
@@ -8784,7 +8784,7 @@ dependencies = [
 [[package]]
 name = "ya-client-model"
 version = "0.6.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=8d1a7e549b9febeda20008215e08bea5e8375751#8d1a7e549b9febeda20008215e08bea5e8375751"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=44746845a559d40faa2a81d41c6f663d38361286#44746845a559d40faa2a81d41c6f663d38361286"
 dependencies = [
  "bigdecimal 0.2.2",
  "bytesize",
diff --git a/Cargo.toml b/Cargo.toml
index 7b1b2ce50..62ea66072 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -291,9 +291,9 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
 ya-service-api-web = { path = "core/serv-api/web" }
 
 ## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "8d1a7e549b9febeda20008215e08bea5e8375751" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "44746845a559d40faa2a81d41c6f663d38361286" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "8d1a7e549b9febeda20008215e08bea5e8375751" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "44746845a559d40faa2a81d41c6f663d38361286" }
 #ya-client-model = { path = "../ya-client/model" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 
diff --git a/core/payment/src/api/payments.rs b/core/payment/src/api/payments.rs
index 511311421..38597413c 100644
--- a/core/payment/src/api/payments.rs
+++ b/core/payment/src/api/payments.rs
@@ -30,11 +30,8 @@ async fn get_payments(
     id: Identity,
 ) -> HttpResponse {
     let node_id = id.identity;
-    let timeout_secs = query
-        .event_params
-        .timeout
-        .unwrap_or(params::DEFAULT_EVENT_TIMEOUT);
-    let after_timestamp = query.event_params.after_timestamp.map(|d| d.naive_utc());
+    let timeout_secs = query.timeout.unwrap_or(params::DEFAULT_EVENT_TIMEOUT);
+    let after_timestamp = query.after_timestamp.map(|d| d.naive_utc());
     let network = match query
         .network
         .as_ref()
@@ -53,8 +50,8 @@ async fn get_payments(
         Ok(driver) => driver,
         Err(e) => return response::server_error(&e),
     };
-    let max_events = query.event_params.max_events;
-    let app_session_id = &query.event_params.app_session_id;
+    let max_events = query.max_events;
+    let app_session_id = &query.app_session_id;
 
     let dao: PaymentDao = db.as_dao();
     let getter = || async {
diff --git a/exe-unit/src/runtime/process.rs b/exe-unit/src/runtime/process.rs
index 1c6354919..773f9cf50 100644
--- a/exe-unit/src/runtime/process.rs
+++ b/exe-unit/src/runtime/process.rs
@@ -12,7 +12,6 @@ use futures::{FutureExt, TryFutureExt};
 use tokio::process::Command;
 
 use ya_agreement_utils::agreement::OfferTemplate;
-use ya_client_model::activity::exe_script_command::{VolumeInfo, Volumes};
 use ya_client_model::activity::{CommandOutput, ExeScriptCommand};
 use ya_manifest_utils::Feature;
 use ya_runtime_api::server::{spawn, RunProcess, RuntimeControl, RuntimeService};
@@ -208,15 +207,7 @@ impl RuntimeProcess {
         match cmd {
             ExeScriptCommand::Deploy { volumes, .. } => {
                 if let Some(volumes) = volumes {
-                    let volumes_cannonical = match volumes {
-                        Volumes::Simple(paths) => paths
-                            .into_iter()
-                            .map(|path| (path, VolumeInfo::Override {}))
-                            .collect(),
-                        Volumes::Detailed { volumes } => volumes,
-                    };
-
-                    let vol_override_json = serde_json::to_string(&volumes_cannonical)
+                    let vol_override_json = serde_json::to_string(&volumes.as_volumes())
                         .expect("failed to serialize volume info");
 
                     rt_args.arg("--volume-override");

From a0a1f0287b25057f9225e5ba40a4c304e4df9f24 Mon Sep 17 00:00:00 2001
From: Kamil Koczurek <koczurekk@gmail.com>
Date: Wed, 4 Sep 2024 15:02:26 +0200
Subject: [PATCH 5/8] empty commit


From 5289f7377a3b71f9edb4cbb7d3011063506e1391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Krzysztof=20Rekucki?=
 <przemyslaw.rekucki@golem.network>
Date: Wed, 18 Sep 2024 11:59:30 +0200
Subject: [PATCH 6/8] tech: migrate deveps to workspace

---
 Cargo.lock                                    | 141 ++++++++-------
 Cargo.toml                                    | 162 ++++++++----------
 agent/provider/Cargo.toml                     |  24 +--
 core/activity/Cargo.toml                      |  14 +-
 core/gftp/Cargo.toml                          |   4 +-
 core/gsb-api/Cargo.toml                       |  10 +-
 core/identity/Cargo.toml                      |  18 +-
 core/market/Cargo.toml                        |  28 +--
 core/metrics/Cargo.toml                       |   6 +-
 core/net/Cargo.toml                           |  16 +-
 core/payment-driver/base/Cargo.toml           |   8 +-
 core/payment-driver/dummy/Cargo.toml          |   8 +-
 core/payment-driver/erc20/Cargo.toml          |  12 +-
 core/payment/Cargo.toml                       |  34 ++--
 core/persistence/Cargo.toml                   |  10 +-
 core/serv-api/Cargo.toml                      |   4 +-
 core/serv-api/derive/Cargo.toml               |   8 +-
 core/serv-api/web/Cargo.toml                  |  14 +-
 core/version/Cargo.toml                       |  12 +-
 core/vpn/Cargo.toml                           |  18 +-
 exe-unit/Cargo.toml                           |  18 +-
 exe-unit/components/counters/Cargo.toml       |   2 +-
 exe-unit/components/gsb-http-proxy/Cargo.toml |   6 +-
 exe-unit/components/transfer/Cargo.toml       |   6 +-
 golem_cli/Cargo.toml                          |   6 +-
 test-utils/test-framework/Cargo.toml          |   4 +-
 .../test-framework/framework-basic/Cargo.toml |   8 +-
 .../test-framework/framework-mocks/Cargo.toml |  34 ++--
 utils/manifest-utils/Cargo.toml               |   8 +-
 utils/manifest-utils/test-utils/Cargo.toml    |   2 +-
 30 files changed, 320 insertions(+), 325 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f57cb251a..b8924b543 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2999,8 +2999,8 @@ dependencies = [
  "thiserror",
  "tokio",
  "url",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-compile-time-utils 0.2.1",
+ "ya-core-model 0.9.1",
  "ya-service-bus",
 ]
 
@@ -3103,11 +3103,11 @@ dependencies = [
  "tokio",
  "url",
  "ya-client 0.8.0",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-compile-time-utils 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ya-core-model 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ya-provider",
  "ya-utils-path",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
 ]
 
 [[package]]
@@ -8848,7 +8848,7 @@ dependencies = [
  "tokio-stream",
  "uuid 0.8.2",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-gsb-http-proxy",
  "ya-net",
  "ya-persistence",
@@ -8957,6 +8957,18 @@ dependencies = [
  "vergen",
 ]
 
+[[package]]
+name = "ya-compile-time-utils"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2c1a5c8c999ab8fb28a5c85c222c15fdf9082968b61b45f9b3f46dc0f589bd9"
+dependencies = [
+ "git-version",
+ "metrics 0.12.1",
+ "semver 0.11.0",
+ "vergen",
+]
+
 [[package]]
 name = "ya-core-model"
 version = "0.9.1"
@@ -8979,6 +8991,29 @@ dependencies = [
  "ya-service-bus",
 ]
 
+[[package]]
+name = "ya-core-model"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed4e52e7d5cf8bafaf04daf6abf6bf5b199d291d65d014b7b8ca409ad7b0c599"
+dependencies = [
+ "bigdecimal 0.2.2",
+ "bitflags 1.3.2",
+ "chrono",
+ "derive_more",
+ "graphene-sgx",
+ "log",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "structopt",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
+ "thiserror",
+ "ya-client-model",
+ "ya-service-bus",
+]
+
 [[package]]
 name = "ya-counters"
 version = "0.2.0"
@@ -9000,7 +9035,7 @@ dependencies = [
  "tokio",
  "winapi 0.3.9",
  "ya-agreement-utils",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
 ]
 
 [[package]]
@@ -9028,7 +9063,7 @@ dependencies = [
  "tokio",
  "uuid 0.8.2",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ya-payment-driver",
  "ya-persistence",
  "ya-service-api-interfaces",
@@ -9073,7 +9108,7 @@ dependencies = [
  "uuid 0.8.2",
  "web3",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-payment-driver",
  "ya-service-api-interfaces",
  "ya-utils-futures",
@@ -9127,8 +9162,8 @@ dependencies = [
  "url",
  "ya-agreement-utils",
  "ya-client-model",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-compile-time-utils 0.2.1",
+ "ya-core-model 0.9.1",
  "ya-counters",
  "ya-gsb-http-proxy",
  "ya-manifest-utils",
@@ -9141,7 +9176,7 @@ dependencies = [
  "ya-utils-futures",
  "ya-utils-networking",
  "ya-utils-path",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
  "yansi",
 ]
 
@@ -9202,9 +9237,9 @@ dependencies = [
  "tokio-util",
  "url",
  "walkdir",
- "ya-client 0.8.0",
+ "ya-client 0.9.0",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-net",
  "ya-service-bus",
  "ya-utils-futures",
@@ -9247,9 +9282,9 @@ dependencies = [
  "url",
  "uuid 0.8.2",
  "ya-agreement-utils",
- "ya-client 0.8.0",
+ "ya-client 0.9.0",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-dummy-driver",
  "ya-erc20-driver",
  "ya-framework-basic",
@@ -9293,7 +9328,7 @@ dependencies = [
  "tokio",
  "uuid 1.10.0",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ya-persistence",
  "ya-service-api",
  "ya-service-api-interfaces",
@@ -9331,7 +9366,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-counters",
  "ya-framework-basic",
  "ya-sb-router",
@@ -9373,7 +9408,7 @@ dependencies = [
  "tokio",
  "uuid 0.8.2",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-framework-basic",
  "ya-framework-mocks",
  "ya-persistence",
@@ -9478,8 +9513,8 @@ dependencies = [
  "tracing",
  "uuid 0.8.2",
  "ya-agreement-utils",
- "ya-client 0.8.0",
- "ya-core-model",
+ "ya-client 0.9.0",
+ "ya-core-model 0.9.1",
  "ya-diesel-utils",
  "ya-framework-basic",
  "ya-framework-mocks",
@@ -9529,7 +9564,7 @@ dependencies = [
  "structopt",
  "tokio",
  "url",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-service-api",
  "ya-service-api-interfaces",
  "ya-service-bus",
@@ -9565,7 +9600,7 @@ dependencies = [
  "tokio-util",
  "url",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)",
  "ya-relay-client",
  "ya-sb-proto",
@@ -9641,9 +9676,9 @@ dependencies = [
  "url",
  "uuid 0.8.2",
  "ya-agreement-utils",
- "ya-client 0.8.0",
+ "ya-client 0.9.0",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-dummy-driver",
  "ya-erc20-driver",
  "ya-framework-basic",
@@ -9686,7 +9721,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-persistence",
  "ya-service-bus",
 ]
@@ -9710,10 +9745,10 @@ dependencies = [
  "thiserror",
  "tokio",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-service-api",
  "ya-service-api-interfaces",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
 ]
 
 [[package]]
@@ -9778,8 +9813,8 @@ dependencies = [
  "ya-agreement-utils",
  "ya-client 0.9.0",
  "ya-client-model",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-compile-time-utils 0.2.1",
+ "ya-core-model 0.9.1",
  "ya-file-logging",
  "ya-framework-basic",
  "ya-manifest-test-utils",
@@ -9788,7 +9823,7 @@ dependencies = [
  "ya-utils-actix",
  "ya-utils-cli",
  "ya-utils-path",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
  "yansi",
 ]
 
@@ -10018,7 +10053,7 @@ dependencies = [
  "lazy_static",
  "serde",
  "url",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-utils-cli",
 ]
 
@@ -10068,8 +10103,8 @@ dependencies = [
  "serde",
  "structopt",
  "url",
- "ya-client 0.8.0",
- "ya-core-model",
+ "ya-client 0.9.0",
+ "ya-core-model 0.9.1",
  "ya-identity",
  "ya-persistence",
  "ya-sb-router",
@@ -10113,7 +10148,7 @@ dependencies = [
  "anyhow",
  "graphene-sgx",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ya-service-bus",
 ]
 
@@ -10156,7 +10191,7 @@ dependencies = [
  "tokio",
  "url",
  "ya-framework-macro",
- "ya-utils-process 0.3.0",
+ "ya-utils-process",
 ]
 
 [[package]]
@@ -10202,7 +10237,7 @@ dependencies = [
  "url",
  "walkdir",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-exe-unit",
  "ya-framework-basic",
  "ya-runtime-api",
@@ -10271,24 +10306,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "ya-utils-process"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ae347dbc4362cc24241f96ddb7c4bc46fdc6f4772c2f92d12b40af359b81ef"
-dependencies = [
- "actix",
- "anyhow",
- "derive_more",
- "fs2",
- "futures 0.3.30",
- "futures-util",
- "libc",
- "nix 0.22.3",
- "shared_child",
- "tokio",
-]
-
 [[package]]
 name = "ya-utils-process"
 version = "0.3.0"
@@ -10327,9 +10344,9 @@ dependencies = [
  "structopt",
  "thiserror",
  "tokio",
- "ya-client 0.8.0",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-client 0.9.0",
+ "ya-compile-time-utils 0.2.1",
+ "ya-core-model 0.9.1",
  "ya-persistence",
  "ya-service-api",
  "ya-service-api-interfaces",
@@ -10365,7 +10382,7 @@ dependencies = [
  "uuid 0.8.2",
  "ya-client 0.8.0",
  "ya-client-model",
- "ya-core-model",
+ "ya-core-model 0.9.1",
  "ya-net",
  "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)",
  "ya-persistence",
@@ -10408,8 +10425,8 @@ dependencies = [
  "ya-activity",
  "ya-client 0.9.0",
  "ya-client-model",
- "ya-compile-time-utils",
- "ya-core-model",
+ "ya-compile-time-utils 0.2.1",
+ "ya-core-model 0.9.1",
  "ya-dummy-driver",
  "ya-erc20-driver",
  "ya-exe-unit",
@@ -10435,7 +10452,7 @@ dependencies = [
  "ya-utils-futures",
  "ya-utils-networking",
  "ya-utils-path",
- "ya-utils-process 0.2.0",
+ "ya-utils-process",
  "ya-version",
  "ya-vpn",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 3839849ec..7c40aac52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,44 +34,45 @@ name = "yagna"
 path = "core/serv/src/main.rs"
 
 [dependencies]
-ya-activity = "0.4"
-ya-compile-time-utils = "0.2"
-ya-core-model = { version = "^0.9" }
-ya-dummy-driver = { version = "0.3", optional = true }
-ya-file-logging = "0.1"
-ya-gsb-api = "0.1"
-ya-erc20-driver = { version = "0.4", optional = true }
-ya-identity = "0.3"
-ya-market = "0.4"
-ya-metrics = "0.2"
-ya-net = { version = "0.3", features = ["service"] }
-ya-payment = "0.3"
-ya-persistence = { version = "0.3", features = ["service"] }
+ya-compile-time-utils.workspace = true
+ya-activity.workspace = true
+ya-core-model.workspace = true
+ya-dummy-driver = { workspace = true, optional = true }
+ya-file-logging.workspace = true
+ya-gsb-api.workspace = true
+ya-erc20-driver = { workspace = true, optional = true }
+ya-identity.workspace = true
+ya-market.workspace = true
+ya-metrics.workspace = true
+ya-net = { workspace = true, features = ["service"] }
+ya-payment.workspace = true
+ya-persistence = { path = "core/persistence", features = ["service"] }
 ya-sb-proto = { workspace = true }
 ya-sb-router = { workspace = true }
-ya-service-api = "0.1"
-ya-service-api-derive = "0.2"
-ya-service-api-interfaces = "0.2"
-ya-service-api-web = "0.2"
+ya-service-api.workspace = true
+ya-service-api-derive.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
-ya-sgx = "0.2"
-ya-utils-path = "0.1"
+ya-sgx.path = "core/sgx"
+ya-utils-path.workspace = true
 ya-utils-futures.workspace = true
-ya-utils-process = { version = "0.2", features = ["lock"] }
-ya-utils-networking = "0.2"
+ya-utils-process = { workspace = true, features = ["lock"] }
+ya-utils-networking.workspace = true
 ya-fd-metrics = { path = "utils/fd-metrics" }
-ya-version = "0.2"
-ya-vpn = "0.2"
+ya-version = { path = "core/version" }
+ya-vpn.workspace = true
 ya-client.workspace = true
 ya-client-model.workspace = true
 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
+ya-provider = { path = "agent/provider", optional = true }                    # just to enable conditionally running some tests
 ya-exe-unit = { version = "0.4", optional = true, path = "exe-unit" } # just to enable conditionally running some tests
 
-actix-rt = "2.7"
-actix-service = "2"
-actix-web = "4"
+actix-rt.workspace = true
+actix-service.workspace = true
+actix-web.workspace = true
+
 anyhow = "1.0"
 chrono = "0.4"
 directories = "2.0.2"
@@ -95,7 +96,8 @@ libsqlite3-sys = { workspace = true }
 
 [dev-dependencies]
 erc20_processor = { workspace = true }
-ya-test-framework = "0.1"
+ya-test-framework.path= "test-utils/test-framework"
+
 ya-exe-unit = { version = "0.4", path = "exe-unit" }
 
 [package.metadata.deb]
@@ -233,14 +235,18 @@ members = [
     "core/metrics",
     "test-utils/test-framework",
     "test-utils/test-framework/framework-macro",
-    "test-utils/test-framework/framework-basic",
-    "test-utils/test-framework/framework-mocks",
+    "test-utils/test-framework/framework-mocks"
 ]
 
 [workspace.dependencies]
 # this entry is needed to make sqlx version >=0.5.9 work with diesel 1.4.*
 # diesel 1.4.* supports up to 0.23.0, but sqlx 0.5.9 requires 0.22.0
 # sqlx 0.5.10 need 0.23.2, so 0.5.9 is last version possible
+actix-rt = "2.7"
+actix-service = "2"
+actix-web = "4"
+actix = { version = "0.13", default-features = false }
+
 derive_more = "0.99.11"
 erc20_payment_lib = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "594d8a93b820b177ec267ccec5de61d8a9a45203" }
 erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "594d8a93b820b177ec267ccec5de61d8a9a45203" }
@@ -258,6 +264,9 @@ ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }
 ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "0588dd1af311ae19c621b04cc2a4cfd9c0483252" }
 ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }
 ya-utils-futures = { path = "utils/futures" }
+ya-utils-networking = { path = "utils/networking", default-features = false }
+ya-file-logging.path = "utils/file-logging"
+ya-utils-cli.path = "utils/cli"
 
 ya-service-bus = { version = "0.7.3", features = ['tls'] }
 ya-sb-router = { version = "0.6.4" }
@@ -268,75 +277,46 @@ mime = "0.3.17"
 ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
 ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
 
-[patch.crates-io]
-## SERVICES
-ya-identity = { path = "core/identity" }
-ya-net = { path = "core/net" }
-ya-market = { path = "core/market" }
-ya-market-resolver = { path = "core/market/resolver" }
-ya-activity = { path = "core/activity" }
-ya-sgx = { path = "core/sgx" }
-ya-payment = { path = "core/payment" }
-ya-payment-driver = { path = "core/payment-driver/base" }
-ya-dummy-driver = { path = "core/payment-driver/dummy" }
-ya-erc20-driver = { path = "core/payment-driver/erc20" }
-ya-version = { path = "core/version" }
-ya-vpn = { path = "core/vpn" }
-ya-gsb-api = { path = "core/gsb-api" }
-
-## CORE UTILS
+ya-compile-time-utils.path = "utils/compile-time-utils"
+ya-manifest-utils = { path = "utils/manifest-utils" }
+ya-std-utils = { path = "utils/std-utils" }
+ya-diesel-utils.path = "utils/diesel-utils"
+ya-utils-actix.path = "utils/actix_utils"
 ya-core-model = { path = "core/model" }
-ya-persistence = { path = "core/persistence" }
-ya-service-api = { path = "core/serv-api" }
-ya-service-api-derive = { path = "core/serv-api/derive" }
-ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
-ya-service-api-web = { path = "core/serv-api/web" }
+ya-utils-path.path = "utils/path"
+ya-utils-process.path = "utils/process"
 
-## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
-#ya-client-model = { path = "../ya-client/model" }
-golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
+ya-identity.path = "core/identity"
+ya-market.path="core/market"
+ya-activity.path = "core/activity"
+ya-net.path = "core/net"
+ya-persistence.path = "core/persistence"
+ya-payment.path = "core/payment"
+ya-metrics.path = "core/metrics"
+ya-manifest-test-utils.path = "utils/manifest-utils/test-utils"
+ya-vpn.path = "core/vpn"
+ya-gsb-api.path = "core/gsb-api"
 
-## RELAY and networking stack
+ya-payment-driver.path = "core/payment-driver/base"
+ya-dummy-driver.path= "core/payment-driver/dummy"
+ya-erc20-driver.path = "core/payment-driver/erc20"
 
-#ya-relay-stack = { path = "../ya-relay/crates/stack" }
-#ya-relay-client = { path = "../ya-relay/client" }
-#ya-relay-core = { path = "../ya-relay/crates/core" }
-#ya-relay-proto = { path = "../ya-relay/crates/proto" }
-
-
-## OTHERS
-gftp = { path = "core/gftp" }
-tokio-process-ns = { path = "exe-unit/tokio-process-ns" }
-ya-agreement-utils = { path = "utils/agreement-utils" }
-ya-std-utils = { path = "utils/std-utils" }
-ya-compile-time-utils = { path = "utils/compile-time-utils" }
-ya-exe-unit = { path = "exe-unit" }
-ya-file-logging = { path = "utils/file-logging" }
-ya-manifest-utils = { path = "utils/manifest-utils" }
-ya-transfer = { path = "exe-unit/components/transfer" }
-ya-utils-actix = { path = "utils/actix_utils" }
-ya-utils-cli = { path = "utils/cli" }
-ya-utils-networking = { path = "utils/networking" }
-ya-utils-path = { path = "utils/path" }
-ya-utils-process = { path = "utils/process" }
-ya-diesel-utils = { path = "utils/diesel-utils" }
-ya-metrics = { path = "core/metrics" }
-ya-provider = { path = "agent/provider" }
-ya-counters = { path = "exe-unit/components/counters" }
-ya-gsb-http-proxy = { path = "exe-unit/components/gsb-http-proxy" }
+ya-service-api.path = "core/serv-api"
+ya-service-api-derive.path = "core/serv-api/derive"
+ya-service-api-interfaces.path = "core/serv-api/interfaces"
+ya-service-api-web.path = "core/serv-api/web"
 
-## TEST UTILS
-ya-manifest-test-utils = { path = "utils/manifest-utils/test-utils" }
-ya-test-framework = { path = "test-utils/test-framework" }
-ya-framework-macro = { path = "test-utils/test-framework/framework-macro" }
-ya-framework-basic = { path = "test-utils/test-framework/framework-basic" }
-ya-framework-mocks = { path = "test-utils/test-framework/framework-mocks" }
+ya-framework-macro.path = "test-utils/test-framework/framework-macro"
+ya-framework-basic.path = "test-utils/test-framework/framework-basic"
+ya-framework-mocks.path = "test-utils/test-framework/framework-mocks"
 
+[patch.crates-io]
+## CLIENT
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
+golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 ethereum-tx-sign = { git = "https://github.com/golemfactory/ethereum-tx-sign.git", rev = "1164c74187a9e2947faeaea7dde104c3cdec4195" }
 graphene-sgx = { git = " https://github.com/golemfactory/graphene-rust.git", rev = "dbd993ebad7f9190410ea390a589348479af6407" }
-
 diesel = { git = "https://github.com/golemfactory/yagna-diesel-patch.git", rev = "a512c66d520a9066dd9a4d1416f9109019b39563" }
 
 # Speed up builds on macOS (will be default in next rust version probably)
diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml
index 1802d0695..2ee25e948 100644
--- a/agent/provider/Cargo.toml
+++ b/agent/provider/Cargo.toml
@@ -14,17 +14,17 @@ path = "src/main.rs"
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-manifest-utils = { version = "0.2" }
+ya-manifest-utils.workspace = true
 ya-client = { workspace = true, features = ['cli'] }
-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"
-ya-utils-actix = "0.2"
-ya-utils-cli = "0.1"
-ya-utils-path = "0.1"
-ya-utils-process = { version = "0.3", features = ['lock'] }
-ya-std-utils = "0.1"
+ya-client-model.workspace = true
+ya-compile-time-utils.workspace = true
+ya-core-model = { workspace = true, features = ['activity', 'payment'] }
+ya-file-logging.workspace = true
+ya-utils-actix.workspace = true
+ya-utils-cli.workspace = true
+ya-utils-path.workspace = true
+ya-utils-process = { workspace = true, features = ['lock'] }
+ya-std-utils.workspace = true
 golem-certificate = "0.1.1"
 
 actix = { version = "0.13", default-features = false }
@@ -91,8 +91,8 @@ tempdir = "0.3"
 tempfile = "3.5.0"
 pretty_assertions = "1.3"
 
-ya-manifest-test-utils = "0.1"
-ya-framework-basic = "0.1"
+ya-manifest-test-utils.workspace = true
+ya-framework-basic.workspace = true
 
 [lints]
 workspace = true
diff --git a/core/activity/Cargo.toml b/core/activity/Cargo.toml
index d3e0fc8d6..0c6ec40e5 100644
--- a/core/activity/Cargo.toml
+++ b/core/activity/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-core-model = { version = "0.9", features = ["activity", "market"] }
-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-core-model = { workspace = true, features = ["activity", "market"] }
+ya-client-model = { workspace = true, features = ["sgx"] }
+ya-net.workspace = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
 ya-gsb-http-proxy = { path = "../../exe-unit/components/gsb-http-proxy" }
 
diff --git a/core/gftp/Cargo.toml b/core/gftp/Cargo.toml
index 9b4508ea4..7ff91a2f0 100644
--- a/core/gftp/Cargo.toml
+++ b/core/gftp/Cargo.toml
@@ -18,8 +18,8 @@ name="gftp"
 required-features=['bin']
 
 [dependencies]
-ya-compile-time-utils = "0.2"
-ya-core-model = { version = "^0.9", features = ["gftp", "identity", "net"] }
+ya-compile-time-utils.workspace = true
+ya-core-model = { workspace = true, 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 8e8ad341d..8cd4fa2b6 100644
--- a/core/gsb-api/Cargo.toml
+++ b/core/gsb-api/Cargo.toml
@@ -6,11 +6,11 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = "0.6"
-ya-persistence = "0.3"
-ya-service-api = "0.1"
-ya-service-api-interfaces = "0.2"
-ya-service-api-web = "0.2"
+ya-client-model.workspace = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
 
 actix = "0"
diff --git a/core/identity/Cargo.toml b/core/identity/Cargo.toml
index 5d927802f..773f85559 100644
--- a/core/identity/Cargo.toml
+++ b/core/identity/Cargo.toml
@@ -10,11 +10,11 @@ framework-test = []
 
 
 [dependencies]
-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"
-ya-service-api-interfaces = "0.2"
+ya-client-model = { workspace = true, features = ["with-diesel"] }
+ya-core-model = { workspace = true, features = ["identity", "appkey"] }
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-service-bus = { workspace = true }
 
 anyhow = "1.0"
@@ -41,10 +41,10 @@ rustc-hex = "2.1.0"
 yansi = "0.5.0"
 
 [dev-dependencies]
-ya-service-api-derive = "0.2"
+ya-service-api-derive.workspace = true
 ya-sb-router = { workspace = true }
-ya-framework-basic = { version = "0.1" }
-ya-framework-mocks = { version = "0.1" }
+ya-framework-basic.workspace = true
+ya-framework-mocks.workspace = true
 
 actix-rt = "2.7"
 actix-service = "2"
@@ -57,4 +57,4 @@ serial_test = { git = "https://github.com/tworec/serial_test.git", branch = "act
 test-context = "0.1.4"
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/core/market/Cargo.toml b/core/market/Cargo.toml
index 92d0f43eb..76d1fb5cd 100644
--- a/core/market/Cargo.toml
+++ b/core/market/Cargo.toml
@@ -10,19 +10,19 @@ test-suite = []
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-client = "0.8"
-ya-core-model = { version = "^0.9", features = ["market", "net"] }
-ya-diesel-utils = { version = "0.1" }
-ya-framework-basic = "0.1"
-ya-market-resolver = "0.2"
-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-client.workspace = true
+ya-core-model = { workspace = true, features = ["market", "net"] }
+ya-diesel-utils.workspace = true
+ya-framework-basic.workspace = true
+ya-market-resolver.path = "./resolver"
+ya-net.workspace = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
-ya-std-utils = "0.1"
-ya-utils-actix = "0.2"
+ya-std-utils.workspace = true
+ya-utils-actix.workspace = true
 
 actix = { version = "0.13", default-features = false }
 actix-http = "3"
@@ -73,7 +73,7 @@ serial_test = { git = "https://github.com/golemfactory/serial_test.git", branch
 structopt = "0.3"
 tokio = { version = "1", features = ["macros", "rt"] }
 
-ya-framework-mocks = "0.1"
+ya-framework-mocks.workspace = true
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/core/metrics/Cargo.toml b/core/metrics/Cargo.toml
index a059a0d55..87369e541 100644
--- a/core/metrics/Cargo.toml
+++ b/core/metrics/Cargo.toml
@@ -10,9 +10,9 @@ repository = "https://github.com/golemfactory/yagna"
 license = "LGPL-3.0"
 
 [dependencies]
-ya-core-model = { version = "^0.9", features = ["identity"] }
-ya-service-api = "0.1"
-ya-service-api-interfaces = "0.2"
+ya-core-model = { workspace = true, features = ["identity"] }
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-service-bus = {  workspace = true }
 
 awc = "3"
diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml
index a8129f15c..dce743391 100644
--- a/core/net/Cargo.toml
+++ b/core/net/Cargo.toml
@@ -15,23 +15,21 @@ packet-trace-enable = [
 ]
 
 [dependencies]
-ya-client-model = "0.6"
-ya-core-model = { version = "^0.9", features = ["net", "identity"] }
+ya-client-model.workspace = true
+ya-core-model = { workspace = true, features = ["net", "identity"] }
 
 ya-relay-client = { workspace = true }
-#ya-relay-client = "0.6"
-#ya-relay-client = { path = "../../../ya-relay/client" }
 
 ya-sb-proto = { workspace = true }
 ya-sb-util = { workspace = true }
-ya-service-api = "0.1"
-ya-service-api-interfaces = "0.2"
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-service-bus = { workspace = true, features = ["tls"] }
-ya-utils-networking = "0.2"
+ya-utils-networking.workspace = true
 ya-packet-trace = { git = "https://github.com/golemfactory/ya-packet-trace" }
 
-actix = "0.13"
-actix-web = "4"
+actix.workspace = true
+actix-web.workspace = true
 anyhow = "1.0"
 chrono = "0.4"
 futures = "0.3"
diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml
index 5b43474d1..156129262 100644
--- a/core/payment-driver/base/Cargo.toml
+++ b/core/payment-driver/base/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 default = []
 
 [dependencies]
-actix = { version = "0.13", default-features = false }
+actix = { workspace = true, default-features = false }
 anyhow = "1.0"
 async-trait = "0.1"
 bigdecimal = { version = "0.2" }
@@ -29,13 +29,13 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["macros"] }
 
 ## yagna dependencies
-ya-client-model = "0.6"
-ya-core-model = { version = "^0.9", features = [
+ya-client-model.workspace = true
+ya-core-model = { workspace = true, features = [
     "driver",
     "identity",
     "payment",
 ] }
-ya-persistence = "0.3"
+ya-persistence.workspace = true
 ya-service-bus = { workspace = true }
 serde_json_canonicalizer = "0.2.0"
 
diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml
index 5c3b2a124..41a702ced 100644
--- a/core/payment-driver/dummy/Cargo.toml
+++ b/core/payment-driver/dummy/Cargo.toml
@@ -13,10 +13,10 @@ ya-core-model = { version = "^0.9", features = [
     "identity",
     "payment",
 ] }
-ya-client-model = { version = "0.6" }
-ya-payment-driver = "0.3"
-ya-persistence = "0.3"
-ya-service-api-interfaces = "0.2"
+ya-client-model.workspace = true
+ya-payment-driver.workspace = true
+ya-persistence.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-service-bus = { workspace = true }
 
 anyhow = "1.0"
diff --git a/core/payment-driver/erc20/Cargo.toml b/core/payment-driver/erc20/Cargo.toml
index bdcb514db..1b2406e3e 100644
--- a/core/payment-driver/erc20/Cargo.toml
+++ b/core/payment-driver/erc20/Cargo.toml
@@ -42,13 +42,13 @@ web3 = { version = "0.19.0", default-features = false, features = [
 rust_decimal = "1"
 
 ## yagna dependencies
-ya-payment-driver = "0.3"
-ya-core-model = { version = "0.9" }
-ya-client-model = "0.6"
-ya-service-api-interfaces = "0.2"
+ya-payment-driver.workspace = true
+ya-core-model.workspace = true
+ya-client-model.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-utils-futures.workspace = true
-ya-utils-networking = "0.2"
-erc20_payment_lib = { workspace = true }
+ya-utils-networking.workspace = true
+erc20_payment_lib.workspace = true
 
 [dev-dependencies]
 actix-rt = "2.7"
diff --git a/core/payment/Cargo.toml b/core/payment/Cargo.toml
index ca6354f8a..304f285cb 100644
--- a/core/payment/Cargo.toml
+++ b/core/payment/Cargo.toml
@@ -10,22 +10,22 @@ framework-test = []
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-client-model = { version = "0.6", features = ["with-diesel"] }
-ya-core-model = { version = "^0.9", features = [
+ya-client-model = { workspace = true, features = ["with-diesel"] }
+ya-core-model = { workspace = true, features = [
     "activity",
     "driver",
     "identity",
     "market",
     "payment",
 ] }
-ya-net = "0.3"
-ya-metrics = "0.2"
-ya-persistence = "0.3"
-ya-service-api = "0.1"
-ya-service-api-interfaces = "0.2"
-ya-service-api-web = "0.2"
+ya-net.workspace = true
+ya-metrics.workspace  = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
-ya-std-utils = "0.1"
+ya-std-utils.workspace = true
 
 actix-web = "4"
 anyhow = "1.0"
@@ -66,15 +66,15 @@ uint = "0.7"
 uuid = { version = "0.8", features = ["v4"] }
 
 [dev-dependencies]
-ya-client = "0.8"
-ya-dummy-driver = "0.3"
-ya-erc20-driver = "0.4"
-ya-net = { version = "0.3", features = ["service"] }
-ya-identity = "0.3"
-ya-market = "0.4"
+ya-client.workspace = true
+ya-dummy-driver.workspace = true
+ya-erc20-driver.workspace  = true
+ya-net = { workspace = true, features = ["service"] }
+ya-identity.workspace = true
+ya-market.workspace = true
 ya-sb-router = { workspace = true }
-ya-framework-basic = { version = "0.1" }
-ya-framework-mocks = { version = "0.1" }
+ya-framework-basic.workspace = true
+ya-framework-mocks.workspace = true
 
 actix-rt = "2.7"
 rand = "0.8"
diff --git a/core/persistence/Cargo.toml b/core/persistence/Cargo.toml
index f376ed405..b2b649272 100644
--- a/core/persistence/Cargo.toml
+++ b/core/persistence/Cargo.toml
@@ -14,11 +14,11 @@ service = [
 ]
 
 [dependencies]
-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 }
-ya-utils-process = { version = "0.3", features = ["lock"], optional = true }
+ya-client-model = { workspace = true, features = ["with-diesel"] }
+ya-core-model.workspace = true
+ya-service-api = { workspace = true, optional = true }
+ya-service-api-interfaces = { workspace = true, optional = true }
+ya-utils-process = { workspace = true, features = ["lock"], optional = true }
 
 anyhow = "1.0.26"
 bigdecimal = "0.2"
diff --git a/core/serv-api/Cargo.toml b/core/serv-api/Cargo.toml
index efd64ef95..190f329a4 100644
--- a/core/serv-api/Cargo.toml
+++ b/core/serv-api/Cargo.toml
@@ -11,5 +11,5 @@ lazy_static = "1.4"
 serde = { version = "1.0", features = ["derive"] }
 url = "2.1.1"
 
-ya-utils-cli = "0.1"
-ya-core-model = "0.9"
+ya-utils-cli.workspace = true
+ya-core-model.workspace = true
diff --git a/core/serv-api/derive/Cargo.toml b/core/serv-api/derive/Cargo.toml
index 1f399fa94..911ee34a4 100644
--- a/core/serv-api/derive/Cargo.toml
+++ b/core/serv-api/derive/Cargo.toml
@@ -17,11 +17,11 @@ strum_macros = "0.24"
 syn = { version = "1.0", features = ["full"] }
 
 [dev-dependencies]
-ya-service-api-interfaces = "0.2"
+ya-service-api-interfaces.workspace = true
 
-actix-rt = "2.7"
-actix-service = "2"
-actix-web = "4"
+actix-rt.workspace = true
+actix-service.workspace = true
+actix-web.workspace = true
 anyhow = "1.0"
 log = "0.4"
 structopt = "0.3"
diff --git a/core/serv-api/web/Cargo.toml b/core/serv-api/web/Cargo.toml
index 90117b680..54d3e350c 100644
--- a/core/serv-api/web/Cargo.toml
+++ b/core/serv-api/web/Cargo.toml
@@ -6,9 +6,9 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client = "0.8"
-ya-core-model = { version = "^0.9", features = ["appkey"] }
-ya-service-api = "0.1"
+ya-client.workspace = true
+ya-core-model = { workspace = true, features = ["appkey"] }
+ya-service-api.workspace = true
 ya-service-bus = {  workspace  = true }
 
 actix-cors = "0.6"
@@ -23,11 +23,11 @@ structopt = "0.3"
 url = "2.1.1"
 
 [dev-dependencies]
-ya-identity = "0.3"
-ya-persistence = "0.3"
+ya-identity.workspace = true
+ya-persistence.workspace = true
 ya-sb-router = { workspace = true }
-ya-service-api-derive = "0.2"
-ya-service-api-interfaces = "0.2"
+ya-service-api-derive.workspace = true
+ya-service-api-interfaces.workspace = true
 
 actix-rt = "2.7"
 anyhow = "1.0"
diff --git a/core/version/Cargo.toml b/core/version/Cargo.toml
index 6199451c4..9519d06a0 100644
--- a/core/version/Cargo.toml
+++ b/core/version/Cargo.toml
@@ -6,12 +6,12 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client = "0.8"
-ya-compile-time-utils = "0.2"
-ya-core-model = { version = "^0.9", features = ["version"] }
-ya-persistence = "0.3"
-ya-service-api = "0.1"
-ya-service-api-interfaces = "0.2"
+ya-client.workspace = true
+ya-compile-time-utils.workspace = true
+ya-core-model = { workspace = true, features = ["version"] }
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
 ya-service-bus = {  workspace = true }
 
 actix-web = "4"
diff --git a/core/vpn/Cargo.toml b/core/vpn/Cargo.toml
index 6083b50ef..ed7f1fbbb 100644
--- a/core/vpn/Cargo.toml
+++ b/core/vpn/Cargo.toml
@@ -5,17 +5,15 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-core-model = { version = "^0.9", features = ["activity", "market"] }
-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-core-model = { workspace = true, features = ["activity", "market"] }
+ya-client-model = { workspace = true, features = ["sgx"] }
+ya-net.workspace = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-interfaces.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
-ya-utils-networking = { version = "0.2", default-features = false, features = [
-    "vpn",
-] }
+ya-utils-networking = { workspace = true, default-features = false, features = [ "vpn", ] }
 ya-packet-trace = { git = "https://github.com/golemfactory/ya-packet-trace" }
 
 actix = "0.13"
diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml
index a4d31d51a..9ae5a0598 100644
--- a/exe-unit/Cargo.toml
+++ b/exe-unit/Cargo.toml
@@ -28,23 +28,25 @@ framework-test = ["ya-transfer/framework-test"]
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-manifest-utils = { version = "0.2" }
+ya-manifest-utils.workspace = true
 ya-client-model.workspace = true
-ya-compile-time-utils = "0.2"
-ya-core-model = { version = "^0.9", features = ["activity", "appkey"] }
+ya-compile-time-utils.workspace = true
+ya-core-model = { workspace = true, features = ["activity", "appkey"] }
 ya-runtime-api = { version = "0.7", path = "runtime-api", features = [
     "server",
 ] }
 ya-service-bus = { workspace = true }
-ya-transfer = "0.3"
-ya-utils-path = "0.1"
+
+ya-transfer.path = "components/transfer"
+
+ya-utils-path.workspace  = true
 ya-utils-futures.workspace = true
-ya-std-utils = "0.1"
-ya-utils-networking = { version = "0.2", default-features = false, features = [
+ya-std-utils.workspace = true
+ya-utils-networking = { workspace = true, default-features = false, features = [
     "dns",
     "vpn",
 ] }
-ya-utils-process = "0.3"
+ya-utils-process.workspace = true
 ya-packet-trace = { git = "https://github.com/golemfactory/ya-packet-trace" }
 ya-gsb-http-proxy = { path = "../exe-unit/components/gsb-http-proxy" }
 ya-counters = { path = "../exe-unit/components/counters", features = ["os"] }
diff --git a/exe-unit/components/counters/Cargo.toml b/exe-unit/components/counters/Cargo.toml
index 585fcb827..f6cff54e4 100644
--- a/exe-unit/components/counters/Cargo.toml
+++ b/exe-unit/components/counters/Cargo.toml
@@ -6,7 +6,7 @@ description = "Runtime counters generating data used to collect activity metrics
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-utils-process = { version = "0.3", optional = true }
+ya-utils-process = { workspace = true, optional = true }
 
 anyhow = "1.0"
 actix = "0.13"
diff --git a/exe-unit/components/gsb-http-proxy/Cargo.toml b/exe-unit/components/gsb-http-proxy/Cargo.toml
index a9b50d039..e9a1978d6 100644
--- a/exe-unit/components/gsb-http-proxy/Cargo.toml
+++ b/exe-unit/components/gsb-http-proxy/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 [dependencies]
 ya-service-bus = { workspace = true }
 ya-counters = { path = "../counters" }
-ya-client-model = "0.6"
-ya-core-model = { version = "^0.9" }
+ya-client-model.workspace = true
+ya-core-model.workspace = true
 
 thiserror = "1.0"
 serde = { version = "1.0", features = ["derive"] }
@@ -39,5 +39,5 @@ mockito = "1.2"
 serial_test = { git = "https://github.com/tworec/serial_test.git", branch = "actix_rt_test", features = ["actix-rt2"] }
 test-context = "0.1.4"
 
-ya-framework-basic = { version = "0.1" }
+ya-framework-basic.workspace = true
 ya-sb-router = "0.6.2"
diff --git a/exe-unit/components/transfer/Cargo.toml b/exe-unit/components/transfer/Cargo.toml
index 406b375ff..c20d301ee 100644
--- a/exe-unit/components/transfer/Cargo.toml
+++ b/exe-unit/components/transfer/Cargo.toml
@@ -6,8 +6,8 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = "0.6"
-ya-core-model = { version = "^0.9" }
+ya-client-model.workspace = true
+ya-core-model.workspace = true
 ya-service-bus = { workspace = true }
 ya-utils-path = { version = "0.1", path = "../../../utils/path" }
 ya-utils-futures.workspace = true
@@ -80,5 +80,5 @@ structopt = "0.3.15"
 test-context = "0.1.4"
 test-case = "3"
 
-ya-framework-basic = { version = "0.1" }
+ya-framework-basic.workspace = true
 ya-exe-unit = { version = "0.4", path = "../../../exe-unit" }
diff --git a/golem_cli/Cargo.toml b/golem_cli/Cargo.toml
index f86989865..bf70f28c6 100644
--- a/golem_cli/Cargo.toml
+++ b/golem_cli/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2018"
 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"
-ya-utils-path = "0.1.0"
-ya-utils-process = { version = "0.3", features = ["lock"] }
+ya-provider = { path= "../agent/provider"}
+ya-utils-path.workspace  = true
+ya-utils-process = { workspace = true, features = ["lock"] }
 
 actix-rt="2.7"
 ansi_term="0.12.1"
diff --git a/test-utils/test-framework/Cargo.toml b/test-utils/test-framework/Cargo.toml
index 74f4b2a24..c743a8bef 100644
--- a/test-utils/test-framework/Cargo.toml
+++ b/test-utils/test-framework/Cargo.toml
@@ -17,8 +17,8 @@ serial_test = { git = "https://github.com/golemfactory/serial_test.git", branch
 tokio = { version = "1", features = ["rt"] }
 url = "2.3"
 
-ya-utils-process = "0.3"
-ya-framework-macro = "0.1"
+ya-utils-process.workspace = true
+ya-framework-macro = { path = "./framework-macro" }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 libc = "0.2.73"
diff --git a/test-utils/test-framework/framework-basic/Cargo.toml b/test-utils/test-framework/framework-basic/Cargo.toml
index 6ad09f8c2..61d125361 100644
--- a/test-utils/test-framework/framework-basic/Cargo.toml
+++ b/test-utils/test-framework/framework-basic/Cargo.toml
@@ -9,15 +9,15 @@ edition = "2018"
 bcast-singleton = []
 
 [dependencies]
-ya-client-model = "0.6"
-ya-client = "0.8"
-ya-core-model = { version = "^0.9" }
+ya-client-model.workspace = true
+ya-client.workspace = true
+ya-core-model.workspace = true
 ya-service-bus = { workspace = true }
 ya-utils-path = { version = "0.1", path = "../../../utils/path" }
 ya-utils-futures.workspace = true
 gftp = { workspace = true }
 
-ya-net = "0.3"
+ya-net.workspace = true
 
 actix = "0.13"
 actix-files = "0.6"
diff --git a/test-utils/test-framework/framework-mocks/Cargo.toml b/test-utils/test-framework/framework-mocks/Cargo.toml
index 9fd64a308..365d9e522 100644
--- a/test-utils/test-framework/framework-mocks/Cargo.toml
+++ b/test-utils/test-framework/framework-mocks/Cargo.toml
@@ -6,27 +6,27 @@ edition = "2021"
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-client-model = "0.6"
-ya-client = "0.8"
-ya-core-model = { version = "^0.9" }
-ya-dummy-driver = "0.3"
-ya-erc20-driver = "0.4"
-ya-identity = "0.3"
-ya-market = "0.4"
-ya-net = { version = "0.3", features = ["service"] }
-ya-payment = "0.3"
-ya-persistence = "0.3"
-ya-service-api = "0.1"
-ya-service-api-web = "0.2"
+ya-client-model.workspace = true
+ya-client.workspace = true
+ya-core-model.workspace = true
+ya-dummy-driver.workspace = true
+ya-erc20-driver.workspace = true
+ya-identity.workspace = true
+ya-market.workspace = true
+ya-net = { workspace = true, features = ["service"] }
+ya-payment.workspace = true
+ya-persistence.workspace = true
+ya-service-api.workspace = true
+ya-service-api-web.workspace = true
 ya-service-bus = { workspace = true }
 ya-sb-router = { workspace = true }
-ya-utils-path = { version = "0.1", path = "../../../utils/path" }
-ya-std-utils = "0.1"
+ya-utils-path.workspace = true
+ya-std-utils.workspace = true
 
-ya-framework-basic = { version = "0.1" }
+ya-framework-basic.workspace = true
 
-actix-rt = "2.7"
-actix-web = "4"
+actix-rt.workspace = true
+actix-web.workspace = true
 actix-http = "3"
 actix-service = "2"
 anyhow = "1.0"
diff --git a/utils/manifest-utils/Cargo.toml b/utils/manifest-utils/Cargo.toml
index 69cadef47..86db7ef3c 100644
--- a/utils/manifest-utils/Cargo.toml
+++ b/utils/manifest-utils/Cargo.toml
@@ -21,8 +21,8 @@ schema = ["schemars"]
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-utils-path = "0.1"
-ya-client-model = "0.6"
+ya-utils-path.workspace = true
+ya-client-model.workspace = true
 golem-certificate = "0.1.1"
 
 regex = "1.5"
@@ -57,8 +57,8 @@ serial_test = "2"
 shlex = "1.1"
 tar = "0.4"
 test-case = "3.1"
-ya-manifest-test-utils = "0.1"
+ya-manifest-test-utils.workspace = true
 openssl.workspace = true
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/utils/manifest-utils/test-utils/Cargo.toml b/utils/manifest-utils/test-utils/Cargo.toml
index 27aac3c1b..449d74c03 100644
--- a/utils/manifest-utils/test-utils/Cargo.toml
+++ b/utils/manifest-utils/test-utils/Cargo.toml
@@ -13,5 +13,5 @@ base64 = "0.13"
 tar = "0.4"
 openssl = "0.10"
 
-ya-manifest-utils = "0.2"
+ya-manifest-utils.workspace = true
 ya-agreement-utils = { workspace = true }

From 0804f5db379b35c943d4ddb20e7601eb29feaca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Krzysztof=20Rekucki?=
 <przemyslaw.rekucki@golem.network>
Date: Thu, 19 Sep 2024 12:06:01 +0200
Subject: [PATCH 7/8] fix: ya-client-model version

---
 Cargo.lock                                    | 201 ++++++++++--------
 Cargo.toml                                    |   8 +-
 exe-unit/Cargo.toml                           |   2 +-
 .../mock-runtime/src/testing/exe_unit_ext.rs  |   2 +-
 exe-unit/src/exe_unit.rs                      |  29 ++-
 exe-unit/tests/test_progress.rs               |   4 +-
 6 files changed, 138 insertions(+), 108 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 94daad413..fe19332ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,7 +12,7 @@ dependencies = [
  "actix-rt",
  "actix_derive",
  "bitflags 2.6.0",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "crossbeam-channel 0.5.13",
  "futures-core",
  "futures-sink",
@@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
  "bitflags 2.6.0",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-core",
  "futures-sink",
  "memchr",
@@ -70,7 +70,7 @@ dependencies = [
  "actix-utils",
  "actix-web",
  "bitflags 2.6.0",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "derive_more",
  "futures-core",
  "http-range",
@@ -97,7 +97,7 @@ dependencies = [
  "base64 0.22.1",
  "bitflags 2.6.0",
  "brotli",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "bytestring",
  "derive_more",
  "encoding_rs",
@@ -135,7 +135,7 @@ dependencies = [
  "actix-tls",
  "actix-utils",
  "awc",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-core",
  "http 0.2.12",
  "log",
@@ -286,7 +286,7 @@ dependencies = [
  "actix-utils",
  "actix-web-codegen",
  "ahash 0.8.11",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "bytestring",
  "cfg-if 1.0.0",
  "cookie",
@@ -322,7 +322,7 @@ dependencies = [
  "actix-codec",
  "actix-http",
  "actix-web",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "bytestring",
  "futures-core",
  "pin-project-lite",
@@ -578,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "appdirs"
@@ -759,7 +759,7 @@ dependencies = [
  "actix-tls",
  "actix-utils",
  "base64 0.22.1",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "cfg-if 1.0.0",
  "cookie",
  "derive_more",
@@ -1113,9 +1113,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "bytesize"
@@ -1132,7 +1132,7 @@ version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
 ]
 
 [[package]]
@@ -1214,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
 dependencies = [
  "jobserver",
  "libc",
@@ -2689,7 +2689,7 @@ dependencies = [
  "log",
  "regex",
  "thiserror",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -3142,7 +3142,7 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3162,7 +3162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3228,7 +3228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "headers-core",
  "http 0.2.12",
  "httpdate",
@@ -3408,7 +3408,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "fnv",
  "itoa",
 ]
@@ -3419,7 +3419,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "fnv",
  "itoa",
 ]
@@ -3430,7 +3430,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "http 0.2.12",
  "pin-project-lite",
 ]
@@ -3441,7 +3441,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "http 1.1.0",
 ]
 
@@ -3451,7 +3451,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -3501,13 +3501,23 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime 2.1.0",
+ "serde",
+]
+
 [[package]]
 name = "hyper"
 version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -3531,7 +3541,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-channel",
  "futures-util",
  "h2 0.4.6",
@@ -3565,7 +3575,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "hyper 0.14.30",
  "native-tls",
  "tokio",
@@ -3578,7 +3588,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -3589,9 +3599,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3994,7 +4004,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.4",
 ]
 
 [[package]]
@@ -4429,7 +4439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
 dependencies = [
  "assert-json-diff",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "colored",
  "futures-util",
  "http 1.1.0",
@@ -5004,7 +5014,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.4",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -5239,12 +5249,12 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
- "yansi",
+ "yansi 1.0.1",
 ]
 
 [[package]]
@@ -5325,7 +5335,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.20",
+ "toml_edit 0.22.21",
 ]
 
 [[package]]
@@ -5382,7 +5392,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "prost-derive 0.10.1",
 ]
 
@@ -5392,7 +5402,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "prost-derive 0.12.6",
 ]
 
@@ -5402,7 +5412,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "cfg-if 1.0.0",
  "cmake",
  "heck 0.4.1",
@@ -5424,7 +5434,7 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "heck 0.5.0",
  "itertools 0.12.1",
  "log",
@@ -5471,7 +5481,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "prost 0.10.4",
 ]
 
@@ -5736,9 +5746,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -5814,7 +5824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -5913,7 +5923,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
  "bitvec 1.0.1",
  "bytecheck",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "hashbrown 0.12.3",
  "ptr_meta",
  "rend",
@@ -5940,7 +5950,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "rustc-hex",
 ]
 
@@ -5983,7 +5993,7 @@ checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
  "arrayvec 0.7.6",
  "borsh",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "num-traits",
  "rand 0.8.5",
  "rkyv",
@@ -6014,9 +6024,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.36"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags 2.6.0",
  "errno 0.3.9",
@@ -6977,7 +6987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64 0.13.1",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures 0.3.30",
  "httparse",
  "log",
@@ -7042,7 +7052,7 @@ dependencies = [
  "ahash 0.8.11",
  "atoi",
  "byteorder",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "crc",
  "crossbeam-queue 0.3.11",
@@ -7123,7 +7133,7 @@ dependencies = [
  "base64 0.21.7",
  "bitflags 2.6.0",
  "byteorder",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "crc",
  "digest 0.10.7",
@@ -7732,7 +7742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "libc",
  "mio 1.0.2",
  "parking_lot 0.12.3",
@@ -7776,11 +7786,10 @@ dependencies = [
 
 [[package]]
 name = "tokio-openssl"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d"
+checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd"
 dependencies = [
- "futures-util",
  "openssl",
  "openssl-sys",
  "tokio",
@@ -7860,7 +7869,7 @@ version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures-core",
  "futures-io",
  "futures-sink",
@@ -7879,7 +7888,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit 0.22.21",
 ]
 
 [[package]]
@@ -7904,9 +7913,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
 dependencies = [
  "indexmap 2.5.0",
  "serde",
@@ -8109,9 +8118,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -8124,9 +8133,9 @@ checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
@@ -8170,7 +8179,7 @@ dependencies = [
  "rustls 0.23.13",
  "rustls-pki-types",
  "url",
- "webpki-roots 0.26.5",
+ "webpki-roots 0.26.6",
 ]
 
 [[package]]
@@ -8423,7 +8432,7 @@ checksum = "5388522c899d1e1c96a4c307e3797e0f697ba7c77dd8e0e625ecba9dd0342937"
 dependencies = [
  "arrayvec 0.7.6",
  "base64 0.21.7",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "derive_more",
  "ethabi",
  "ethereum-types 0.14.1",
@@ -8489,9 +8498,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -8514,7 +8523,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.4",
  "wasite",
 ]
 
@@ -8857,11 +8866,11 @@ dependencies = [
 [[package]]
 name = "ya-client"
 version = "0.9.0"
-source = "git+https://github.com/golemfactory/ya-client.git?branch=kek/deploy-volumes#66b85ef599251facaa272789a29c23940aae3e2b"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=60327ddaaea289ecf45836c1e242e15855d71dc5#60327ddaaea289ecf45836c1e242e15855d71dc5"
 dependencies = [
  "actix-codec",
  "awc",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "envy",
  "futures 0.3.30",
@@ -8881,7 +8890,7 @@ dependencies = [
 [[package]]
 name = "ya-client-model"
 version = "0.6.0"
-source = "git+https://github.com/golemfactory/ya-client.git?branch=kek/deploy-volumes#66b85ef599251facaa272789a29c23940aae3e2b"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=60327ddaaea289ecf45836c1e242e15855d71dc5#60327ddaaea289ecf45836c1e242e15855d71dc5"
 dependencies = [
  "bigdecimal 0.2.2",
  "bytesize",
@@ -8889,6 +8898,7 @@ dependencies = [
  "derive_more",
  "diesel",
  "hex",
+ "humantime-serde",
  "openssl",
  "rand 0.8.5",
  "secp256k1 0.27.0",
@@ -8942,7 +8952,7 @@ dependencies = [
  "actix",
  "actix-rt",
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "futures 0.3.30",
  "lazy_static",
@@ -9047,7 +9057,7 @@ dependencies = [
  "anyhow",
  "async-stream",
  "async-trait",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "derivative",
  "derive_more",
@@ -9100,8 +9110,9 @@ dependencies = [
  "ya-transfer",
  "ya-utils-futures",
  "ya-utils-networking",
+ "ya-utils-path",
  "ya-utils-process",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -9120,7 +9131,7 @@ dependencies = [
  "chrono",
  "flexi_logger 0.17.1",
  "log",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -9136,7 +9147,7 @@ dependencies = [
  "async-compression",
  "async-trait",
  "awc",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "cargo_metadata 0.18.1",
  "crossterm 0.26.1",
  "env_logger 0.7.1",
@@ -9240,7 +9251,7 @@ dependencies = [
  "anyhow",
  "awc",
  "base64 0.21.7",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "ctor",
  "env_logger 0.10.2",
  "flexbuffers",
@@ -9273,7 +9284,7 @@ dependencies = [
  "actix-web",
  "anyhow",
  "async-stream",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "derive_more",
  "env_logger 0.10.2",
@@ -9344,7 +9355,7 @@ dependencies = [
  "ya-service-api-derive",
  "ya-service-api-interfaces",
  "ya-service-bus",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -9504,7 +9515,7 @@ dependencies = [
  "actix",
  "anyhow",
  "async-trait",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "env_logger 0.10.2",
  "futures 0.3.30",
  "hex",
@@ -9534,7 +9545,7 @@ dependencies = [
  "actix",
  "actix-web",
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "chrono",
  "env_logger 0.7.1",
  "ethsign",
@@ -9784,7 +9795,7 @@ dependencies = [
  "ya-utils-cli",
  "ya-utils-path",
  "ya-utils-process",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -9853,7 +9864,7 @@ version = "0.4.3"
 source = "git+https://github.com/golemfactory/ya-relay.git?rev=0588dd1af311ae19c621b04cc2a4cfd9c0483252#0588dd1af311ae19c621b04cc2a4cfd9c0483252"
 dependencies = [
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "derive_more",
  "futures 0.3.30",
  "hex",
@@ -9913,7 +9924,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "306a73f6ce2286987c9da25bc0c2ef81f4f0b2b58bb8d9aeedc34d27407603ff"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "derive_more",
 ]
 
@@ -9922,7 +9933,7 @@ name = "ya-relay-util"
 version = "0.1.0"
 source = "git+https://github.com/golemfactory/ya-relay.git?rev=0588dd1af311ae19c621b04cc2a4cfd9c0483252#0588dd1af311ae19c621b04cc2a4cfd9c0483252"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "derive_more",
 ]
 
@@ -9933,7 +9944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf0db25811f107d62be6c6ac7444d9c6c3e39714b6f76d72798b66ecce47506f"
 dependencies = [
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "futures 0.3.30",
  "log",
  "prost 0.10.4",
@@ -9950,7 +9961,7 @@ name = "ya-runtime-api"
 version = "0.7.1"
 dependencies = [
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "env_logger 0.7.1",
  "futures 0.3.30",
  "log",
@@ -9970,7 +9981,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69e6b13e3a7d0deab2421046e7fd5b498bd30b9d51d068b3fb4e3278a48bb63f"
 dependencies = [
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "prost 0.10.4",
  "prost-build 0.10.4",
  "thiserror",
@@ -10186,7 +10197,7 @@ dependencies = [
  "async-compression",
  "async-trait",
  "awc",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "crossterm 0.26.1",
  "env_logger 0.7.1",
  "futures 0.3.30",
@@ -10342,7 +10353,7 @@ dependencies = [
  "actix-web",
  "actix-web-actors",
  "anyhow",
- "bytes 1.7.1",
+ "bytes 1.7.2",
  "env_logger 0.7.1",
  "futures 0.3.30",
  "hex",
@@ -10452,6 +10463,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
diff --git a/Cargo.toml b/Cargo.toml
index c8b4b49a6..b1ed6f229 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -278,8 +278,8 @@ ya-sb-proto = { version = "0.6.2" }
 ya-sb-util = { version = "0.5.1" }
 parking_lot = "0.12.3"
 mime = "0.3.17"
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "60327ddaaea289ecf45836c1e242e15855d71dc5" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "60327ddaaea289ecf45836c1e242e15855d71dc5" }
 
 ya-compile-time-utils.path = "utils/compile-time-utils"
 ya-manifest-utils = { path = "utils/manifest-utils" }
@@ -316,8 +316,8 @@ ya-framework-mocks.path = "test-utils/test-framework/framework-mocks"
 
 [patch.crates-io]
 ## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
+#ya-client = { git = "https://github.com/golemfactory/ya-client.git", branch = "kek/deploy-volumes" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "60327ddaaea289ecf45836c1e242e15855d71dc5" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 ethereum-tx-sign = { git = "https://github.com/golemfactory/ethereum-tx-sign.git", rev = "1164c74187a9e2947faeaea7dde104c3cdec4195" }
 graphene-sgx = { git = " https://github.com/golemfactory/graphene-rust.git", rev = "dbd993ebad7f9190410ea390a589348479af6407" }
diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml
index 10d4a064c..d697ee198 100644
--- a/exe-unit/Cargo.toml
+++ b/exe-unit/Cargo.toml
@@ -47,7 +47,7 @@ ya-utils-networking = { workspace = true, default-features = false, features = [
     "vpn",
 ] }
 ya-utils-process.workspace = true
-
+ya-utils-path.workspace =  true
 
 
 
diff --git a/exe-unit/components/mock-runtime/src/testing/exe_unit_ext.rs b/exe-unit/components/mock-runtime/src/testing/exe_unit_ext.rs
index 8559a20c2..cebfc03cd 100644
--- a/exe-unit/components/mock-runtime/src/testing/exe_unit_ext.rs
+++ b/exe-unit/components/mock-runtime/src/testing/exe_unit_ext.rs
@@ -181,7 +181,7 @@ impl ExeUnitExt for ExeUnitHandle {
                     env: Default::default(),
                     hosts: Default::default(),
                     hostname: None,
-                    volumes: vec![],
+                    volumes: None,
                 }],
             )
             .await
diff --git a/exe-unit/src/exe_unit.rs b/exe-unit/src/exe_unit.rs
index 5b8936ace..ed44fc16b 100644
--- a/exe-unit/src/exe_unit.rs
+++ b/exe-unit/src/exe_unit.rs
@@ -14,6 +14,7 @@ use ya_counters::message::GetCounters;
 use ya_counters::service::CountersService;
 
 use ya_agreement_utils::OfferTemplate;
+use ya_client_model::activity::exe_script_command::VolumeMount;
 use ya_client_model::activity::{ActivityUsage, CommandOutput, ExeScriptCommand, State, StatePair};
 use ya_core_model::activity;
 use ya_core_model::activity::local::Credentials;
@@ -320,14 +321,26 @@ impl<R: Runtime> RuntimeRef<R> {
                 volumes,
                 ..
             } => {
-                let volumes = volumes
-                    .iter()
-                    .enumerate()
-                    .map(|(idx, vol)| ContainerVolume {
-                        name: format!("vol-custom-{idx}"),
-                        path: vol.to_string(),
-                    })
-                    .collect::<Vec<_>>();
+                let volumes = if let Some(v) = &volumes {
+                    v.clone()
+                        .as_volumes()
+                        .iter()
+                        .enumerate()
+                        .filter_map(|(idx, (path, info))| {
+                            if matches!(info, VolumeMount::Host { .. }) {
+                                Some(ContainerVolume {
+                                    name: format!("vol-custom-{idx}"),
+                                    path: path.clone(),
+                                })
+                            } else {
+                                None
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                } else {
+                    Vec::new()
+                };
+
                 transfer_service.send(AddVolumes::new(volumes)).await??;
 
                 // TODO: We should pass `task_package` here not in `TransferService` initialization.
diff --git a/exe-unit/tests/test_progress.rs b/exe-unit/tests/test_progress.rs
index c87bbe439..2f71456e9 100644
--- a/exe-unit/tests/test_progress.rs
+++ b/exe-unit/tests/test_progress.rs
@@ -2,7 +2,7 @@ use futures::StreamExt;
 use std::time::Duration;
 use test_context::test_context;
 
-use ya_client_model::activity::exe_script_command::ProgressArgs;
+use ya_client_model::activity::exe_script_command::{ProgressArgs, Volumes};
 use ya_client_model::activity::{ExeScriptCommand, RuntimeEventKind, TransferArgs};
 use ya_core_model::activity;
 use ya_framework_basic::async_drop::DroppableTestContext;
@@ -67,7 +67,7 @@ async fn test_progress_reporting(ctx: &mut DroppableTestContext) -> anyhow::Resu
                 env: Default::default(),
                 hosts: Default::default(),
                 hostname: None,
-                volumes: vec!["/input".to_owned()],
+                volumes: Some(Volumes::Simple(vec!["/input".to_owned()])),
             }],
         )
         .await

From da7d14f395e7febe98bbf0f883b25f30cf4d94d3 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Thu, 19 Sep 2024 17:07:44 +0200
Subject: [PATCH 8/8] Fix problem with cfg

---
 exe-unit/tests/test_exe_unit_basic.rs | 1 -
 exe-unit/tests/test_progress.rs       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/exe-unit/tests/test_exe_unit_basic.rs b/exe-unit/tests/test_exe_unit_basic.rs
index 5c354e4b6..18444b5c6 100644
--- a/exe-unit/tests/test_exe_unit_basic.rs
+++ b/exe-unit/tests/test_exe_unit_basic.rs
@@ -9,7 +9,6 @@ use ya_framework_basic::test_dirs::cargo_binary;
 use ya_framework_basic::{resource, temp_dir};
 use ya_mock_runtime::testing::{create_exe_unit, exe_unit_config, ExeUnitExt};
 
-#[cfg_attr(not(feature = "system-test"), ignore)]
 #[test_context(DroppableTestContext)]
 #[serial_test::serial]
 async fn test_exe_unit_start_terminate(ctx: &mut DroppableTestContext) -> anyhow::Result<()> {
diff --git a/exe-unit/tests/test_progress.rs b/exe-unit/tests/test_progress.rs
index 2f71456e9..3183f2309 100644
--- a/exe-unit/tests/test_progress.rs
+++ b/exe-unit/tests/test_progress.rs
@@ -17,7 +17,6 @@ use ya_service_bus::typed as bus;
 
 /// Test if progress reporting mechanisms work on gsb level
 /// with full ExeUnit setup.
-#[cfg_attr(not(feature = "system-test"), ignore)]
 #[test_context(DroppableTestContext)]
 #[serial_test::serial]
 async fn test_progress_reporting(ctx: &mut DroppableTestContext) -> anyhow::Result<()> {