core/types: make fetchers fetch withdrawals without transactions

MariusVanDerWijden · MariusVanDerWijden · commit dae68e221510 · 2022-12-01T16:26:12.000+01:00
diff --git a/core/types/block.go b/core/types/block.go
@@ -152,9 +152,12 @@ func (h *Header) SanityCheck() error {
 }
 
 // EmptyBody returns true if there is no additional 'body' to complete the header
-// that is: no transactions and no uncles.
+// that is: no transactions, no uncles and no withdrawals.
 func (h *Header) EmptyBody() bool {
-	return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash
+	if h.WithdrawalsHash == nil {
+		return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash
+	}
+	return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash && *h.WithdrawalsHash == EmptyRootHash
 }
 
 // EmptyReceipts returns true if there are no receipts for this header/block.

Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,12 @@ func (h *Header) SanityCheck() error {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// EmptyBody returns true if there is no additional 'body' to complete the header`
`155`		`-// that is: no transactions and no uncles.`
	`155`	`+// that is: no transactions, no uncles and no withdrawals.`
`156`	`156`	`func (h *Header) EmptyBody() bool {`
`157`		`- return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash`
	`157`	`+ if h.WithdrawalsHash == nil {`
	`158`	`+ return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash`
	`159`	`+ }`
	`160`	`+ return h.TxHash == EmptyRootHash && h.UncleHash == EmptyUncleHash && *h.WithdrawalsHash == EmptyRootHash`
`158`	`161`	`}`
`159`	`162`
`160`	`163`	`// EmptyReceipts returns true if there are no receipts for this header/block.`