Skip to content

Commit 0f47bd7

Browse files
committed
Update deps
1 parent 0fb7fc2 commit 0f47bd7

File tree

9 files changed

+1452
-1578
lines changed

9 files changed

+1452
-1578
lines changed

Cargo.lock

Lines changed: 1429 additions & 1558 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ futures = { version = "0.3.30", default-features = false }
2222
http = "1.2.0"
2323
jsonrpsee = { version = "0.25.1", features = ["tracing"] }
2424
parking_lot = "0.12.1"
25-
prost = "0.13.3"
25+
prost = "0.14.1"
2626
serde = "1.0.179"
2727
serde_json = "1.0.113"
28-
strum = { version = "0.26.3", features = ["derive"] }
28+
strum = { version = "0.27.2", features = ["derive"] }
2929
thiserror = "2.0.11"
3030
tiny-bip39 = "2.0.0"
3131
tokio = { version = "1.29.1", default-features = false, features = ["signal"] }
3232
tokio-util = "0.7.10"
33-
tonic = "0.12.3"
33+
tonic = "0.14.2"
3434
tracing = "0.1.40"
3535
tracing-subscriber = "0.3.20"
3636
utoipa = { version = "5.2.0", default-features = false }
@@ -39,12 +39,12 @@ uuid = "1.13.1"
3939
[workspace.dependencies.bip300301_enforcer_lib]
4040
default-features = false
4141
git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
42-
rev = "efc538e2b10619a2984acb197b9392cb17e05313"
42+
rev = "65ebb34f574b3e4368e3b2b1c915c85e8184b6ef"
4343

4444
[workspace.dependencies.bip300301_enforcer_integration_tests]
4545
default-features = false
4646
git = "https://github.com/LayerTwo-Labs/bip300301_enforcer"
47-
rev = "efc538e2b10619a2984acb197b9392cb17e05313"
47+
rev = "65ebb34f574b3e4368e3b2b1c915c85e8184b6ef"
4848

4949
[workspace.dependencies.l2l-openapi]
5050
git = "https://github.com/Ash-L2L/l2l-openapi"

app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tiny-bip39 = { workspace = true }
3434
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
3535
tokio-util = { workspace = true, features = ["rt"] }
3636
tonic = { workspace = true }
37-
tonic-health = "0.12.3"
37+
tonic-health = "0.14.2"
3838
# needs to line up with jsonrpsee tower version...
3939
tower = "0.5.2"
4040
tower-http = { version = "0.6.2", features = ["request-id", "trace"] }

