logos-co
/
nomos-node
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update overwatch version

This commit is contained in:
Al Liu 2023-11-08 16:00:26 +08:00
parent ccc85904d9
commit f6ea2fa59f
No known key found for this signature in database
GPG Key ID: C8AE9A6E0166923E
14 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodes/mixnode/Cargo.toml
View File

@ -9,8 +9,8 @@ mixnet-node = { path = "../../mixnet/node" }
nomos-log = { path = "../../nomos-services/log" }
clap = { version = "4", features = ["derive"] }
color-eyre = "0.6.0"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
serde = "1"
serde_yaml = "0.9"
tracing = "0.1"

10
nodes/nomos-node-api/Cargo.toml
View File

@ -9,8 +9,8 @@ axum = ["dep:axum", "dep:hyper", "utoipa-swagger-ui/axum"]
[dependencies]
async-trait = "0.1"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
tracing = "0.1"
@ -19,7 +19,11 @@ nomos-core = { path = "../../nomos-core" }
nomos-consensus = { path = "../../nomos-services/consensus" }
nomos-network = { path = "../../nomos-services/network" }
nomos-da = { path = "../../nomos-services/data-availability" }
nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p", "openapi"] }
nomos-mempool = { path = "../../nomos-services/mempool", features = [
"mock",
"libp2p",
"openapi",
] }
nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] }
nomos-libp2p = { path = "../../nomos-libp2p" }
full-replication = { path = "../../nomos-da/full-replication" }

17
nodes/nomos-node/Cargo.toml
View File

@ -14,19 +14,26 @@ chrono = "0.4"
futures = "0.3"
http = "0.2.9"
hex = "0.4.3"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
tracing = "0.1"
multiaddr = "0.18"
nomos-core = { path = "../../nomos-core" }
nomos-network = { path = "../../nomos-services/network", features = ["libp2p"] }
nomos-log = { path = "../../nomos-services/log" }
nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p"] }
nomos-mempool = { path = "../../nomos-services/mempool", features = [
"mock",
"libp2p",
] }
nomos-http = { path = "../../nomos-services/http", features = ["http"] }
nomos-consensus = { path = "../../nomos-services/consensus", features = ["libp2p"] }
nomos-consensus = { path = "../../nomos-services/consensus", features = [
"libp2p",
] }
nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] }
nomos-libp2p = { path = "../../nomos-libp2p" }
nomos-da = { path = "../../nomos-services/data-availability", features = ["libp2p"] }
nomos-da = { path = "../../nomos-services/data-availability", features = [
"libp2p",
] }
nomos-system-sig = { path = "../../nomos-services/system-sig" }
metrics = { path = "../../nomos-services/metrics", optional = true }
tracing-subscriber = "0.3"

14
nomos-cli/Cargo.toml
View File

@ -11,17 +11,19 @@ fraction = "0.13"
tracing = "0.1"
tracing-subscriber = "0.3"
async-trait = "0.1"
clap = {version = "4", features = ["derive"] }
clap = { version = "4", features = ["derive"] }
consensus-engine = { path = "../consensus-engine" }
serde_yaml = "0.9"
futures = "0.3"
tokio = { version = "1", features = ["sync"] }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
nomos-network = { path = "../nomos-services/network", features = ["libp2p"] }
nomos-da = { path = "../nomos-services/data-availability", features = ["libp2p"] }
nomos-da = { path = "../nomos-services/data-availability", features = [
"libp2p",
] }
nomos-consensus = { path = "../nomos-services/consensus" }
nomos-libp2p = { path = "../nomos-libp2p"}
nomos-libp2p = { path = "../nomos-libp2p" }
nomos-core = { path = "../nomos-core" }
nomos-node = { path = "../nodes/nomos-node" }
full-replication = { path = "../nomos-da/full-replication" }
@ -30,4 +32,4 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
hex = "0.4.3"
once_cell = "1"
once_cell = "1"

2
nomos-services/consensus/Cargo.toml
View File

