Skip to content

Commit

Permalink
bump ya-core-model to 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kamirr committed Aug 21, 2024
1 parent 7fdaff5 commit ffe68eb
Show file tree
Hide file tree
Showing 22 changed files with 94 additions and 173 deletions.
166 changes: 39 additions & 127 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ path = "core/serv/src/main.rs"
[dependencies]
ya-activity = "0.4"
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9" }
ya-core-model = { version = "0.10" }
ya-dummy-driver = { version = "0.3", optional = true }
ya-file-logging = "0.1"
ya-gsb-api = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion agent/provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ya-manifest-utils = { version = "0.2" }
ya-client = { workspace = true, features = ['cli'] }
ya-client-model.workspace = true
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ['activity', 'payment'] }
ya-core-model = { version = "0.10", features = ['activity', 'payment'] }
ya-file-logging = "0.1"
ya-utils-actix = "0.2"
ya-utils-cli = "0.1"
Expand Down
2 changes: 1 addition & 1 deletion core/activity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Golem Factory <contact@golem.network>"]
edition = "2018"

[dependencies]
ya-core-model = { version = "0.9", features = ["activity", "market"] }
ya-core-model = { version = "0.10", features = ["activity", "market"] }
ya-client-model = { workspace = true, features = ["sgx"] }
ya-net = "0.3"
ya-persistence = "0.3"
Expand Down
14 changes: 7 additions & 7 deletions core/gftp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ edition = "2018"
homepage = "https://github.com/golemfactory/yagna"
repository = "https://github.com/golemfactory/yagna"
license = "LGPL-3.0"
description="Golem File Transfer Protocol"
keywords=["golem", "yagna"]
description = "Golem File Transfer Protocol"
keywords = ["golem", "yagna"]

[features]
default=[]
bin=['env_logger', 'dotenv']
default = []
bin = ['env_logger', 'dotenv']

[[bin]]
name="gftp"
required-features=['bin']
name = "gftp"
required-features = ['bin']

[dependencies]
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ["gftp", "identity", "net"] }
ya-core-model = { version = "0.10", features = ["gftp", "identity", "net"] }
ya-service-bus = { workspace = true }

actix-rt = "2.7"
Expand Down
2 changes: 1 addition & 1 deletion core/gsb-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bytes = "1"
tokio = { version = "1", features = ["macros"] }

[dev-dependencies]
ya-core-model = { version = "^0.9", features = ["gftp"] }
ya-core-model = { version = "0.10", features = ["gftp"] }

actix-test = "0.1"
awc = "3"
Expand Down
2 changes: 1 addition & 1 deletion core/identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"

[dependencies]
ya-client-model = { workspace = true, features = ["with-diesel"] }
ya-core-model = { version = "^0.9", features = ["identity", "appkey"] }
ya-core-model = { version = "0.10", features = ["identity", "appkey"] }
ya-persistence = "0.3"
ya-service-api = "0.1"
ya-service-api-interfaces = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions core/market/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ bcast-singleton = []
[dependencies]
ya-agreement-utils = { workspace = true }
ya-client.workspace = true
ya-core-model = { version = "^0.9", features = ["market", "net"] }
ya-core-model = { version = "0.10", features = ["market", "net"] }
ya-diesel-utils = { version = "0.1" }
ya-market-resolver = "0.2"
ya-net = "0.3"
ya-persistence = "0.3"
ya-service-api = "0.1"
ya-service-api-interfaces = "0.2"
ya-service-api-web = "0.2"
ya-service-bus = { workspace = true }
ya-service-bus = { workspace = true }
ya-std-utils = "0.1"
ya-utils-actix = "0.2"
parking_lot.workspace = true
tracing = { version = "0.1.40", features=["log"] }
tracing = { version = "0.1.40", features = ["log"] }
bincode = "1.3.3"

actix = { version = "0.13", default-features = false }
Expand Down
12 changes: 7 additions & 5 deletions core/metrics/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
name = "ya-metrics"
version = "0.2.0"
description="Yagna metrics service"
keywords=["golem", "yagna", "metrics"]
description = "Yagna metrics service"
keywords = ["golem", "yagna", "metrics"]
authors = ["Golem Factory <contact@golem.network>"]
edition = "2018"
homepage = "https://github.com/golemfactory/yagna"
repository = "https://github.com/golemfactory/yagna"
license = "LGPL-3.0"

[dependencies]
ya-core-model = { version = "^0.9", features = ["identity"] }
ya-core-model = { version = "0.10", features = ["identity"] }
ya-service-api = "0.1"
ya-service-api-interfaces = "0.2"
ya-service-bus = { workspace = true }
ya-service-bus = { workspace = true }

