update ya-client to 0.7

golemfactory · Jun 20, 2024 · 64cdac0 · 64cdac0
1 parent 1bc7baf
commit 64cdac0
Show file tree

Hide file tree

Showing 23 changed files with 864 additions and 828 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,8 +58,8 @@ ya-utils-networking = "0.2"
 ya-fd-metrics = { path = "utils/fd-metrics" }
 ya-version = "0.2"
 ya-vpn = "0.2"
-ya-client = "0.8"
-ya-client-model = "0.6"
+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
@@ -246,12 +246,14 @@ strum = { version = "0.24", features = ["derive"] }
 trust-dns-resolver = "0.22"
 url = "2.3.1"
 ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }
-ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "598c817f1c9f8a26ed1236d38d430f65889da03e" }
+ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "7d6bd1c0354223b1a3efceff281120956ca61486" }
 #ya-relay-client = { path = "../ya-relay/client" }
 ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }
 ya-service-bus = { version = "0.7.1" }
 parking_lot = "0.12.3"
 mime = "0.3.17"
+ya-client = "0.9"
+ya-client-model = "0.7"
 
 [patch.crates-io]
 ## SERVICES
@@ -278,10 +280,10 @@ 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 = "57dc4808f9db63ce20e4e7b799fd6a1613610d0a" }
+#ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "57dc4808f9db63ce20e4e7b799fd6a1613610d0a" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "57dc4808f9db63ce20e4e7b799fd6a1613610d0a" }
-#ya-client-model = { path = "../ya-client/model" }
+#ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "v0.7.0" }
+#ya-client-model = "0.7"
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 
 ## RELAY and networking stack

diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml
@@ -15,8 +15,8 @@ path = "src/main.rs"
 [dependencies]
 ya-agreement-utils = { workspace = true }
 ya-manifest-utils = { version = "0.2" }
-ya-client = { version = "0.8", features = ['cli'] }
-ya-client-model = "0.6"
+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-file-logging = "0.1"
@@ -90,4 +90,4 @@ pretty_assertions = "1.3"
 ya-manifest-test-utils = "0.1"
 
 [lints]
