Skip to content

Commit 3ea6b36

Browse files
committed
Merge remote-tracking branch 'origin/unstable' into mahhouk-repro
2 parents 68223a6 + c1f94d9 commit 3ea6b36

File tree

156 files changed

+4624
-10099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+4624
-10099
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/beacon_node/network/ @jxs
22
/beacon_node/lighthouse_network/ @jxs
3+
/beacon_node/store/ @michaelsproul

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ members = [
66
"beacon_node/beacon_processor",
77
"beacon_node/builder_client",
88
"beacon_node/client",
9-
"beacon_node/eth1",
109
"beacon_node/execution_layer",
1110
"beacon_node/genesis",
1211
"beacon_node/http_api",
@@ -72,7 +71,6 @@ members = [
7271
"slasher",
7372
"slasher/service",
7473
"testing/ef_tests",
75-
"testing/eth1_test_rig",
7674
"testing/execution_engine_integration",
7775
"testing/node_test_rig",
7876
"testing/simulator",
@@ -138,8 +136,6 @@ doppelganger_service = { path = "validator_client/doppelganger_service" }
138136
either = "1.9"
139137
env_logger = "0.9"
140138
environment = { path = "lighthouse/environment" }
141-
eth1 = { path = "beacon_node/eth1" }
142-
eth1_test_rig = { path = "testing/eth1_test_rig" }
143139
eth2 = { path = "common/eth2" }
144140
eth2_config = { path = "common/eth2_config" }
145141
eth2_key_derivation = { path = "crypto/eth2_key_derivation" }

account_manager/src/validator/slashing_protection.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pub fn cli_run<E: EthSpec>(
9090
let slashing_protection_database =
9191
SlashingDatabase::open_or_create(&slashing_protection_db_path).map_err(|e| {
9292
format!(
93-
"Unable to open database at {}: {:?}",
93+
"Unable to open slashing protection database at {}: {:?}",
9494
slashing_protection_db_path.display(),
9595
e
9696
)
@@ -198,7 +198,7 @@ pub fn cli_run<E: EthSpec>(
198198
let slashing_protection_database = SlashingDatabase::open(&slashing_protection_db_path)
199199
.map_err(|e| {
200200
format!(
201-
"Unable to open database at {}: {:?}",
201+
"Unable to open slashing protection database at {}: {:?}",
202202
slashing_protection_db_path.display(),
203203
e
204204
)

beacon_node/beacon_chain/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ alloy-primitives = { workspace = true }
1919
bitvec = { workspace = true }
2020
bls = { workspace = true }
2121
derivative = { workspace = true }
22-
eth1 = { workspace = true }
2322
eth2 = { workspace = true }
2423
eth2_network_config = { workspace = true }
2524
ethereum_hashing = { workspace = true }

0 commit comments

Comments
 (0)