@ -14,7 +14,7 @@ futures = "0.3"
nomos-network = { path = "../network" }
nomos-mempool = { path = "../mempool" }
nomos-core = { path = "../../nomos-core" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
nomos-storage = { path = "../storage" }
rand_chacha = "0.3"
rand = "0.8"

4
nomos-services/data-availability/Cargo.toml
View File

@ -11,11 +11,11 @@ futures = "0.3"
moka = { version = "0.11", features = ["future"] }
nomos-core = { path = "../../nomos-core" }
nomos-network = { path = "../network" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
serde = "1.0"
tracing = "0.1"
tokio = { version = "1", features = ["sync", "macros"] }
tokio-stream = "0.1"
[features]
libp2p = ["nomos-network/libp2p"]
libp2p = ["nomos-network/libp2p"]

6
nomos-services/http/Cargo.toml
View File

@ -25,14 +25,14 @@ clap = { version = "4", features = ["derive", "env"], optional = true }
futures = "0.3"
http = "0.2.9"
hyper = { version = "0.14", optional = true }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
parking_lot = { version = "0.12", optional = true }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", optional = true }
thiserror = "1"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["json"] }
tracing-subscriber = { version = "0.3", features = ["json"] }
tower = { version = "0.4", optional = true }
tower-http = { version = "0.3", features = ["cors", "trace"] }
tokio = { version = "1", features = ["sync", "macros"] }

4
nomos-services/log/Cargo.toml
View File

@ -7,10 +7,10 @@ edition = "2021"
[dependencies]
async-trait = "0.1"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
serde = { version = "1.0", features = ["derive"] }
tracing = "0.1"
tracing-appender = "0.2"
tracing-subscriber = { version = "0.3", features = ["json"] }
tracing-subscriber = { version = "0.3", features = ["json"] }
tracing-gelf = "0.7"
futures = "0.3"

4
nomos-services/mempool/Cargo.toml
View File

@ -12,7 +12,7 @@ futures = "0.3"
linked-hash-map = { version = "0.5.6", optional = true }
nomos-network = { path = "../network" }
nomos-core = { path = "../../nomos-core" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
rand = { version = "0.8", optional = true }
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
@ -26,7 +26,7 @@ serde_json = { version = "1", optional = true }
[dev-dependencies]
nomos-log = { path = "../log" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
tokio = { version = "1", features = ["full"] }
blake2 = "0.10"

6
nomos-services/metrics/Cargo.toml
View File

@ -16,8 +16,8 @@ bytes = "1.3"
clap = { version = "4", features = ["derive", "env"], optional = true }
futures = "0.3"
nomos-http = { path = "../http", optional = true }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
overwatch-derive = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
once_cell = "1.16"
parking_lot = "0.12"
prometheus = "0.13"
@ -25,7 +25,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["sync", "macros", "time"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] }
tracing-subscriber = { version = "0.3", features = ["json", "env-filter"] }
tower-http = { version = "0.3", features = ["cors", "trace"], optional = true }
thiserror = "1"

4
nomos-services/network/Cargo.toml
View File

@ -8,7 +8,7 @@ async-trait = "0.1"
bytes = "1.2"
chrono = { version = "0.4", optional = true }
humantime-serde = { version = "1", optional = true }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
multiaddr = "0.15"
serde = { version = "1.0", features = ["derive"] }
sscanf = { version = "0.4", optional = true }
@ -34,4 +34,4 @@ tokio = { version = "1", features = ["full"] }
default = []
libp2p = ["nomos-libp2p", "rand", "humantime-serde"]
mock = ["rand", "chrono"]
openapi = ["dep:utoipa", "serde_json",]
openapi = ["dep:utoipa", "serde_json"]

2
nomos-services/storage/Cargo.toml
View File

@ -10,7 +10,7 @@ async-trait = "0.1"
futures = "0.3"
tokio = { version = "1", features = ["sync"] }
bytes = "1.2"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
serde = "1.0"
sled = { version = "0.34", optional = true }
thiserror = "1.0"

2
nomos-services/system-sig/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
async-trait = "0.1"
async-ctrlc = "1.2"
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
tokio = "1.33.0"
log = "0.4.20"
futures = "0.3.28"

9
tests/Cargo.toml
View File

@ -7,13 +7,16 @@ publish = false
[dependencies]
nomos-node = { path = "../nodes/nomos-node", default-features = false }
nomos-consensus = { path = "../nomos-services/consensus" }
nomos-network = { path = "../nomos-services/network", features = ["libp2p"]}
nomos-network = { path = "../nomos-services/network", features = ["libp2p"] }
nomos-log = { path = "../nomos-services/log" }
nomos-http = { path = "../nomos-services/http", features = ["http"] }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" }
overwatch-rs = { git = "https://github.com/logos-co/Overwatch", branch = "concrete-error" }
nomos-core = { path = "../nomos-core" }
consensus-engine = { path = "../consensus-engine", features = ["serde"] }
nomos-mempool = { path = "../nomos-services/mempool", features = ["mock", "libp2p"] }
nomos-mempool = { path = "../nomos-services/mempool", features = [
"mock",
"libp2p",
] }
nomos-da = { path = "../nomos-services/data-availability" }
full-replication = { path = "../nomos-da/full-replication" }
mixnode = { path = "../nodes/mixnode" }