Skip to content

Commit a1171ee

Browse files
authored
Merge branch 'unstable' into remove/blinded_blocks
2 parents 3936be5 + 38a5f33 commit a1171ee

File tree

6 files changed

+261
-9
lines changed

6 files changed

+261
-9
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ clap = { version = "4.5.4", features = ["derive", "cargo", "wrap_help"] }
124124
clap_utils = { path = "common/clap_utils" }
125125
compare_fields = { path = "common/compare_fields" }
126126
compare_fields_derive = { path = "common/compare_fields_derive" }
127+
console-subscriber = "0.4"
127128
context_deserialize = { path = "consensus/context_deserialize" }
128129
context_deserialize_derive = { path = "consensus/context_deserialize_derive" }
129130
criterion = "0.5"

lighthouse/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ slasher-redb = ["slasher/redb"]
3333
beacon-node-leveldb = ["store/leveldb"]
3434
# Supports beacon node redb backend.
3535
beacon-node-redb = ["store/redb"]
36+
# Supports console subscriber for debugging
37+
console-subscriber = ["console-subscriber/default"]
3638

3739
# Deprecated. This is now enabled by default on non windows targets.
3840
jemalloc = []
@@ -45,6 +47,7 @@ bls = { workspace = true }
4547
boot_node = { path = "../boot_node" }
4648
clap = { workspace = true }
4749
clap_utils = { workspace = true }
50+
console-subscriber = { workspace = true, optional = true }
4851
database_manager = { path = "../database_manager" }
4952
directory = { workspace = true }
5053
environment = { workspace = true }

lighthouse/src/main.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,12 @@ fn run<E: EthSpec>(
663663

664664
logging_layers.push(MetricsLayer.boxed());
665665

666+
#[cfg(feature = "console-subscriber")]
667+
{
668+
let console_layer = console_subscriber::spawn();
669+
logging_layers.push(console_layer.boxed());
670+
}
671+
666672
let logging_result = tracing_subscriber::registry()
667673
.with(logging_layers)
668674
.try_init();

testing/simulator/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ edition = { workspace = true }
77

88
[dependencies]
99
clap = { workspace = true }
10-
env_logger = { workspace = true }
1110
environment = { workspace = true }
12-
eth2_network_config = { workspace = true }
1311
execution_layer = { workspace = true }
1412
futures = { workspace = true }
1513
kzg = { workspace = true }

0 commit comments

Comments
 (0)