From 17e57f509c2bb7015042d69976bd1f056fef923d Mon Sep 17 00:00:00 2001 From: lklimek <842586+lklimek@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:38:46 +0200 Subject: [PATCH] fix: nostd proto not propagated from tenderdash-abci (#62) * fix: nostd proto not propagated from tenderdash-abci * build: update ureq * chore: bump version to "0.14.0-dev.12" --- abci/Cargo.toml | 9 +++++---- proto-compiler/Cargo.toml | 4 ++-- proto/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/abci/Cargo.toml b/abci/Cargo.toml index 98ecd53..1d68b11 100644 --- a/abci/Cargo.toml +++ b/abci/Cargo.toml @@ -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" @@ -21,6 +21,7 @@ default = [ "unix", "grpc", "tracing-span", + "std", ] # docker-tests includes integration tests that require docker to be available docker-tests = ["server"] @@ -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"] @@ -43,7 +44,7 @@ required-features = ["server"] [dependencies] uuid = { version = "1.4.1", features = ["v4", "fast-rng"], optional = true } -tenderdash-proto = { path = "../proto" } +tenderdash-proto = { path = "../proto", default-features = false } bytes = { version = "1.0" } prost = { version = "0.12" } tracing = { version = "0.1", default-features = false } diff --git a/proto-compiler/Cargo.toml b/proto-compiler/Cargo.toml index d4e242e..ba65a6a 100644 --- a/proto-compiler/Cargo.toml +++ b/proto-compiler/Cargo.toml @@ -1,5 +1,5 @@ [package] -version = "0.14.0-dev.11" +version = "0.14.0-dev.12" name = "tenderdash-proto-compiler" authors = ["Informal Systems ", "Dash Core Group"] edition = "2021" @@ -14,7 +14,7 @@ prost-build = { version = "0.12" } tempfile = { version = "3.2.0" } regex = { "version" = "1.7.1" } # Use of native-tls-vendored should build vendored openssl, which is required for Alpine build -ureq = { "version" = "2.6.2" } +ureq = { "version" = "2.9.6" } zip = { version = "0.6.4", default-features = false, features = ["deflate"] } fs_extra = { version = "1.3.0" } tonic-build = { version = "0.11.0", optional = true } diff --git a/proto/Cargo.toml b/proto/Cargo.toml index e816b5b..412cf02 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -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"