Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ya-client to 0.8 & ya-client-model to 0.6 #2965

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Bump ya-client to 0.8 & ya-client-model to 0.6 #2965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3912a75
Bump ya-client to 0.8 & ya-client-model to 0.6
kamirr Jan 4, 2024
8bfde92
Update golem-certificates dependency
nieznanysprawiciel Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ ya-utils-networking = "0.2"
ya-fd-metrics = { path = "utils/fd-metrics" }
ya-version = "0.2"
ya-vpn = "0.2"
ya-client = "0.7"
ya-client-model = "0.5"
ya-client = "0.8"
ya-client-model = "0.6"
gftp = { workspace = true, optional = true }
# just to enable gftp build for cargo-deb
ya-provider = { version = "0.3", optional = true } # just to enable conditionally running some tests
Expand Down Expand Up @@ -238,7 +238,7 @@ trust-dns-resolver = "0.22"
derive_more = "0.99.11"
ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }

ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "785c9c4271f514d47fe18018efb9438007ae611a" }
ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "8d544dd766e14479519437d0bf4f2879e6a6de5a" }
gftp = { version = "0.4.0", path = "core/gftp" }
ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }

Expand Down Expand Up @@ -280,8 +280,9 @@ ya-sb-util = { git = "https://github.com/golemfactory/ya-service-bus.git", rev =
#ya-sb-util = { path = "../ya-service-bus/crates/util" }

## CLIENT
ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "afdc1daf1f17a5128d911f8fff9d55c4f213e9af" }
ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "afdc1daf1f17a5128d911f8fff9d55c4f213e9af" }
ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" }
ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "a3ee3cd0a5ac5c1a6022fa0f106a2d83e62844db" }
golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }

## RELAY and networking stack

Expand Down
4 changes: 2 additions & 2 deletions agent/provider/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ path = "src/main.rs"
[dependencies]
ya-agreement-utils = { workspace = true }
ya-manifest-utils = { version = "0.2" }
ya-client = { version = "0.7", features = ['cli'] }
ya-client-model = "0.5"
ya-client = { version = "0.8", features = ['cli'] }
ya-client-model = "0.6"
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ['activity', 'payment'] }
ya-file-logging = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions core/activity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
ya-core-model = { version = "0.9", features = ["activity", "market"] }
ya-client-model = { version = "0.5", features = ["sgx"] }
ya-client-model = { version = "0.6", features = ["sgx"] }
ya-net = "0.3"
ya-persistence = "0.3"
ya-service-api = "0.1"
Expand All @@ -23,7 +23,7 @@ diesel_migrations = "1.4"
env_logger = "0.7"
futures = "0.3"
hex = "0.4"
metrics="0.12"
metrics = "0.12"
lazy_static = "1.4"
libsqlite3-sys = { workspace = true }
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion core/gsb-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Golem Factory <[email protected]>"]
edition = "2018"

[dependencies]
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-persistence = "0.3"
ya-service-api = "0.1"
ya-service-api-interfaces = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion core/identity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Golem Factory <[email protected]>"]
edition = "2018"

[dependencies]
ya-client-model = { version = "0.5", features = ["with-diesel"] }
ya-client-model = { version = "0.6", features = ["with-diesel"] }
ya-core-model = { version = "^0.9", features = ["identity", "appkey"] }
ya-persistence = "0.3"
ya-service-api = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion core/market/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bcast-singleton = []

[dependencies]
ya-agreement-utils = { workspace = true }
ya-client = "0.7"
ya-client = "0.8"
ya-core-model = { version = "^0.9", features = ["market", "net"] }
ya-diesel-utils = { version = "0.1" }
ya-market-resolver = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions core/model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2018"
homepage = "https://github.com/golemfactory/yagna"
repository = "https://github.com/golemfactory/yagna"
license = "LGPL-3.0"
description="Yagna protocol messages"
keywords=["golem", "yagna"]
description = "Yagna protocol messages"
keywords = ["golem", "yagna"]

