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

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-05-17 11:55:52 +03:00
parent 6a9b013a26 1b921a64e6
commit ac7fc2206a
160 changed files with 1979 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1494,7 +1494,7 @@ pub fn serve<T: BeaconChainTypes>(
// POST beacon/pool/payload_attestations
let post_beacon_pool_payload_attestations = post_beacon_pool_payload_attestations(
&network_tx_filter,
optional_consensus_version_header_filter,
optional_consensus_version_header_filter.clone(),
&beacon_pool_path,
);
@@ -1539,6 +1539,22 @@ pub fn serve<T: BeaconChainTypes>(
},
);
// POST validator/proposer_preferences (JSON)
let post_validator_proposer_preferences = post_validator_proposer_preferences(
eth_v1.clone(),
task_spawner_filter.clone(),
chain_filter.clone(),
network_tx_filter.clone(),
);
// POST validator/proposer_preferences (SSZ)
let post_validator_proposer_preferences_ssz = post_validator_proposer_preferences_ssz(
eth_v1.clone(),
task_spawner_filter.clone(),
chain_filter.clone(),
network_tx_filter.clone(),
);
// POST beacon/execution_payload_envelope
let post_beacon_execution_payload_envelope = post_beacon_execution_payload_envelope(
eth_v1.clone(),
@@ -3529,7 +3545,8 @@ pub fn serve<T: BeaconChainTypes>(
.uor(post_beacon_blinded_blocks_ssz)
.uor(post_beacon_blinded_blocks_v2_ssz)
.uor(post_beacon_execution_payload_envelope_ssz)
.uor(post_beacon_pool_payload_attestations_ssz),
.uor(post_beacon_pool_payload_attestations_ssz)
.uor(post_validator_proposer_preferences_ssz),
)
.uor(post_beacon_blocks)
.uor(post_beacon_blinded_blocks)
@@ -3542,6 +3559,7 @@ pub fn serve<T: BeaconChainTypes>(
.uor(post_beacon_pool_sync_committees)
.uor(post_beacon_pool_payload_attestations)
.uor(post_beacon_pool_bls_to_execution_changes)
.uor(post_validator_proposer_preferences)
.uor(post_beacon_execution_payload_envelope)
.uor(post_beacon_state_validators)
.uor(post_beacon_state_validator_balances)