Some changes

core/blockchain.go

@@ -966,6 +966,29 @@ func (bc *BlockChain) GetReceiptsByHash(hash common.Hash) types.Receipts {
 	return receipts
 }
 
+// GetReceiptsByHash retrieves the receipts for all transactions in a given block.
+func (bc *BlockChain) GetAllReceiptsByHash(hash common.Hash) types.Receipts {
+	if receipts, ok := bc.receiptsCache.Get(hash); ok {
+		return receipts.(types.Receipts)
+	}
+	number := rawdb.ReadHeaderNumber(bc.db, hash)
+	if number == nil {
+		return nil
+	}
+	receipts := rawdb.ReadReceipts(bc.db, hash, *number, bc.chainConfig)
+	if receipts == nil {
+		return nil
+	}
+
+	borReceipt := bc.GetBorReceiptByHash(hash)
+	if borReceipt != nil {
+		receipts = append(receipts, borReceipt)
+	}
+
+	bc.receiptsCache.Add(hash, receipts)
+	return receipts
+}
+
 // GetBlocksFromHash returns the block corresponding to hash and up to n-1 ancestors.
 // [deprecated by eth/62]
 func (bc *BlockChain) GetBlocksFromHash(hash common.Hash, n int) (blocks []*types.Block) {

eth/protocols/eth/handlers.go

@@ -214,17 +214,12 @@ func answerGetReceiptsQuery(backend Backend, query GetReceiptsPacket, peer *Peer
 			break
 		}
 		// Retrieve the requested block's receipts
-		results := backend.Chain().GetReceiptsByHash(hash)
+		results := backend.Chain().GetAllReceiptsByHash(hash)
 		if results == nil {
 			if header := backend.Chain().GetHeaderByHash(hash); header == nil || header.ReceiptHash != types.EmptyRootHash {
 				continue
 			}
 		}
-		borReceipt := backend.Chain().GetBorReceiptByHash(hash)
-		if borReceipt != nil {
-			results = append(results, borReceipt)
-			log.Info("Adding bor receipt to receipts query")
-		}
 
 		// If known, encode and queue for response packet
 		if encoded, err := rlp.EncodeToBytes(results); err != nil {