Caplin: Fixed not calling FCU due to faulty blob handling (#9818)

Cherry pick PR #9779 into the release Co-authored-by: Giulio rebuffo <giulio.rebuffo@gmail.com>
erigontech · Mar 27, 2024 · 270d557 · 270d557
1 parent 0f0a445
commit 270d557
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/cl/phase1/stages/clstages.go b/cl/phase1/stages/clstages.go
@@ -564,14 +564,23 @@ func ConsensusClStages(ctx context.Context,
 										errCh <- err
 										return
 									}
-									blobs, err := network2.RequestBlobsFrantically(ctx, cfg.rpc, ids)
-									if err != nil {
-										errCh <- err
-										return
-									}
-									if _, _, err = blob_storage.VerifyAgainstIdentifiersAndInsertIntoTheBlobStore(ctx, cfg.blobStore, ids, blobs.Responses, forkchoice.VerifyHeaderSignatureAgainstForkChoiceStoreFunction(cfg.forkChoice, cfg.beaconCfg, cfg.genesisCfg.GenesisValidatorRoot)); err != nil {
-										errCh <- err
-										return
+									var inserted uint64
+
+									for inserted != uint64(ids.Len()) {
+										select {
+										case <-ctx.Done():
+											return
+										default:
+										}
+										blobs, err := network2.RequestBlobsFrantically(ctx, cfg.rpc, ids)
+										if err != nil {
+											errCh <- err
+											return
+										}
+										if _, inserted, err = blob_storage.VerifyAgainstIdentifiersAndInsertIntoTheBlobStore(ctx, cfg.blobStore, ids, blobs.Responses, forkchoice.VerifyHeaderSignatureAgainstForkChoiceStoreFunction(cfg.forkChoice, cfg.beaconCfg, cfg.genesisCfg.GenesisValidatorRoot)); err != nil {
+											errCh <- err
+											return
+										}
 									}
 
 									select {