github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Pending Queue Deadline Bug (#13145)

Browse Source 
* rearrange deadline

* naming
This commit is contained in:
Nishant Das
2023-10-31 14:40:41 +08:00
committed by GitHub
parent b24b60dbd8
commit b56bf00682
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
beacon-chain/sync/pending_blocks_queue.go
View File

@@ -134,11 +134,17 @@ func (s *Service) processPendingBlocks(ctx context.Context) error {
continue
}
// Calculate the deadline time by adding three slots duration to the current time
secondsPerSlot := params.BeaconConfig().SecondsPerSlot
threeSlotDuration := 3 * time.Duration(secondsPerSlot) * time.Second
ctxWithTimeout, cancelFunction := context.WithTimeout(ctx, threeSlotDuration)
// Process and broadcast the block.
if err := s.processAndBroadcastBlock(ctx, b, blkRoot); err != nil {
s.handleBlockProcessingError(ctx, err, b, blkRoot)
if err := s.processAndBroadcastBlock(ctxWithTimeout, b, blkRoot); err != nil {
s.handleBlockProcessingError(ctxWithTimeout, err, b, blkRoot)
cancelFunction()
continue
}
cancelFunction()
// Remove the processed block from the queue.
if err := s.removeBlockFromQueue(b, blkRoot); err != nil {
@@ -205,12 +211,7 @@ func (s *Service) processAndBroadcastBlock(ctx context.Context, b interfaces.Rea
}
}
// Calculate the deadline time by adding two slots duration to the current time
secondsPerSlot := params.BeaconConfig().SecondsPerSlot
twoSlotDuration := 2 * time.Duration(secondsPerSlot) * time.Second
ctxWithTimeout, cancelFunction := context.WithTimeout(ctx, twoSlotDuration)
defer cancelFunction()
if err := s.cfg.chain.ReceiveBlock(ctxWithTimeout, b, blkRoot); err != nil {
if err := s.cfg.chain.ReceiveBlock(ctx, b, blkRoot); err != nil {
return err
}