diff --git a/core/blockchain.go b/core/blockchain.go index d2877aac36..503059fa8b 100644 --- a/core/blockchain.go +++ b/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) diff --git a/core/rawdb/freezer_batch.go b/core/rawdb/freezer_batch.go index 9a5cf538e1..6f15fcd74b 100644 --- a/core/rawdb/freezer_batch.go +++ b/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) } diff --git a/core/types/block.go b/core/types/block.go index 511bd35629..e7f0651114 100644 --- a/core/types/block.go +++ b/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 }