mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-22 19:50:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check that safe & finalized blocks are canonical for no-op forkChoice (#3997)

Browse Source 
* Place finishHandlingForkChoice after startHandlingForkChoice

* forkChoiceMessage -> forkChoice

* Check that safe & finalized blocks are canonical for no-op forkChoice
This commit is contained in:
Andrew Ashikhmin 2022-04-27 17:23:13 +02:00 committed by GitHub
parent 6c9d515968
commit c9b26c23b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 94 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
eth/stagedsync/stage_headers.go
View File

@ -139,72 +139,6 @@ func SpawnStageHeaders(
}
}
func finishHandlingForkChoice(
forkChoice *engineapi.ForkChoiceMessage,
headHeight uint64,
s *StageState,
tx kv.RwTx,
cfg HeadersCfg,
useExternalTx bool,
) error {
log.Info(fmt.Sprintf("[%s] Unsettled forkchoice after unwind", s.LogPrefix()), "height", headHeight, "forkchoice", forkChoice)
logEvery := time.NewTicker(logInterval)
defer logEvery.Stop()
if err := fixCanonicalChain(s.LogPrefix(), logEvery, headHeight, forkChoice.HeadBlockHash, tx, cfg.blockReader); err != nil {
return err
}
if err := rawdb.WriteHeadHeaderHash(tx, forkChoice.HeadBlockHash); err != nil {
return err
}
sendErrResponse := cfg.hd.GetPendingPayloadStatus() != (common.Hash{})
safeIsCanonical, err := rawdb.IsCanonicalHash(tx, forkChoice.SafeBlockHash)
if err != nil {
return err
}
if !safeIsCanonical {
log.Warn(fmt.Sprintf("[%s] Non-canonical SafeBlockHash", s.LogPrefix()), "forkChoice", forkChoice)
if sendErrResponse {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{
CriticalError: errors.New("safe block is not an ancestor of head block"),
}
cfg.hd.ClearPendingPayloadStatus()
sendErrResponse = false
}
}
finalizedIsCanonical, err := rawdb.IsCanonicalHash(tx, forkChoice.FinalizedBlockHash)
if err != nil {
return err
}
if !finalizedIsCanonical {
log.Warn(fmt.Sprintf("[%s] Non-canonical FinalizedBlockHash", s.LogPrefix()), "forkChoice", forkChoice)
if sendErrResponse {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{
CriticalError: errors.New("finalized block is not an ancestor of head block"),
}
cfg.hd.ClearPendingPayloadStatus()
}
}
if err := s.Update(tx, headHeight); err != nil {
return err
}
if !useExternalTx {
if err := tx.Commit(); err != nil {
return err
}
}
cfg.hd.ClearUnsettledForkChoice()
return nil
}
// HeadersPOS processes Proof-of-Stake requests (newPayload, forkchoiceUpdated)
func HeadersPOS(
s *StageState,
@ -263,8 +197,46 @@ func HeadersPOS(
return nil
}
func safeAndFinalizedBlocksAreCanonical(
forkChoice *engineapi.ForkChoiceMessage,
s *StageState,
tx kv.RwTx,
cfg HeadersCfg,
sendErrResponse bool,
) (bool, error) {
safeIsCanonical, err := rawdb.IsCanonicalHash(tx, forkChoice.SafeBlockHash)
if err != nil {
return false, err
}
if !safeIsCanonical {
log.Warn(fmt.Sprintf("[%s] Non-canonical SafeBlockHash", s.LogPrefix()), "forkChoice", forkChoice)
if sendErrResponse {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{
CriticalError: errors.New("safe block is not an ancestor of head block"),
}
}
return false, nil
}
finalizedIsCanonical, err := rawdb.IsCanonicalHash(tx, forkChoice.FinalizedBlockHash)
if err != nil {
return false, err
}
if !finalizedIsCanonical {
log.Warn(fmt.Sprintf("[%s] Non-canonical FinalizedBlockHash", s.LogPrefix()), "forkChoice", forkChoice)
if sendErrResponse {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{
CriticalError: errors.New("finalized block is not an ancestor of head block"),
}
}
return false, nil
}
return true, nil
}
func startHandlingForkChoice(
forkChoiceMessage *engineapi.ForkChoiceMessage,
forkChoice *engineapi.ForkChoiceMessage,
requestStatus engineapi.RequestStatus,
requestId int,
s *StageState,
@ -274,14 +246,22 @@ func startHandlingForkChoice(
cfg HeadersCfg,
headerInserter *headerdownload.HeaderInserter,
) error {
headerHash := forkChoiceMessage.HeadBlockHash
headerHash := forkChoice.HeadBlockHash
log.Info(fmt.Sprintf("[%s] Handling fork choice", s.LogPrefix()), "headerHash", headerHash)
currentHeadHash := rawdb.ReadHeadHeaderHash(tx)
if currentHeadHash == headerHash { // no-op
log.Info(fmt.Sprintf("[%s] Fork choice no-op", s.LogPrefix()))
cfg.hd.BeaconRequestList.Remove(requestId)
if requestStatus == engineapi.New {
canonical, err := safeAndFinalizedBlocksAreCanonical(forkChoice, s, tx, cfg, requestStatus == engineapi.New)
if err != nil {
log.Warn(fmt.Sprintf("[%s] Fork choice err", s.LogPrefix()), "err", err)
if requestStatus == engineapi.New {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{CriticalError: err}
}
return err
}
if canonical && requestStatus == engineapi.New {
cfg.hd.PayloadStatusCh <- privateapi.PayloadStatus{
Status: remote.EngineStatus_VALID,
LatestValidHash: currentHeadHash,
@ -356,11 +336,55 @@ func startHandlingForkChoice(
u.UnwindTo(forkingPoint, common.Hash{})
log.Trace(fmt.Sprintf("[%s] Fork choice unwind finished", s.LogPrefix()))
cfg.hd.SetUnsettledForkChoice(forkChoiceMessage, headerNumber)
cfg.hd.SetUnsettledForkChoice(forkChoice, headerNumber)
return nil
}
func finishHandlingForkChoice(
forkChoice *engineapi.ForkChoiceMessage,
headHeight uint64,
s *StageState,
tx kv.RwTx,
cfg HeadersCfg,
useExternalTx bool,
) error {
log.Info(fmt.Sprintf("[%s] Unsettled forkchoice after unwind", s.LogPrefix()), "height", headHeight, "forkchoice", forkChoice)
logEvery := time.NewTicker(logInterval)
defer logEvery.Stop()
if err := fixCanonicalChain(s.LogPrefix(), logEvery, headHeight, forkChoice.HeadBlockHash, tx, cfg.blockReader); err != nil {
return err
}
if err := rawdb.WriteHeadHeaderHash(tx, forkChoice.HeadBlockHash); err != nil {
return err
}
sendErrResponse := cfg.hd.GetPendingPayloadStatus() != (common.Hash{})
canonical, err := safeAndFinalizedBlocksAreCanonical(forkChoice, s, tx, cfg, sendErrResponse)
if err != nil {
return err
}
if !canonical {
cfg.hd.ClearPendingPayloadStatus()
}
if err := s.Update(tx, headHeight); err != nil {
return err
}
if !useExternalTx {
if err := tx.Commit(); err != nil {
return err
}
}
cfg.hd.ClearUnsettledForkChoice()
return nil
}
func handleNewPayload(
payloadMessage *engineapi.PayloadMessage,
requestStatus engineapi.RequestStatus,