Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into chore/updateVersions
Browse files Browse the repository at this point in the history
  • Loading branch information
lklimek committed Apr 9, 2024
2 parents 34bc8fd + 17e57f5 commit d6cb088
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
16 changes: 11 additions & 5 deletions abci/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
version = "0.14.0-dev.11"
version = "0.14.0-dev.12"
name = "tenderdash-abci"
edition = "2021"
license = "Apache-2.0"
Expand All @@ -21,6 +21,7 @@ default = [
"unix",
"grpc",
"tracing-span",
"std",
]
# docker-tests includes integration tests that require docker to be available
docker-tests = ["server"]
Expand All @@ -30,8 +31,8 @@ server = [
"dep:tokio-util",
"dep:futures",
]

grpc = ["tenderdash-proto/grpc"]
std = ["tenderdash-proto/std"]
grpc = ["std", "tenderdash-proto/grpc"]
crypto = ["dep:lhash"]
tcp = ["server"]
unix = ["server"]
Expand All @@ -43,7 +44,7 @@ required-features = ["server"]

[dependencies]
uuid = { version = "1.8.0", features = ["v4", "fast-rng"], optional = true }
tenderdash-proto = { path = "../proto" }
tenderdash-proto = { path = "../proto", default-features = false }
bytes = { version = "1.6.0" }
prost = { version = "0.12.4" }
tracing = { version = "0.1.40", default-features = false }
Expand Down Expand Up @@ -76,7 +77,12 @@ bincode = { version = "2.0.0-rc.3" }
blake2 = { version = "0.10.6" }
bollard = { version = "0.16.1" }
futures = { version = "0.3.30" }
tokio = { version = "1.37.0", features = ["macros", "signal", "time", "io-std"] }
tokio = { version = "1.37.0", features = [
"macros",
"signal",
"time",
"io-std",
] }
hex = { version = "0.4.3" }
lazy_static = { version = "1.4.0" }
# For tests of gRPC server
Expand Down
2 changes: 1 addition & 1 deletion proto-compiler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
version = "0.14.0-dev.11"
version = "0.14.0-dev.12"
name = "tenderdash-proto-compiler"
authors = ["Informal Systems <[email protected]>", "Dash Core Group"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion proto/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
version = "0.14.0-dev.11"
version = "0.14.0-dev.12"
name = "tenderdash-proto"
edition = "2021"
license = "Apache-2.0"
Expand Down

0 comments on commit d6cb088

Please sign in to comment.