Skip to content

Commit 33adbc5

Browse files
committed
Merge branch 'hoodi' into interop1
2 parents d1f751a + 66f0542 commit 33adbc5

File tree

9 files changed

+21
-3
lines changed

9 files changed

+21
-3
lines changed

anchor/client/src/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub struct Node {
8888
long,
8989
global = true,
9090
value_name = "NETWORK",
91-
value_parser = vec!["mainnet", "holesky"],
91+
value_parser = vec!["mainnet", "holesky", "hoodi"],
9292
conflicts_with = "testnet_dir",
9393
help = "Name of the chain Anchor will validate.",
9494
display_order = 0,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SSV Labs
2+
enr:-Ja4QIKlyNFuFtTOnVoavqwmpgSJXfhSmhpdSDOUhf5-FBr7bBxQRvG6VrpUvlkr8MtpNNuMAkM33AseduSaOhd9IeWGAZWjRbnvgmlkgnY0gmlwhCNVVTCJc2VjcDI1NmsxoQNTTyiJPoZh502xOZpHSHAfR-94NaXLvi5J4CNHMh2tjoNzc3YBg3RjcIITioN1ZHCCD6I
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0x58410Bef803ECd7E63B23664C586A6DB72DAf59c
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1065
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
00000503

anchor/common/ssv_network_config/src/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ impl SsvNetworkConfig {
4545
let (enr_yaml, address, block, domain_type) = match name {
4646
"mainnet" => get_hardcoded!(mainnet),
4747
"holesky" => get_hardcoded!(holesky),
48+
"hoodi" => get_hardcoded!(hoodi),
4849
_ => return Ok(None),
4950
};
5051
let Some(eth2_network) = Eth2NetworkConfig::constant(name)? else {
@@ -123,6 +124,11 @@ mod tests {
123124
SsvNetworkConfig::constant("holesky").unwrap().unwrap();
124125
}
125126

127+
#[test]
128+
fn test_hoodi() {
129+
SsvNetworkConfig::constant("hoodi").unwrap().unwrap();
130+
}
131+
126132
#[test]
127133
fn test_mainnet() {
128134
SsvNetworkConfig::constant("mainnet").unwrap().unwrap();

anchor/eth/src/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl SsvEventSyncer {
165165

166166
let event_processor = EventProcessor::new(db, Mode::Keysplit);
167167

168-
// The network is enforced to be either "mainnet" or "holesky" so this will never fail.
168+
// The network is enforced to be a supported network so this will never fail.
169169
let network = match SsvNetworkConfig::constant(&network) {
170170
Ok(Some(net)) => net,
171171
// These cases should be unreachable due to type constraints, but we handle them

anchor/keysplit/src/cli.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,20 @@ pub struct Onchain {
4242
#[clap(long, help = "RPC endpoint to access L1 data", value_name = "ENDPOINT")]
4343
pub rpc: String,
4444

45-
#[clap(long, help = "Mainnet or Holesky", value_name = "NETWORK", value_enum)]
45+
#[clap(
46+
long,
47+
help = "Mainnet, Holesky or Hoodi",
48+
value_name = "NETWORK",
49+
value_enum
50+
)]
4651
pub network: Network,
4752
}
4853

4954
#[derive(clap::ValueEnum, Clone, Debug)]
5055
pub enum Network {
5156
Mainnet,
5257
Holesky,
58+
Hoodi,
5359
}
5460

5561
// Options for manual splitting

anchor/keysplit/src/split.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ pub fn onchain_split(
4949
let network = match onchain.network {
5050
Network::Mainnet => String::from("mainnet"),
5151
Network::Holesky => String::from("holesky"),
52+
Network::Hoodi => String::from("hoodi"),
5253
};
5354

5455
// Construct DB and perform sync

0 commit comments

Comments
 (0)