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

Ensure eth1 deposit/chain IDs are used from YamlConfig (#1829)

Browse Source 
## Issue Addressed

 NA

## Proposed Changes

Fixes a bug which causes the node to reject valid eth1 nodes.

- Fix core bug: failure to apply `YamlConfig` values to `ChainSpec`.
- Add a test to prevent regression in this specific case.
- Fix an invalid log message

## Additional Info

NA
This commit is contained in:
Paul Hauner 2020-10-26 03:34:14 +00:00
parent f157d61cc7
commit 92c8eba8ca
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/eth1/src/service.rs
View File

@ -370,7 +370,7 @@ impl Service {
crit!( crit!(
self.log, self.log,
"Invalid eth1 network. Please switch to correct network"; "Invalid eth1 network. Please switch to correct network";
"expected" => format!("{:?}",DEFAULT_NETWORK_ID), "expected" => format!("{:?}",config_network),
"received" => format!("{:?}",network_id), "received" => format!("{:?}",network_id),
"warning" => WARNING_MSG, "warning" => WARNING_MSG,
); );

6
consensus/types/src/chain_spec.rs
View File

@ -718,6 +718,8 @@ impl YamlConfig {
random_subnets_per_validator: self.random_subnets_per_validator, random_subnets_per_validator: self.random_subnets_per_validator,
epochs_per_random_subnet_subscription: self.epochs_per_random_subnet_subscription, epochs_per_random_subnet_subscription: self.epochs_per_random_subnet_subscription,
seconds_per_eth1_block: self.seconds_per_eth1_block, seconds_per_eth1_block: self.seconds_per_eth1_block,
deposit_chain_id: self.deposit_chain_id,
deposit_network_id: self.deposit_network_id,
deposit_contract_address: self.deposit_contract_address, deposit_contract_address: self.deposit_contract_address,
/* /*
* Gwei values * Gwei values
@ -780,8 +782,6 @@ impl YamlConfig {
genesis_slot: chain_spec.genesis_slot, genesis_slot: chain_spec.genesis_slot,
far_future_epoch: chain_spec.far_future_epoch, far_future_epoch: chain_spec.far_future_epoch,
base_rewards_per_epoch: chain_spec.base_rewards_per_epoch, base_rewards_per_epoch: chain_spec.base_rewards_per_epoch,
deposit_chain_id: chain_spec.deposit_chain_id,
deposit_network_id: chain_spec.deposit_network_id,
deposit_contract_tree_depth: chain_spec.deposit_contract_tree_depth, deposit_contract_tree_depth: chain_spec.deposit_contract_tree_depth,
}) })
} }
@ -846,6 +846,8 @@ mod yaml_tests {
// modifying the original spec // modifying the original spec
spec.max_committees_per_slot += 1; spec.max_committees_per_slot += 1;
spec.deposit_chain_id += 1;
spec.deposit_network_id += 1;
// Applying a yaml config with incorrect EthSpec should fail // Applying a yaml config with incorrect EthSpec should fail
let res = yamlconfig.apply_to_chain_spec::<MainnetEthSpec>(&spec); let res = yamlconfig.apply_to_chain_spec::<MainnetEthSpec>(&spec);
assert_eq!(res, None); assert_eq!(res, None);