Merge branch 'develop' into inc-default-timeout

.github/workflows/go.yml

@@ -40,11 +40,6 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           args: --print-issued-lines --sort-results --no-config --timeout=10m --disable-all -E deadcode  -E errcheck -E gosimple --skip-files=validator/web/site_data.go --skip-dirs=proto
-      
-      - name: staticcheck
-        uses: dominikh/staticcheck-action@v1.1.0
-        with:
-          version: "2021.1.1"
 
   build:
     name: Build

beacon-chain/blockchain/receive_block.go

@@ -88,6 +88,7 @@ func (s *Service) ReceiveBlockBatch(ctx context.Context, blocks []block.SignedBe
 
 	for i, b := range blocks {
 		blockCopy := b.Copy()
+		// TODO(10261) check optimistic status
 		if err = s.handleBlockAfterBatchVerify(ctx, blockCopy, blkRoots[i], fCheckpoints[i], jCheckpoints[i]); err != nil {
 			tracing.AnnotateError(span, err)
 			return err

beacon-chain/powchain/engine-api-client/v1/client.go

@@ -34,7 +34,7 @@ const (
 	// ExecutionBlockByNumberMethod request string for JSON-RPC.
 	ExecutionBlockByNumberMethod = "eth_getBlockByNumber"
 	// DefaultTimeout for HTTP.
-	DefaultTimeout = time.Second * 5
+	DefaultTimeout = time.Second * 6
 )
 
 // ForkchoiceUpdatedResponse is the response kind received by the

beacon-chain/sync/validate_beacon_blocks.go

@@ -283,6 +283,7 @@ func (s *Service) validateBellatrixBeaconBlock(ctx context.Context, parentState
 	}
 
 	parentRoot := bytesutil.ToBytes32(blk.ParentRoot())
+	// TODO(10261) Check optimistic status if parent is in DB.
 	isParentOptimistic, err := s.cfg.chain.IsOptimisticForRoot(ctx, parentRoot)
 	if err != nil {
 		return err