-workspace = true
+workspace = true
diff --git a/agent/provider/src/rules.rs b/agent/provider/src/rules.rs
@@ -340,7 +340,7 @@ impl RulesManager {
             .verify_node_descriptor(node_descriptor)
             .map_err(|e| anyhow!("Partner {e}"))?;
 
-        if requestor_id != node_descriptor.node_id {
+        if AsRef::<[u8]>::as_ref(&requestor_id) != AsRef::<[u8]>::as_ref(&node_descriptor.node_id) {
             return Err(anyhow!(
                 "Partner rule nodes mismatch. requestor node_id: {requestor_id} but cert node_id: {}",
                 node_descriptor.node_id

diff --git a/core/activity/Cargo.toml b/core/activity/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 ya-core-model = { version = "0.9", features = ["activity", "market"] }
-ya-client-model = { version = "0.6", features = ["sgx"] }
+ya-client-model = { workspace = true, features = ["sgx"] }
 ya-net = "0.3"
 ya-persistence = "0.3"
 ya-service-api = "0.1"

diff --git a/core/gsb-api/Cargo.toml b/core/gsb-api/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-persistence = "0.3"
 ya-service-api = "0.1"
 ya-service-api-interfaces = "0.2"

diff --git a/core/identity/Cargo.toml b/core/identity/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = { version = "0.6", features = ["with-diesel"] }
+ya-client-model = { workspace = true, features = ["with-diesel"] }
 ya-core-model = { version = "^0.9", features = ["identity", "appkey"] }
 ya-persistence = "0.3"
 ya-service-api = "0.1"
@@ -49,4 +49,4 @@ dotenv = "0.15"
 env_logger = "0.7.1"
 
 [lints]
-workspace = true
+workspace = true
diff --git a/core/market/Cargo.toml b/core/market/Cargo.toml
@@ -11,7 +11,7 @@ bcast-singleton = []
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-client = "0.8"
+ya-client.workspace = true
 ya-core-model = { version = "^0.9", features = ["market", "net"] }
 ya-diesel-utils = { version = "0.1" }
 ya-market-resolver = "0.2"

diff --git a/core/model/Cargo.toml b/core/model/Cargo.toml
@@ -35,7 +35,7 @@ sgx = ['graphene-sgx']
 version = []
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-service-bus = { workspace = true }
 
 bigdecimal = { version = "0.2", features = ["serde"], optional = true }

diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml
@@ -15,7 +15,7 @@ packet-trace-enable = [
 ]
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-core-model = { version = "^0.9", features = ["net", "identity"] }
 
 ya-relay-client = { workspace = true }

diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml
@@ -29,7 +29,7 @@ thiserror = "1.0"
 tokio = { version = "1", features = ["macros"] }
 
 ## yagna dependencies
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-core-model = { version = "^0.9", features = [
     "driver",
     "identity",

diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml
@@ -13,7 +13,7 @@ ya-core-model = { version = "^0.9", features = [
     "identity",
     "payment",
 ] }
-ya-client-model = { version = "0.6" }
+ya-client-model.workspace = true
 ya-payment-driver = "0.3"
 ya-persistence = "0.3"
 ya-service-api-interfaces = "0.2"

diff --git a/core/payment-driver/erc20/Cargo.toml b/core/payment-driver/erc20/Cargo.toml
@@ -44,7 +44,7 @@ rust_decimal = "1"
 ## yagna dependencies
 ya-payment-driver = "0.3"
 ya-core-model = { version = "0.9" }
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-service-api-interfaces = "0.2"
 ya-utils-futures = "0.2"
 ya-utils-networking = "0.2"

diff --git a/core/payment/Cargo.toml b/core/payment/Cargo.toml
@@ -9,7 +9,7 @@ default = []
 
 [dependencies]
 ya-agreement-utils = { workspace = true }
-ya-client-model = { version = "0.6", features = ["with-diesel"] }
+ya-client-model = { workspace = true, features = ["with-diesel"] }
 ya-core-model = { version = "^0.9", features = [
     "activity",
     "driver",

diff --git a/core/persistence/Cargo.toml b/core/persistence/Cargo.toml
@@ -14,7 +14,7 @@ service = [
 ]
 
 [dependencies]
-ya-client-model = { version = "0.6", features = ["with-diesel"] }
+ya-client-model = { workspace = true, features = ["with-diesel"] }
 ya-core-model = { version = "0.9" }
 ya-service-api = { version = "0.1", optional = true }
 ya-service-api-interfaces = { version = "0.2", optional = true }

diff --git a/core/serv-api/web/Cargo.toml b/core/serv-api/web/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client = "0.8"
+ya-client.workspace = true
 ya-core-model = { version = "^0.9", features = ["appkey"] }
 ya-service-api = "0.1"
 ya-service-bus = {  workspace  = true }

diff --git 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 = "0.6"
+ya-client-model.workspace  = true
 ya-core-model = { version = "^0.9", features = ["sgx"] }
 ya-service-bus = {  workspace = true }
diff --git a/core/version/Cargo.toml b/core/version/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client = "0.8"
+ya-client.workspace = true
 ya-compile-time-utils = "0.2"
 ya-core-model = { version = "^0.9", features = ["version"] }
 ya-persistence = "0.3"

diff --git a/core/vpn/Cargo.toml b/core/vpn/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 ya-core-model = { version = "^0.9", features = ["activity", "market"] }
-ya-client-model = { version = "0.6", features = ["sgx"] }
+ya-client-model = { workspace = true, features = ["sgx"] }
 ya-net = "0.3"
 ya-persistence = "0.3"
 ya-service-api = "0.1"

diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml
@@ -38,7 +38,7 @@ winapi = { version = "0.3.8", features = ["jobapi2", "processthreadsapi"] }
 [dependencies]
 ya-agreement-utils = { workspace = true }
 ya-manifest-utils = { version = "0.2" }
-ya-client-model = "0.6"
+ya-client-model.workspace  = true
 ya-compile-time-utils = "0.2"
 ya-core-model = { version = "^0.9", features = ["activity", "appkey"] }
 ya-runtime-api = { version = "0.7", path = "runtime-api", features = [
@@ -113,4 +113,4 @@ shell-words = "1.0.0"
 tempdir = "0.3.7"
 
 [lints]
-workspace = true
+workspace = true
diff --git a/utils/agreement-utils/Cargo.toml b/utils/agreement-utils/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["golem", "yagna"]
 default = []
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 
 chrono = "0.4"
 regex = "1.5.4"

diff --git a/utils/manifest-utils/Cargo.toml b/utils/manifest-utils/Cargo.toml
@@ -22,7 +22,7 @@ schema = ["schemars"]
 [dependencies]
 ya-agreement-utils = { workspace = true }
 ya-utils-path = "0.1"
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 golem-certificate = "0.1.1"
 
 regex = "1.5"
@@ -61,4 +61,4 @@ ya-manifest-test-utils = "0.1"
 openssl = { version = "0.10", features = ["vendored"] }
 
 [lints]
-workspace = true
+workspace = true
diff --git a/utils/transfer/Cargo.toml b/utils/transfer/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model.workspace = true
 ya-core-model = { version = "^0.9" }
 ya-service-bus = { workspace = true }
 ya-utils-path = "0.1"