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

Merge branch 'unstable' of https://github.com/sigp/lighthouse into gloas-block-and-bid-production

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-02-13 21:33:06 -08:00
parent 9bbcfe34ac 68ad9758a3
commit 4795e1f341
84 changed files with 3389 additions and 2614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/http_api/Cargo.toml
View File

@@ -14,7 +14,7 @@ bytes = { workspace = true }
context_deserialize = { workspace = true }
directory = { workspace = true }
either = { workspace = true }
eth2 = { workspace = true, features = ["lighthouse"] }
eth2 = { workspace = true, features = ["lighthouse", "network"] }
ethereum_serde_utils = { workspace = true }
ethereum_ssz = { workspace = true }
execution_layer = { workspace = true }

9
beacon_node/http_api/src/lib.rs
View File

@@ -2160,12 +2160,9 @@ pub fn serve<T: BeaconChainTypes>(
let discovery_addresses = enr.multiaddr_p2p_udp();
Ok(api_types::GenericResponse::from(api_types::IdentityData {
peer_id: network_globals.local_peer_id().to_base58(),
enr: enr.to_base64(),
p2p_addresses: p2p_addresses.iter().map(|a| a.to_string()).collect(),
discovery_addresses: discovery_addresses
.iter()
.map(|a| a.to_string())
.collect(),
enr,
p2p_addresses,
discovery_addresses,
metadata: utils::from_meta_data::<T::EthSpec>(
&network_globals.local_metadata,
&chain.spec,

20
beacon_node/http_api/tests/tests.rs
View File

@@ -136,7 +136,7 @@ impl ApiTester {
let mut harness = BeaconChainHarness::builder(MainnetEthSpec)
.spec(spec.clone())
.chain_config(ChainConfig {
reconstruct_historic_states: config.retain_historic_states,
archive: config.retain_historic_states,
..ChainConfig::default()
})
.deterministic_keypairs(VALIDATOR_COUNT)
@@ -2856,19 +2856,9 @@ impl ApiTester {
let expected = IdentityData {
peer_id: self.local_enr.peer_id().to_string(),
enr: self.local_enr.to_base64(),
p2p_addresses: self
.local_enr
.multiaddr_p2p_tcp()
.iter()
.map(|a| a.to_string())
.collect(),
discovery_addresses: self
.local_enr
.multiaddr_p2p_udp()
.iter()
.map(|a| a.to_string())
.collect(),
enr: self.local_enr.clone(),
p2p_addresses: self.local_enr.multiaddr_p2p_tcp(),
discovery_addresses: self.local_enr.multiaddr_p2p_udp(),
metadata: MetaData::V2(MetaDataV2 {
seq_number: 0,
attnets: "0x0000000000000000".to_string(),
@@ -2897,7 +2887,7 @@ impl ApiTester {
pub async fn test_get_node_peers_by_id(self) -> Self {
let result = self
.client
.get_node_peers_by_id(&self.external_peer_id.to_string())
.get_node_peers_by_id(self.external_peer_id)
.await
.unwrap()
.data;