WithBlockExtras -> WithBlockExtra

Author: qdm12

core/rawdb/accessors_chain.go

@@ -524,7 +524,7 @@ func ReadBlock(db ethdb.Reader, hash common.Hash, number uint64) *types.Block {
 	}
 	block := types.NewBlockWithHeader(header).WithBody(body.Transactions, body.Uncles)
 	bodyExtra := types.GetBodyExtra(body)
-	block = types.WithBlockExtras(block, bodyExtra.Version, bodyExtra.ExtData, false)
+	block = types.WithBlockExtra(block, bodyExtra.Version, bodyExtra.ExtData, false)
 	return block
 }
 

core/types/block_ext.go

@@ -130,7 +130,7 @@ func NewBlockWithExtData(
 ) *Block {
 	b := NewBlock(header, txs, uncles, receipts, hasher)
 	const version = 0
-	return WithBlockExtras(b, version, &extdata, recalc)
+	return WithBlockExtra(b, version, &extdata, recalc)
 }
 
 func WrapWithTimestamp(b *Block) *BlockWithTimestamp {

core/types/libevm.go

@@ -44,7 +44,7 @@ func GetBlockExtra(b *Block) *BlockExtra {
 	return extras.Block.Get(b)
 }
 
-func WithBlockExtras(b *Block, version uint32, extdata *[]byte, recalc bool) *Block {
+func WithBlockExtra(b *Block, version uint32, extdata *[]byte, recalc bool) *Block {
 	extras := GetBlockExtra(b)
 
 	extras.version = version

ethclient/ethclient.go

@@ -266,7 +266,7 @@ func (ec *client) getBlock(ctx context.Context, method string, args ...interface
 		txs[i] = tx.tx
 	}
 	block := types.NewBlockWithHeader(head).WithBody(txs, uncles)
-	block = types.WithBlockExtras(block, body.Version, (*[]byte)(body.BlockExtraData), false)
+	block = types.WithBlockExtra(block, body.Version, (*[]byte)(body.BlockExtraData), false)
 	return block, nil
 }