fix WithSidecars (#2327)

core/blockchain.go

@@ -1404,11 +1404,7 @@ func (bc *BlockChain) InsertReceiptChain(blockChain types.Blocks, receiptChain [
 
 		// Write all chain data to ancients.
 		td := bc.GetTd(first.Hash(), first.NumberU64())
-		var (
-			writeSize int64
-			err       error
-		)
-		writeSize, err = rawdb.WriteAncientBlocks(bc.db, blockChain, receiptChain, td)
+		writeSize, err := rawdb.WriteAncientBlocks(bc.db, blockChain, receiptChain, td)
 
 		if err != nil {
 			log.Error("Error importing chain data to ancients", "err", err)

core/rawdb/freezer_batch.go

@@ -37,9 +37,7 @@ type freezerBatch struct {
 }
 
 func newFreezerBatch(f *Freezer) *freezerBatch {
-	batch := &freezerBatch{
-		tables: make(map[string]*freezerTableBatch, len(f.tables)),
-	}
+	batch := &freezerBatch{tables: make(map[string]*freezerTableBatch, len(f.tables))}
 	for kind, table := range f.tables {
 		batch.tables[kind] = table.newBatch(f.offset)
 	}

core/types/block.go

@@ -544,10 +544,10 @@ func (b *Block) WithSidecars(sidecars BlobSidecars) *Block {
 		transactions: b.transactions,
 		uncles:       b.uncles,
 		withdrawals:  b.withdrawals,
-		sidecars:     sidecars,
 	}
-	if b.withdrawals != nil {
-		block.withdrawals = b.withdrawals
+	if b.sidecars != nil {
+		block.sidecars = make(BlobSidecars, len(sidecars))
+		copy(block.sidecars, sidecars)
 	}
 	return block
 }