gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ENR construction and mainnet bootnodes (#1968)

Browse Source 
## Issue Addressed

Boot nodes were being successfully created and publishing valid ENRs however the `eth2` field was not being saved to disk leading to a discrepancy between published ENR and disk ENR. 

If the `eth2` field is known, it is now constructed in the initial ENR and saved to disk. 

Previous mainnet bootnodes did not contain the `eth2` field and these have also been updated.
This commit is contained in:
Age Manning
2020-11-25 22:48:07 +00:00
parent 7b6a97e73c
commit 198c4a873d
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
boot_node/src/config.rs
View File

@@ -79,14 +79,8 @@ impl<T: EthSpec> TryFrom<&ArgMatches<'_>> for BootNodeConfig<T> {
let private_key = load_private_key(&network_config, &logger);
let local_key = CombinedKey::from_libp2p(&private_key)?;
let mut local_enr = create_enr_builder_from_config(&network_config, false)
.build(&local_key)
.map_err(|e| format!("Failed to build ENR: {:?}", e))?;
use_or_load_enr(&local_key, &mut local_enr, &network_config, &logger)?;
// build the enr_fork_id and add it to the local_enr if it exists
if let Some(config) = eth2_testnet_config.as_ref() {
let enr_fork = if let Some(config) = eth2_testnet_config.as_ref() {
let spec = config
.yaml_config
.as_ref()
@@ -103,22 +97,37 @@ impl<T: EthSpec> TryFrom<&ArgMatches<'_>> for BootNodeConfig<T> {
genesis_state.genesis_validators_root,
);
// add to the local_enr
if let Err(e) = local_enr.insert("eth2", &enr_fork.as_ssz_bytes(), &local_key) {
slog::warn!(logger, "Could not update eth2 field"; "error" => ?e);
}
Some(enr_fork.as_ssz_bytes())
} else {
slog::warn!(
logger,
"No genesis state provided. No Eth2 field added to the ENR"
);
None
}
} else {
slog::warn!(
logger,
"No testnet config provided. Not setting an eth2 field"
);
}
None
};
// Build the local ENR
let mut local_enr = {
let mut builder = create_enr_builder_from_config(&network_config, false);
// If we know of the ENR field, add it to the initial construction
if let Some(enr_fork_bytes) = enr_fork {
builder.add_value("eth2", &enr_fork_bytes);
}
builder
.build(&local_key)
.map_err(|e| format!("Failed to build ENR: {:?}", e))?
};
use_or_load_enr(&local_key, &mut local_enr, &network_config, &logger)?;
let auto_update = matches.is_present("enable-enr_auto_update");