awc = "3"
actix-web = { version = "4", features = ["openssl"] }
Expand All @@ -24,7 +24,9 @@ lazy_static = "1.4"
log = "0.4"
metrics = "0.16"
metrics-core = "0.5.2"
metrics-runtime = { version = "0.13.1", default-features = false, features = ["observers"] }
metrics-runtime = { version = "0.13.1", default-features = false, features = [
"observers",
] }
percent-encoding = "2.1.0"
structopt = "0.3"
tokio = { version = "1", features = ["time", "sync"] }
Expand Down
2 changes: 1 addition & 1 deletion core/net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ packet-trace-enable = [

[dependencies]
ya-client-model.workspace = true
ya-core-model = { version = "^0.9", features = ["net", "identity"] }
ya-core-model = { version = "0.10", features = ["net", "identity"] }

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

## yagna dependencies
ya-client-model.workspace = true
ya-core-model = { version = "^0.9", features = [
ya-core-model = { version = "0.10", features = [
"driver",
"identity",
"payment",
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/dummy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
default = []

[dependencies]
ya-core-model = { version = "^0.9", features = [
ya-core-model = { version = "0.10", features = [
"driver",
"identity",
"payment",
Expand Down
2 changes: 1 addition & 1 deletion core/payment-driver/erc20/Cargo.toml
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-core-model = { version = "0.9" }
ya-core-model = { version = "0.10" }
ya-client-model.workspace = true
ya-service-api-interfaces = "0.2"
ya-utils-futures = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion core/payment/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default = []
[dependencies]
ya-agreement-utils = { workspace = true }
ya-client-model = { workspace = true, features = ["with-diesel"] }
ya-core-model = { version = "^0.9", features = [
ya-core-model = { version = "0.10", features = [
"activity",
"driver",
"identity",
Expand Down
2 changes: 1 addition & 1 deletion core/persistence/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ service = [

[dependencies]
ya-client-model = { workspace = true, features = ["with-diesel"] }
ya-core-model = { version = "0.9" }
ya-core-model = { version = "0.10" }
ya-service-api = { version = "0.1", optional = true }
ya-service-api-interfaces = { version = "0.2", optional = true }
ya-utils-process = { version = "0.2", features = ["lock"], optional = true }
Expand Down
4 changes: 2 additions & 2 deletions core/serv-api/web/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ edition = "2018"

[dependencies]
ya-client.workspace = true
ya-core-model = { version = "^0.9", features = ["appkey"] }
ya-core-model = { version = "0.10", features = ["appkey"] }
ya-service-api = "0.1"
ya-service-bus = { workspace = true }
ya-service-bus = { workspace = true }

actix-cors = "0.6"
actix-service = "2"
Expand Down
6 changes: 3 additions & 3 deletions core/sgx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
graphene-sgx = { version = "0.3.3", features = ["ias"] }
ya-client-model.workspace = true
ya-core-model = { version = "^0.9", features = ["sgx"] }
ya-service-bus = { workspace = true }
ya-client-model.workspace = true
ya-core-model = { version = "0.10", features = ["sgx"] }
ya-service-bus = { workspace = true }
4 changes: 2 additions & 2 deletions core/version/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ edition = "2018"
[dependencies]
ya-client.workspace = true
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ["version"] }
ya-core-model = { version = "0.10", features = ["version"] }
ya-persistence = "0.3"
ya-service-api = "0.1"
ya-service-api-interfaces = "0.2"
ya-service-bus = { workspace = true }
ya-service-bus = { workspace = true }

actix-web = "4"
anyhow = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion core/vpn/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Golem Factory <contact@golem.network>"]
edition = "2018"

[dependencies]
ya-core-model = { version = "^0.9", features = ["activity", "market"] }
ya-core-model = { version = "0.10", features = ["activity", "market"] }
ya-client-model = { workspace = true, features = ["sgx"] }
ya-net = "0.3"
ya-persistence = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions exe-unit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ winapi = { version = "0.3.8", features = ["jobapi2", "processthreadsapi"] }
[dependencies]
ya-agreement-utils = { workspace = true }
ya-manifest-utils = { version = "0.2" }
ya-client-model.workspace = true
ya-client-model.workspace = true
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features = ["activity", "appkey"] }
ya-core-model = { version = "0.10", features = ["activity", "appkey"] }
ya-runtime-api = { version = "0.7", path = "runtime-api", features = [
"server",
] }
Expand Down
25 changes: 16 additions & 9 deletions golem_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ edition = "2018"
[dependencies]
ya-client = { version = "0.8", features = ['cli'] }
ya-compile-time-utils = "0.2"
ya-core-model = { version = "^0.9", features=["payment", "version"] }
ya-core-model = { version = "0.10", features = ["payment", "version"] }
ya-provider = "0.3"
ya-utils-path = "0.1.0"
ya-utils-process = { version = "0.2", features = ["lock"] }

actix-rt="2.7"
ansi_term="0.12.1"
actix-rt = "2.7"
ansi_term = "0.12.1"
anyhow = "1.0"
bigdecimal = "0.2"
byte-unit = "4.0"
chrono = { version = "0.4", features=["serde"] }
crossterm="0.23"
chrono = { version = "0.4", features = ["serde"] }
crossterm = "0.23"
directories = "2.0.2"
dotenv = "0.15"
env_logger = "0.7"
Expand All @@ -29,16 +29,23 @@ log = "0.4"
names = "0.10.0"
prettytable-rs = "0.10.0"
promptly = "0.3.0"
rustyline="6.3.0"
rustyline = "6.3.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
strip-ansi-escapes = "0.1"
structopt = "0.3"
strum = { workspace = true }
strum_macros = "0.24"
tokio = { version = "1", features = ["process", "signal", "time", "io-util", "io-std", "macros"] }
tokio = { version = "1", features = [
"process",
"signal",
"time",
"io-util",
"io-std",
"macros",
] }
url = "2.1"

[target.'cfg(target_family = "unix")'.dependencies]
libc="0.2.73"
nix="0.22.0"
libc = "0.2.73"
nix = "0.22.0"
2 changes: 1 addition & 1 deletion utils/transfer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"

[dependencies]
ya-client-model.workspace = true
ya-core-model = { version = "^0.9" }
ya-core-model = { version = "0.10" }
ya-service-bus = { workspace = true }
ya-utils-path = "0.1"
gftp = { workspace = true }
Expand Down

0 comments on commit ffe68eb

Please sign in to comment.