cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Deneb review suggestions (#4678)

Browse Source 
* Increase resolution for single lookup delay

* Remove code duplication

* Remove trusted setup code duplication
This commit is contained in:
Paul Hauner 2023-09-06 05:49:11 +10:00 committed by GitHub
parent 5ea38d90cc
commit e783a40e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beacon_node/network/src/sync/manager.rs
View File

@ -835,9 +835,9 @@ impl<T: BeaconChainTypes> SyncManager<T> {
let delay_threshold_unmet = self let delay_threshold_unmet = self
.chain .chain
.slot_clock .slot_clock
.seconds_from_current_slot_start() .millis_from_current_slot_start()
.map_or(false, |secs_into_slot| { .map_or(false, |millis_into_slot| {
secs_into_slot < self.chain.slot_clock.single_lookup_delay() millis_into_slot < self.chain.slot_clock.single_lookup_delay()
}); });
msg_for_current_slot && delay_threshold_unmet msg_for_current_slot && delay_threshold_unmet
} else { } else {

51
common/eth2_network_config/src/lib.rs
View File

@ -46,10 +46,7 @@ const TRUSTED_SETUP_MINIMAL: &[u8] =
include_bytes!("../built_in_network_configs/minimal_testing_trusted_setups.json"); include_bytes!("../built_in_network_configs/minimal_testing_trusted_setups.json");
pub fn get_trusted_setup<P: KzgPreset>() -> &'static [u8] { pub fn get_trusted_setup<P: KzgPreset>() -> &'static [u8] {
match P::spec_name() { get_trusted_setup_from_id(P::spec_name())
KzgPresetId::Mainnet => TRUSTED_SETUP,
KzgPresetId::Minimal => TRUSTED_SETUP_MINIMAL,
}
} }
pub fn get_trusted_setup_from_id(id: KzgPresetId) -> &'static [u8] { pub fn get_trusted_setup_from_id(id: KzgPresetId) -> &'static [u8] {
@ -59,6 +56,20 @@ pub fn get_trusted_setup_from_id(id: KzgPresetId) -> &'static [u8] {
} }
} }
fn get_trusted_setup_from_config(config: &Config) -> Result<Option<TrustedSetup>, String> {
config
.deneb_fork_epoch
.filter(|epoch| epoch.value != Epoch::max_value())
.map(|_| {
let id = KzgPresetId::from_str(&config.preset_base)
.map_err(|e| format!("Unable to parse preset_base as KZG preset: {:?}", e))?;
let trusted_setup_bytes = get_trusted_setup_from_id(id);
serde_json::from_reader(trusted_setup_bytes)
.map_err(|e| format!("Unable to read trusted setup file: {}", e))
})
.transpose()
}
/// Specifies an Eth2 network. /// Specifies an Eth2 network.
/// ///
/// See the crate-level documentation for more details. /// See the crate-level documentation for more details.
@ -88,20 +99,7 @@ impl Eth2NetworkConfig {
fn from_hardcoded_net(net: &HardcodedNet) -> Result<Self, String> { fn from_hardcoded_net(net: &HardcodedNet) -> Result<Self, String> {
let config: Config = serde_yaml::from_reader(net.config) let config: Config = serde_yaml::from_reader(net.config)
.map_err(|e| format!("Unable to parse yaml config: {:?}", e))?; .map_err(|e| format!("Unable to parse yaml config: {:?}", e))?;
let kzg_trusted_setup = if let Some(epoch) = config.deneb_fork_epoch { let kzg_trusted_setup = get_trusted_setup_from_config(&config)?;
// Only load the trusted setup if the deneb fork epoch is set
if epoch.value != Epoch::max_value() {
let trusted_setup_bytes =
get_trusted_setup_from_id(KzgPresetId::from_str(&config.preset_base)?);
let trusted_setup: TrustedSetup = serde_json::from_reader(trusted_setup_bytes)
.map_err(|e| format!("Unable to read trusted setup file: {}", e))?;
Some(trusted_setup)
} else {
None
}
} else {
None
};
Ok(Self { Ok(Self {
deposit_contract_deploy_block: serde_yaml::from_reader(net.deploy_block) deposit_contract_deploy_block: serde_yaml::from_reader(net.deploy_block)
.map_err(|e| format!("Unable to parse deploy block: {:?}", e))?, .map_err(|e| format!("Unable to parse deploy block: {:?}", e))?,
@ -238,7 +236,7 @@ impl Eth2NetworkConfig {
let deposit_contract_deploy_block = load_from_file!(DEPLOY_BLOCK_FILE); let deposit_contract_deploy_block = load_from_file!(DEPLOY_BLOCK_FILE);
let boot_enr = optional_load_from_file!(BOOT_ENR_FILE); let boot_enr = optional_load_from_file!(BOOT_ENR_FILE);
let config: Config = load_from_file!(BASE_CONFIG_FILE); let config = load_from_file!(BASE_CONFIG_FILE);
// The genesis state is a special case because it uses SSZ, not YAML. // The genesis state is a special case because it uses SSZ, not YAML.
let genesis_file_path = base_dir.join(GENESIS_STATE_FILE); let genesis_file_path = base_dir.join(GENESIS_STATE_FILE);
@ -256,20 +254,7 @@ impl Eth2NetworkConfig {
None None
}; };
let kzg_trusted_setup = if let Some(epoch) = config.deneb_fork_epoch { let kzg_trusted_setup = get_trusted_setup_from_config(&config)?;
// Only load the trusted setup if the deneb fork epoch is set
if epoch.value != Epoch::max_value() {
let trusted_setup: TrustedSetup = serde_json::from_reader(
get_trusted_setup_from_id(KzgPresetId::from_str(&config.preset_base)?),
)
.map_err(|e| format!("Unable to read trusted setup file: {}", e))?;
Some(trusted_setup)
} else {
None
}
} else {
None
};
Ok(Self { Ok(Self {
deposit_contract_deploy_block, deposit_contract_deploy_block,