[features]
default = []
Expand Down Expand Up @@ -35,7 +35,7 @@ sgx = ['graphene-sgx']
version = []

[dependencies]
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-service-bus = "0.6.1"

bigdecimal = { version = "0.2", features = ["serde"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion core/net/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ packet-trace-enable = [
]

[dependencies]
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-core-model = { version = "^0.9", features = ["net", "identity"] }

ya-relay-client = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ thiserror = "1.0"
tokio = { version = "1", features = ["macros"] }

## yagna dependencies
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-core-model = { version = "^0.9", features = [
"driver",
"identity",
Expand Down
8 changes: 6 additions & 2 deletions core/payment-driver/dummy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ edition = "2018"
default = []

[dependencies]
ya-core-model = { version = "^0.9", features = ["driver", "identity", "payment"] }
ya-client-model = { version = "0.5" }
ya-core-model = { version = "^0.9", features = [
"driver",
"identity",
"payment",
] }
ya-client-model = { version = "0.6" }
ya-payment-driver = "0.3"
ya-persistence = "0.3"
ya-service-api-interfaces = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ url = { workspace = true }
trust-dns-resolver = { workspace = true }
## yagna dependencies
ya-payment-driver = "0.3"
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-service-api-interfaces = "0.2"
ya-utils-futures = "0.2"
ya-utils-networking = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/erc20next/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ rust_decimal = "1"

## yagna dependencies
ya-payment-driver = "0.3"
ya-client-model = "0.5"
ya-client-model = "0.6"
ya-service-api-interfaces = "0.2"
ya-utils-futures = "0.2"
ya-utils-networking = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions core/payment/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ default = []

[dependencies]
ya-agreement-utils = { workspace = true }
ya-client-model = { version = "0.5", features = ["with-diesel"] }
ya-client-model = { version = "0.6", features = ["with-diesel"] }
ya-core-model = { version = "^0.9", features = [
"activity",
"driver",
Expand Down Expand Up @@ -58,7 +58,7 @@ humantime = "2.0.1"
erc20_payment_lib = { workspace = true }

[dev-dependencies]
ya-client = "0.7"
ya-client = "0.8"
ya-dummy-driver = "0.3"
ya-erc20-driver = "0.4"
ya-erc20next-driver = "0.4"
Expand Down
9 changes: 7 additions & 2 deletions core/persistence/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ edition = "2018"

[features]
default = []
service = ["ya-service-api", "ya-service-api-interfaces", "ya-utils-process", "structopt"]
service = [
"ya-service-api",
"ya-service-api-interfaces",
"ya-utils-process",
"structopt",
]

[dependencies]
ya-client-model = { version = "0.5", features = [ "with-diesel" ] }
ya-client-model = { version = "0.6", features = ["with-diesel"] }
ya-core-model = { version = "0.9" }
ya-service-api = { version = "0.1", optional = true }
ya-service-api-interfaces = { version = "0.2", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion core/serv-api/web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Golem Factory <[email protected]>"]
edition = "2018"

[dependencies]
ya-client = "0.7"
ya-client = "0.8"
ya-core-model = { version = "^0.9", features = ["appkey"] }
ya-service-api = "0.1"
ya-service-bus = "0.6.1"
Expand Down
4 changes: 2 additions & 2 deletions core/sgx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
anyhow = "1.0"
graphene-sgx = { version = "0.3.3", features = [ "ias" ] }
ya-client-model = "0.5"
graphene-sgx = { version = "0.3.3", features = ["ias"] }
ya-client-model = "0.6"
ya-core-model = { version = "^0.9", features = ["sgx"] }
ya-service-bus = "0.6.1"
2 changes: 1 addition & 1 deletion core/version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Golem Factory <[email protected]>"]
edition = "2018"

[dependencies]
ya-client = "0.7"
ya-client = "0.8"
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ["version"] }
ya-persistence = "0.3"
Expand Down
Loading
Loading