Extra debugging info hacks

core/block_validator.go

@@ -71,7 +71,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 	if header.WithdrawalsHash != nil {
 		// Withdrawals list must be present in body after Shanghai.
 		if block.Withdrawals() == nil {
-			return fmt.Errorf("missing withdrawals in block body")
+			return fmt.Errorf("missing withdrawals in block body. withdrawals hash is %x, header hash is %x", header.WithdrawalsHash, header.Hash())
 		}
 		if hash := types.DeriveSha(block.Withdrawals(), trie.NewStackTrie(nil)); hash != *header.WithdrawalsHash {
 			return fmt.Errorf("withdrawals root hash mismatch (header value %x, calculated %x)", *header.WithdrawalsHash, hash)

eth/downloader/downloader.go

@@ -466,7 +466,7 @@ func (d *Downloader) syncWithPeer(p *peerConnection, hash common.Hash, td, ttd *
 	if !beaconMode {
 		log.Debug("Synchronising with the network", "peer", p.id, "eth", p.version, "head", hash, "td", td, "mode", mode)
 	} else {
-		log.Debug("Backfilling with the network", "mode", mode)
+		log.Info("Backfilling with the network", "mode", mode)
 	}
 	defer func(start time.Time) {
 		log.Debug("Synchronisation terminated", "elapsed", common.PrettyDuration(time.Since(start)))

eth/downloader/fetchers_concurrent_bodies.go

@@ -95,9 +95,9 @@ func (q *bodyQueue) deliver(peer *peerConnection, packet *eth.Response) (int, er
 	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")
+		peer.log.Info("Requested bodies delivered")
 	case err == nil:
-		peer.log.Trace("Delivered new batch of bodies", "count", len(txs), "accepted", accepted)
+		peer.log.Info("Delivered new batch of bodies", "count", len(txs), "accepted", accepted)
 	default:
 		peer.log.Debug("Failed to deliver retrieved bodies", "err", err)
 	}

eth/downloader/queue.go

@@ -772,6 +772,19 @@ func (q *queue) DeliverBodies(id string, txLists [][]*types.Transaction, txListH
 	defer q.lock.Unlock()
 
 	validate := func(index int, header *types.Header) error {
+		log.Info("Delivering block body", "number", header.Number)
+		if header.WithdrawalsHash == nil {
+			log.Info("Header withdrawals hash is nil")
+		} else {
+			log.Info("Header withdrawals hash is not nil", "headerWithdrawalsHash", header.WithdrawalsHash)
+		}
+		if withdrawalLists[index] == nil {
+			log.Info("Withdrawal body is nil")
+		} else {
+			log.Info("Withdrawal body is not nil")
+		}
+		log.Info("Withdrawal body hash", "withdrawalListHash", withdrawalListHashes[index])
+
 		if txListHashes[index] != header.TxHash {
 			return errInvalidBody
 		}