deny.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,15 @@ confidence-threshold = 0.8
115115
exceptions = [
116116
# Each entry is the crate and version constraint, and its specific allow
117117
# list
118+
{ allow = ["CDLA-Permissive-2.0"], name = "webpki-roots", version = "1.0.4" },
119+
{ allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "0.26.11" },
120+
{ allow = ["CDLA-Permissive-2.0"], name = "webpki-root-certs", version = "1.0.4" },
118121
{ allow = ["LicenseRef-UFL-1.0", "OFL-1.1"], name = "epaint_default_fonts", version = "0.30.0" },
119122
{ allow = ["MPL-2.0"], name = "bitmaps", version = "3.2.1" },
120123
{ allow = ["MPL-2.0"], name = "imbl", version = "3.0.0" },
121124
{ allow = ["MPL-2.0"], name = "imbl-sized-chunks", version = "0.1.3" },
122125
{ allow = ["MPL-2.0"], name = "option-ext", version = "0.2.0" },
123-
{ allow = ["MPL-2.0"], name = "webpki-root-certs", version = "0.26.7" },
124126
{ allow = ["MPL-2.0"], name = "webpki-roots", version = "0.25.4" },
125-
{ allow = ["MPL-2.0"], name = "webpki-roots", version = "0.26.7" },
126127
{ allow = ["Zlib"], name = "foldhash" },
127128
{ allow = ["Zlib"], name = "slotmap", version = "1.0.7" },
128129
{ allow = ["Zlib"], name = "typewit", version = "1.11.0" },

lib/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ version.workspace = true
88

99
[build-dependencies]
1010
prost = { workspace = true }
11-
prost-build = "0.13.3"
12-
protox = "0.7.1"
13-
tonic-build = "0.12.3"
11+
prost-build = "0.14.1"
12+
protox = "0.9.0"
13+
tonic-prost-build = "0.14.2"
1414

1515
[dependencies]
1616
anyhow = { workspace = true, features = ["backtrace"] }
@@ -35,7 +35,7 @@ merkle-cbt = "0.3.2"
3535
nonempty = { version = "0.11.0", features = ["serialize"] }
3636
parking_lot = { workspace = true }
3737
prost = { workspace = true }
38-
prost-types = "0.13.3"
38+
prost-types = "0.14.1"
3939
quinn = "0.11.6"
4040
rayon = "1.7.0"
4141
rcgen = "0.13.2"
@@ -54,6 +54,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
5454
tokio-stream = { version = "0.1.15", features = ["sync"] }
5555
tokio-util = { workspace = true, features = ["rt"] }
5656
tonic = { workspace = true }
57+
tonic-prost = "0.14.2"
5758
tracing = { workspace = true }
5859
transitive = "1.0.1"
5960
utoipa = { workspace = true, features = ["macros", "non_strict_integers"] }

lib/build.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@ use std::{
55

66
use prost::Message;
77

8-
fn compile_protos_with_config<F>(
8+
fn compile_protos_with_config<F, P>(
99
file_descriptor_path: impl AsRef<Path>,
10-
protos: &[impl AsRef<Path>],
11-
includes: &[impl AsRef<Path>],
10+
protos: &[P],
11+
includes: &[P],
1212
config_fn: F,
1313
) -> Result<(), Box<dyn std::error::Error>>
1414
where
1515
F: FnOnce(
1616
&mut prost_build::Config,
1717
) -> Result<(), Box<dyn std::error::Error>>,
18+
P: AsRef<Path>,
1819
{
1920
let mut config = prost_build::Config::new();
2021
config.enable_type_names();
2122
let () = config_fn(&mut config)?;
22-
tonic_build::configure()
23+
tonic_prost_build::configure()
2324
.skip_protoc_run()
2425
.file_descriptor_set_path(file_descriptor_path)
2526
.build_transport(false)
26-
.compile_protos_with_config(config, protos, includes)?;
27+
.compile_with_config(config, protos, includes)?;
2728
Ok(())
2829
}
2930

lib/node/mainchain_task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl MainchainTaskHandle {
216216
) -> (Self, mpsc::UnboundedReceiver<Response>)
217217
where
218218
Transport: proto::Transport + Send + 'static,
219-
<Transport as tonic::client::GrpcService<tonic::body::BoxBody>>::Future:
219+
<Transport as tonic::client::GrpcService<tonic::body::Body>>::Future:
220220
Send,
221221
{
222222
let (request_tx, request_rx) = mpsc::unbounded();

lib/node/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ where
130130
mainchain::ValidatorClient<MainchainTransport>: Clone,
131131
MainchainTransport: Send + 'static,
132132
<MainchainTransport as tonic::client::GrpcService<
133-
tonic::body::BoxBody,
133+
tonic::body::Body,
134134
>>::Future: Send,
135135
{
136136
let env_path = datadir.join("data.mdb");

lib/types/proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use thiserror::Error;
44

55
/// Convenience alias to avoid writing out a lengthy trait bound
66
pub trait Transport = where
7-
Self: tonic::client::GrpcService<tonic::body::BoxBody>,
7+
Self: tonic::client::GrpcService<tonic::body::Body>,
88
Self::Error: Into<tonic::codegen::StdError>,
99
Self::ResponseBody:
1010
tonic::codegen::Body<Data = tonic::codegen::Bytes> + Send + 'static,

0 commit comments

Comments
 (0)