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

Merge branch 'unstable' into electra-focil

Browse Source
This commit is contained in:
jacobkaufmann
2024-12-26 12:54:09 -05:00
parent 9e9b6b776d 7e0cddef32
commit d88f1021ea
230 changed files with 3831 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3803,7 +3803,10 @@ pub fn serve<T: BeaconChainTypes>(
);
execution_layer
.update_proposer_preparation(current_epoch, &preparation_data)
.update_proposer_preparation(
current_epoch,
preparation_data.iter().map(|data| (data, &None)),
)
.await;
chain
@@ -3861,7 +3864,7 @@ pub fn serve<T: BeaconChainTypes>(
let spec = &chain.spec;
let (preparation_data, filtered_registration_data): (
Vec<ProposerPreparationData>,
Vec<(ProposerPreparationData, Option<u64>)>,
Vec<SignedValidatorRegistrationData>,
) = register_val_data
.into_iter()
@@ -3891,12 +3894,15 @@ pub fn serve<T: BeaconChainTypes>(
// Filter out validators who are not 'active' or 'pending'.
is_active_or_pending.then_some({
(
ProposerPreparationData {
validator_index: validator_index as u64,
fee_recipient: register_data
.message
.fee_recipient,
},
(
ProposerPreparationData {
validator_index: validator_index as u64,
fee_recipient: register_data
.message
.fee_recipient,
},
Some(register_data.message.gas_limit),
),
register_data,
)
})
@@ -3906,7 +3912,10 @@ pub fn serve<T: BeaconChainTypes>(
// Update the prepare beacon proposer cache based on this request.
execution_layer
.update_proposer_preparation(current_epoch, &preparation_data)
.update_proposer_preparation(
current_epoch,
preparation_data.iter().map(|(data, limit)| (data, limit)),
)
.await;
// Call prepare beacon proposer blocking with the latest update in order to make