mirror of
https://github.com/sigp/lighthouse.git
synced 2026-06-30 19:34:37 +00:00
remove proof_slot
This commit is contained in:
@@ -544,9 +544,6 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Construct proof for prior slot.
|
|
||||||
let proof_slot = slot - 1;
|
|
||||||
|
|
||||||
// Create futures for all subnet IDs for this validator
|
// Create futures for all subnet IDs for this validator
|
||||||
for subnet_id in subnet_ids {
|
for subnet_id in subnet_ids {
|
||||||
let duties_service = duties_service.clone();
|
let duties_service = duties_service.clone();
|
||||||
@@ -558,18 +555,14 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
// Produce partial selection proof
|
// Produce partial selection proof
|
||||||
let sync_selection_proof = duties_service
|
let sync_selection_proof = duties_service
|
||||||
.validator_store
|
.validator_store
|
||||||
.produce_sync_selection_proof(
|
.produce_sync_selection_proof(&duty.pubkey, slot, subnet_id.into())
|
||||||
&duty.pubkey,
|
|
||||||
proof_slot,
|
|
||||||
subnet_id.into(),
|
|
||||||
)
|
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
match sync_selection_proof {
|
match sync_selection_proof {
|
||||||
Ok(proof) => {
|
Ok(proof) => {
|
||||||
let sync_committee_selection = SyncCommitteeSelection {
|
let sync_committee_selection = SyncCommitteeSelection {
|
||||||
validator_index: duty.validator_index,
|
validator_index: duty.validator_index,
|
||||||
slot: proof_slot,
|
slot,
|
||||||
subcommittee_index: subnet_id,
|
subcommittee_index: subnet_id,
|
||||||
selection_proof: proof.into(),
|
selection_proof: proof.into(),
|
||||||
};
|
};
|
||||||
@@ -580,7 +573,7 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
log,
|
log,
|
||||||
"Missing pubkey for sync selection proof";
|
"Missing pubkey for sync selection proof";
|
||||||
"pubkey" => ?pubkey,
|
"pubkey" => ?pubkey,
|
||||||
"slot" => proof_slot,
|
"slot" => slot,
|
||||||
);
|
);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
@@ -590,7 +583,7 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
"Unable to sign selection proof";
|
"Unable to sign selection proof";
|
||||||
"error" => ?e,
|
"error" => ?e,
|
||||||
"pubkey" => ?duty.pubkey,
|
"pubkey" => ?duty.pubkey,
|
||||||
"slot" => proof_slot,
|
"slot" => slot,
|
||||||
);
|
);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
@@ -612,6 +605,7 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
log,
|
log,
|
||||||
"Sending batch of partial sync selection proofs";
|
"Sending batch of partial sync selection proofs";
|
||||||
"count" => selection_proofs.len(),
|
"count" => selection_proofs.len(),
|
||||||
|
"slot" => slot,
|
||||||
);
|
);
|
||||||
|
|
||||||
let response = duties_service
|
let response = duties_service
|
||||||
@@ -632,6 +626,7 @@ pub async fn fill_in_aggregation_proofs<T: SlotClock + 'static, E: EthSpec>(
|
|||||||
log,
|
log,
|
||||||
"Received batch response from middleware for sync";
|
"Received batch response from middleware for sync";
|
||||||
"count" => response.data.len(),
|
"count" => response.data.len(),
|
||||||
|
"slot" => slot,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Get the sync map to update duties
|
// Get the sync map to update duties
|
||||||
|
|||||||
Reference in New Issue
Block a user