mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 19:51:47 +00:00
Merge remote-tracking branch 'origin/stable' into unstable
This commit is contained in:
@@ -9,6 +9,8 @@ pub use client::{Client, ClientBuilder, ClientConfig, ClientGenesis};
|
||||
pub use config::{get_config, get_data_dir, set_network_config};
|
||||
use environment::RuntimeContext;
|
||||
pub use eth2_config::Eth2Config;
|
||||
use lighthouse_network::load_private_key;
|
||||
use network_utils::enr_ext::peer_id_to_node_id;
|
||||
use slasher::{DatabaseBackendOverride, Slasher};
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use std::sync::Arc;
|
||||
@@ -120,8 +122,12 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
|
||||
builder
|
||||
};
|
||||
|
||||
// Generate or load the node id.
|
||||
let local_keypair = load_private_key(&client_config.network);
|
||||
let node_id = peer_id_to_node_id(&local_keypair.public().to_peer_id())?.raw();
|
||||
|
||||
let builder = builder
|
||||
.beacon_chain_builder(client_genesis, client_config.clone())
|
||||
.beacon_chain_builder(client_genesis, client_config.clone(), node_id)
|
||||
.await?;
|
||||
info!("Block production enabled");
|
||||
|
||||
@@ -133,7 +139,7 @@ impl<E: EthSpec> ProductionBeaconNode<E> {
|
||||
|
||||
builder
|
||||
.build_beacon_chain()?
|
||||
.network(Arc::new(client_config.network))
|
||||
.network(Arc::new(client_config.network), local_keypair)
|
||||
.await?
|
||||
.notifier()?
|
||||
.http_metrics_config(client_config.http_metrics.clone())
|
||||
|
||||
Reference in New Issue
Block a user