Skip to content

Commit ea7ba35

Browse files
authored
Merge pull request #5 from LayerTwo-Labs/2025-02-13-backport-thunder-0.11.4
Backport Thunder 0.11.4
2 parents d9817e0 + 4fd9348 commit ea7ba35

24 files changed

+1486
-1137
lines changed

Cargo.lock

+108-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
[workspace]
22
resolver = "2"
3-
members = [
4-
"app",
5-
"cli",
6-
"integration_tests",
7-
"lib",
8-
"rpc-api",
9-
]
3+
members = ["app", "cli", "integration_tests", "lib", "rpc-api"]
104

115
[workspace.package]
126
authors = [ "Ash Manning <ash@layertwolabs.com>" ]
137
edition = "2021"
148
license-file = "LICENSE.txt"
159
publish = false
16-
version = "0.11.3"
10+
version = "0.11.4"
1711

1812
[workspace.dependencies]
1913
anyhow = "1.0.72"
@@ -25,6 +19,7 @@ clap = "4.5.4"
2519
fraction = "0.14.0"
2620
futures = "0.3.30"
2721
hex = "0.4.3"
22+
http = "1.2.0"
2823
itertools = "0.14.0"
2924
jsonrpsee = { version = "0.24.7", features = ["tracing"] }
3025
parking_lot = "0.12.1"
@@ -42,6 +37,7 @@ tracing = "0.1.40"
4237
tracing-subscriber = "0.3.18"
4338
url = "2.5.4"
4439
utoipa = { version = "5.2.0", default-features = false }
40+
uuid = "1.13.1"
4541

4642
[workspace.dependencies.bip300301_enforcer_lib]
4743
default-features = false

app/Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ either = "1.13.0"
1919
fraction = { workspace = true, features = ["with-serde-support"] }
2020
futures = { workspace = true }
2121
hex = { workspace = true }
22+
http = { workspace = true }
2223
human-size = "0.4.3"
2324
itertools = { workspace = true }
2425
include_path = "0.1.1"
@@ -37,11 +38,15 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
3738
tokio-util = { workspace = true, features = ["rt"] }
3839
tonic = { workspace = true }
3940
tonic-health = "0.12.3"
41+
# needs to line up with jsonrpsee tower version...
42+
tower = "0.4.13"
43+
tower-http = { version = "0.6.2", features = ["request-id", "trace"] }
4044
tracing = { workspace = true }
4145
tracing-appender = "0.2.3"
4246
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
4347
url = { workspace = true }
4448
utoipa = { workspace = true }
49+
uuid = { workspace = true, features = ["v4"] }
4550

4651
[dependencies.libes]
4752
version = "0.9.1"

app/gui/console_logs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ impl ConsoleLogs {
7171
command,
7272
self.rpc_url.clone(),
7373
None,
74+
None,
7475
);
7576
app.runtime.spawn({
7677
let running_command = self.running_command.clone();

0 commit comments

Comments
 (0)