merge conflicts

This commit is contained in:
Eitan Seri-Levi
2025-05-27 14:56:02 -07:00
358 changed files with 11552 additions and 6768 deletions

View File

@@ -661,10 +661,7 @@ pub fn get_config<E: EthSpec>(
};
}
client_config.chain.max_network_size = lighthouse_network::gossip_max_size(
spec.bellatrix_fork_epoch.is_some(),
spec.gossip_max_size as usize,
);
client_config.chain.max_network_size = spec.max_payload_size as usize;
if cli_args.get_flag("slasher") {
let slasher_dir = if let Some(slasher_dir) = cli_args.get_one::<String>("slasher-dir") {