mirror of
https://github.com/sigp/lighthouse.git
synced 2026-04-17 04:48:21 +00:00
fix merge
This commit is contained in:
@@ -351,12 +351,11 @@ impl CandidateBeaconNode {
|
|||||||
);
|
);
|
||||||
} else if beacon_node_spec.fulu_fork_epoch != spec.fulu_fork_epoch {
|
} else if beacon_node_spec.fulu_fork_epoch != spec.fulu_fork_epoch {
|
||||||
warn!(
|
warn!(
|
||||||
log,
|
endpoint = %self.beacon_node,
|
||||||
"Beacon node has mismatched Fulu fork epoch";
|
endpoint_fulu_fork_epoc = ?beacon_node_spec.fulu_fork_epoch,
|
||||||
"endpoint" => %self.beacon_node,
|
hint = UPDATE_REQUIRED_LOG_HINT,
|
||||||
"endpoint_fulu_fork_epoch" => ?beacon_node_spec.fulu_fork_epoch,
|
"Beacon node has mismatched Fulu fork epoch"
|
||||||
"hint" => UPDATE_REQUIRED_LOG_HINT,
|
);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -457,12 +457,11 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> AttestationService<S,
|
|||||||
// This shouldn't happen unless BN and VC are out of sync with
|
// This shouldn't happen unless BN and VC are out of sync with
|
||||||
// respect to the Electra fork.
|
// respect to the Electra fork.
|
||||||
error!(
|
error!(
|
||||||
log,
|
error = ?e,
|
||||||
"Unable to convert to SingleAttestation";
|
committee_index = attestation_data.index,
|
||||||
"error" => ?e,
|
slot = slot.as_u64(),
|
||||||
"committee_index" => attestation_data.index,
|
"type" = "unaggregated",
|
||||||
"slot" => slot.as_u64(),
|
"Unable to convert to SingleAttestation",
|
||||||
"type" => "unaggregated",
|
|
||||||
);
|
);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user