handle empty withdrawals

Author: MatusKysel

core/data_availability.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/ledgerwatch/erigon-lib/common"
@@ -11,9 +12,16 @@ import (
 
 // IsDataAvailable it checks that the blobTx block has available blob data
 func IsDataAvailable(chain consensus.ChainHeaderReader, header *types.Header, body *types.RawBody) (err error) {
-	if !chain.Config().IsCancun(header.Number.Uint64(), header.Time) {
+	if body.Sidecars == nil || len(body.Sidecars) == 0 {
 		return nil
 	}
+	if !chain.Config().IsCancun(header.Number.Uint64(), header.Time) {
+		if body.Sidecars == nil {
+			return nil
+		} else {
+			return errors.New("sidecars present in block body before cancun")
+		}
+	}
 
 	current := chain.CurrentHeader()
 	if header.Number.Uint64()+params.MinBlocksForBlobRequests < current.Number.Uint64() {

turbo/stages/bodydownload/body_algos.go

@@ -165,7 +165,7 @@ func (bd *BodyDownload) RequestMoreBodies(tx kv.RwTx, blockReader services.FullB
 			var tripleHash TripleHash
 			copy(tripleHash[:], header.UncleHash.Bytes())
 			copy(tripleHash[length.Hash:], header.TxHash.Bytes())
-			if header.WithdrawalsHash != nil {
+			if header.WithdrawalsHash != nil && *header.WithdrawalsHash != (libcommon.Hash{}) {
 				copy(tripleHash[2*length.Hash:], header.WithdrawalsHash.Bytes())
 			} else {
 				copy(tripleHash[2*length.Hash:], types.EmptyRootHash.Bytes())
@@ -299,7 +299,13 @@ Loop:
 		for i := range txs {
 			uncleHash := types.CalcUncleHash(uncles[i])
 			txHash := types.DeriveSha(RawTransactions(txs[i]))
-			withdrawalsHash := types.DeriveSha(withdrawals[i])
+			var withdrawalsHash libcommon.Hash
+			if len(withdrawals[i]) == 0 {
+				withdrawalsHash = types.EmptyRootHash
+			} else {
+				withdrawalsHash = types.DeriveSha(withdrawals[i])
+			}
+
 			var tripleHash TripleHash
 			copy(tripleHash[:], uncleHash.Bytes())
 			copy(tripleHash[length.Hash:], txHash.Bytes())