From 0be1fe8c49bdea9c473f99f32c3023dbcced2d15 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 30 Sep 2024 15:55:10 +0200
Subject: [PATCH] eth/downloader: remove requests

---
 eth/downloader/fetchers_concurrent_bodies.go |  6 +++---
 eth/downloader/queue.go                      | 15 +--------------
 eth/downloader/queue_test.go                 |  2 +-
 eth/protocols/eth/protocol.go                |  7 +++----
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/eth/downloader/fetchers_concurrent_bodies.go b/eth/downloader/fetchers_concurrent_bodies.go
index 709df7757507..56359b33c94e 100644
--- a/eth/downloader/fetchers_concurrent_bodies.go
+++ b/eth/downloader/fetchers_concurrent_bodies.go
@@ -88,10 +88,10 @@ func (q *bodyQueue) request(peer *peerConnection, req *fetchRequest, resCh chan
 // deliver is responsible for taking a generic response packet from the concurrent
 // fetcher, unpacking the body data and delivering it to the downloader's queue.
 func (q *bodyQueue) deliver(peer *peerConnection, packet *eth.Response) (int, error) {
-	txs, uncles, withdrawals, requests := packet.Res.(*eth.BlockBodiesResponse).Unpack()
-	hashsets := packet.Meta.([][]common.Hash) // {txs hashes, uncle hashes, withdrawal hashes, requests hashes}
+	txs, uncles, withdrawals := packet.Res.(*eth.BlockBodiesResponse).Unpack()
+	hashsets := packet.Meta.([][]common.Hash) // {txs hashes, uncle hashes, withdrawal hashes}
 
-	accepted, err := q.queue.DeliverBodies(peer.id, txs, hashsets[0], uncles, hashsets[1], withdrawals, hashsets[2], requests, hashsets[3])
+	accepted, err := q.queue.DeliverBodies(peer.id, txs, hashsets[0], uncles, hashsets[1], withdrawals, hashsets[2])
 	switch {
 	case err == nil && len(txs) == 0:
 		peer.log.Trace("Requested bodies delivered")
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index 23d25ed8fc4c..a2f916ebbcc7 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -785,7 +785,7 @@ func (q *queue) DeliverHeaders(id string, headers []*types.Header, hashes []comm
 func (q *queue) DeliverBodies(id string, txLists [][]*types.Transaction, txListHashes []common.Hash,
 	uncleLists [][]*types.Header, uncleListHashes []common.Hash,
 	withdrawalLists [][]*types.Withdrawal, withdrawalListHashes []common.Hash,
-	requestsLists [][][]byte, requestsListHashes []common.Hash) (int, error) {
+) (int, error) {
 	q.lock.Lock()
 	defer q.lock.Unlock()
 
@@ -809,19 +809,6 @@ func (q *queue) DeliverBodies(id string, txLists [][]*types.Transaction, txListH
 				return errInvalidBody
 			}
 		}
-		if header.RequestsHash == nil {
-			// nil hash means that requests should not be present in body
-			if requestsLists[index] != nil {
-				return errInvalidBody
-			}
-		} else { // non-nil hash: body must have requests
-			if requestsLists[index] == nil {
-				return errInvalidBody
-			}
-			if requestsListHashes[index] != *header.RequestsHash {
-				return errInvalidBody
-			}
-		}
 		// Blocks must have a number of blobs corresponding to the header gas usage,
 		// and zero before the Cancun hardfork.
 		var blobs int
diff --git a/eth/downloader/queue_test.go b/eth/downloader/queue_test.go
index e29d23f80b7a..857ac4813a7d 100644
--- a/eth/downloader/queue_test.go
+++ b/eth/downloader/queue_test.go
@@ -341,7 +341,7 @@ func XTestDelivery(t *testing.T) {
 					uncleHashes[i] = types.CalcUncleHash(uncles)
 				}
 				time.Sleep(100 * time.Millisecond)
-				_, err := q.DeliverBodies(peer.id, txset, txsHashes, uncleset, uncleHashes, nil, nil, nil, nil)
+				_, err := q.DeliverBodies(peer.id, txset, txsHashes, uncleset, uncleHashes, nil, nil)
 				if err != nil {
 					fmt.Printf("delivered %d bodies %v\n", len(txset), err)
 				}
diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go
index 6c6c0fe83967..af246251dc1b 100644
--- a/eth/protocols/eth/protocol.go
+++ b/eth/protocols/eth/protocol.go
@@ -229,17 +229,16 @@ type BlockBody struct {
 
 // Unpack retrieves the transactions and uncles from the range packet and returns
 // them in a split flat format that's more consistent with the internal data structures.
-func (p *BlockBodiesResponse) Unpack() ([][]*types.Transaction, [][]*types.Header, [][]*types.Withdrawal, [][][]byte) {
+func (p *BlockBodiesResponse) Unpack() ([][]*types.Transaction, [][]*types.Header, [][]*types.Withdrawal) {
 	var (
 		txset         = make([][]*types.Transaction, len(*p))
 		uncleset      = make([][]*types.Header, len(*p))
 		withdrawalset = make([][]*types.Withdrawal, len(*p))
-		requestset    = make([][][]byte, len(*p))
 	)
 	for i, body := range *p {
-		txset[i], uncleset[i], withdrawalset[i], requestset[i] = body.Transactions, body.Uncles, body.Withdrawals, body.Requests
+		txset[i], uncleset[i], withdrawalset[i] = body.Transactions, body.Uncles, body.Withdrawals
 	}
-	return txset, uncleset, withdrawalset, requestset
+	return txset, uncleset, withdrawalset
 }
 
 // GetReceiptsRequest represents a block receipts query.