align types/block.go with subnet-evm

consensus/dummy/consensus.go

@@ -439,7 +439,7 @@ func (self *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader,
 	header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
 
 	// Header seems complete, assemble into a block and return
-	return types.NewBlock(
+	return types.NewBlockWithExtData(
 		header, txs, uncles, receipts, trie.NewStackTrie(nil), extraData,
 		chain.Config().IsApricotPhase1(header.Time),
 	), nil

core/genesis.go

@@ -307,7 +307,7 @@ func (g *Genesis) toBlock(db ethdb.Database, triedb *trie.Database) *types.Block
 			panic(fmt.Sprintf("unable to commit genesis block: %v", err))
 		}
 	}
-	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil), nil, false)
+	return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil))
 }
 
 // Commit writes the block and state of a genesis specification to the database.

core/rawdb/accessors_chain.go

@@ -518,7 +518,7 @@ func ReadBlock(db ethdb.Reader, hash common.Hash, number uint64) *types.Block {
 	if body == nil {
 		return nil
 	}
-	return types.NewBlockWithHeader(header).WithBody(body.Transactions, body.Uncles, body.Version, body.ExtData)
+	return types.NewBlockWithHeader(header).WithBody(body.Transactions, body.Uncles).WithExtData(body.Version, body.ExtData)
 }
 
 // WriteBlock serializes a block into the database, header and body separately.

core/rawdb/accessors_indexes_test.go

@@ -99,7 +99,7 @@ func TestLookupStorage(t *testing.T) {
 			tx3 := types.NewTransaction(3, common.BytesToAddress([]byte{0x33}), big.NewInt(333), 3333, big.NewInt(33333), []byte{0x33, 0x33, 0x33})
 			txs := []*types.Transaction{tx1, tx2, tx3}
 
-			block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, nil, newHasher(), nil, true)
+			block := types.NewBlock(&types.Header{Number: big.NewInt(314)}, txs, nil, nil, newHasher())
 
 			// Check that no transactions entries are in a pristine database
 			for i, tx := range txs {

core/rawdb/chain_iterator_test.go

@@ -44,7 +44,7 @@ func TestChainIterator(t *testing.T) {
 	var block *types.Block
 	var txs []*types.Transaction
 	to := common.BytesToAddress([]byte{0x11})
-	block = types.NewBlock(&types.Header{Number: big.NewInt(int64(0))}, nil, nil, nil, newHasher(), nil, true) // Empty genesis block
+	block = types.NewBlock(&types.Header{Number: big.NewInt(int64(0))}, nil, nil, nil, newHasher()) // Empty genesis block
 	WriteBlock(chainDb, block)
 	WriteCanonicalHash(chainDb, block.Hash(), block.NumberU64())
 	for i := uint64(1); i <= 10; i++ {
@@ -70,7 +70,7 @@ func TestChainIterator(t *testing.T) {
 			})
 		}
 		txs = append(txs, tx)
-		block = types.NewBlock(&types.Header{Number: big.NewInt(int64(i))}, []*types.Transaction{tx}, nil, nil, newHasher(), nil, true)
+		block = types.NewBlock(&types.Header{Number: big.NewInt(int64(i))}, []*types.Transaction{tx}, nil, nil, newHasher())
 		WriteBlock(chainDb, block)
 		WriteCanonicalHash(chainDb, block.Hash(), block.NumberU64())
 	}
@@ -121,7 +121,7 @@ func TestIndexTransactions(t *testing.T) {
 	to := common.BytesToAddress([]byte{0x11})
 
 	// Write empty genesis block
-	block = types.NewBlock(&types.Header{Number: big.NewInt(int64(0))}, nil, nil, nil, newHasher(), nil, true)
+	block = types.NewBlock(&types.Header{Number: big.NewInt(int64(0))}, nil, nil, nil, newHasher())
 	WriteBlock(chainDb, block)
 	WriteCanonicalHash(chainDb, block.Hash(), block.NumberU64())
 
@@ -148,7 +148,7 @@ func TestIndexTransactions(t *testing.T) {
 			})
 		}
 		txs = append(txs, tx)
-		block = types.NewBlock(&types.Header{Number: big.NewInt(int64(i))}, []*types.Transaction{tx}, nil, nil, newHasher(), nil, true)
+		block = types.NewBlock(&types.Header{Number: big.NewInt(int64(i))}, []*types.Transaction{tx}, nil, nil, newHasher())
 		WriteBlock(chainDb, block)
 		WriteCanonicalHash(chainDb, block.Hash(), block.NumberU64())
 	}

core/state_manager_test.go

@@ -45,7 +45,7 @@ func TestCappedMemoryTrieWriter(t *testing.T) {
 				Root:   common.BigToHash(bigI),
 				Number: bigI,
 			},
-			nil, nil, nil, nil, nil, true,
+			nil, nil, nil, nil,
 		)
 
 		assert.NoError(w.InsertTrie(block))
@@ -84,7 +84,7 @@ func TestNoPruningTrieWriter(t *testing.T) {
 				Root:   common.BigToHash(bigI),
 				Number: bigI,
 			},
-			nil, nil, nil, nil, nil, true,
+			nil, nil, nil, nil,
 		)
 
 		assert.NoError(w.InsertTrie(block))

core/state_processor_test.go

@@ -421,5 +421,5 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 	}
 	header.Root = common.BytesToHash(hasher.Sum(nil))
 	// Assemble and return the final block for sealing
-	return types.NewBlock(header, txs, nil, receipts, trie.NewStackTrie(nil), nil, true)
+	return types.NewBlock(header, txs, nil, receipts, trie.NewStackTrie(nil))
 }

core/txpool/txpool_test.go

@@ -104,7 +104,7 @@ func (bc *testBlockChain) CurrentBlock() *types.Header {
 }
 
 func (bc *testBlockChain) GetBlock(hash common.Hash, number uint64) *types.Block {
-	return types.NewBlock(bc.CurrentBlock(), nil, nil, nil, trie.NewStackTrie(nil), nil, true)
+	return types.NewBlock(bc.CurrentBlock(), nil, nil, nil, trie.NewStackTrie(nil))
 }
 
 func (bc *testBlockChain) StateAt(common.Hash) (*state.StateDB, error) {

core/types/block.go

@@ -190,8 +190,7 @@ type extblock struct {
 // are ignored and set to values derived from the given txs, uncles
 // and receipts.
 func NewBlock(
-	header *Header, txs []*Transaction, uncles []*Header, receipts []*Receipt,
-	hasher TrieHasher, extdata []byte, recalc bool,
+	header *Header, txs []*Transaction, uncles []*Header, receipts []*Receipt, hasher TrieHasher,
 ) *Block {
 	b := &Block{header: CopyHeader(header)}
 
@@ -221,7 +220,6 @@ func NewBlock(
 		}
 	}
 
-	b.setExtData(extdata, recalc)
 	return b
 }
 
@@ -270,38 +268,6 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error {
 	return nil
 }
 
-func (b *Block) setExtDataHelper(data *[]byte, recalc bool) {
-	if data == nil {
-		b.setExtData(nil, recalc)
-		return
-	}
-	b.setExtData(*data, recalc)
-}
-
-func (b *Block) setExtData(data []byte, recalc bool) {
-	_data := make([]byte, len(data))
-	b.extdata = &_data
-	copy(*b.extdata, data)
-	if recalc {
-		b.header.ExtDataHash = CalcExtDataHash(*b.extdata)
-	}
-}
-
-func (b *Block) ExtData() []byte {
-	if b.extdata == nil {
-		return nil
-	}
-	return *b.extdata
-}
-
-func (b *Block) SetVersion(ver uint32) {
-	b.version = ver
-}
-
-func (b *Block) Version() uint32 {
-	return b.version
-}
-
 // EncodeRLP serializes b into the Ethereum RLP block format.
 func (b *Block) EncodeRLP(w io.Writer) error {
 	return rlp.Encode(w, extblock{
@@ -353,13 +319,6 @@ func (b *Block) BaseFee() *big.Int {
 	return new(big.Int).Set(b.header.BaseFee)
 }
 
-func (b *Block) ExtDataGasUsed() *big.Int {
-	if b.header.ExtDataGasUsed == nil {
-		return nil
-	}
-	return new(big.Int).Set(b.header.ExtDataGasUsed)
-}
-
 func (b *Block) BlockGasCost() *big.Int {
 	if b.header.BlockGasCost == nil {
 		return nil
@@ -391,13 +350,6 @@ func (c *writeCounter) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
-func CalcExtDataHash(extdata []byte) common.Hash {
-	if len(extdata) == 0 {
-		return EmptyExtDataHash
-	}
-	return rlpHash(extdata)
-}
-
 func CalcUncleHash(uncles []*Header) common.Hash {
 	if len(uncles) == 0 {
 		return EmptyUncleHash
@@ -418,18 +370,16 @@ func (b *Block) WithSeal(header *Header) *Block {
 }
 
 // WithBody returns a new block with the given transaction and uncle contents.
-func (b *Block) WithBody(transactions []*Transaction, uncles []*Header, version uint32, extdata *[]byte) *Block {
+func (b *Block) WithBody(transactions []*Transaction, uncles []*Header) *Block {
 	block := &Block{
 		header:       CopyHeader(b.header),
 		transactions: make([]*Transaction, len(transactions)),
 		uncles:       make([]*Header, len(uncles)),
-		version:      version,
 	}
 	copy(block.transactions, transactions)
 	for i := range uncles {
 		block.uncles[i] = CopyHeader(uncles[i])
 	}
-	block.setExtDataHelper(extdata, false)
 	return block
 }
 

core/types/block_ext.go

@@ -0,0 +1,67 @@
+// (c) 2024, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package types
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+func (b *Block) WithExtData(version uint32, extdata *[]byte) *Block {
+	b.version = version
+	b.setExtDataHelper(extdata, false)
+	return b
+}
+
+func (b *Block) setExtDataHelper(data *[]byte, recalc bool) {
+	if data == nil {
+		b.setExtData(nil, recalc)
+		return
+	}
+	b.setExtData(*data, recalc)
+}
+
+func (b *Block) setExtData(data []byte, recalc bool) {
+	_data := make([]byte, len(data))
+	b.extdata = &_data
+	copy(*b.extdata, data)
+	if recalc {
+		b.header.ExtDataHash = CalcExtDataHash(*b.extdata)
+	}
+}
+
+func (b *Block) ExtData() []byte {
+	if b.extdata == nil {
+		return nil
+	}
+	return *b.extdata
+}
+
+func (b *Block) Version() uint32 {
+	return b.version
+}
+
+func (b *Block) ExtDataGasUsed() *big.Int {
+	if b.header.ExtDataGasUsed == nil {
+		return nil
+	}
+	return new(big.Int).Set(b.header.ExtDataGasUsed)
+}
+
+func CalcExtDataHash(extdata []byte) common.Hash {
+	if len(extdata) == 0 {
+		return EmptyExtDataHash
+	}
+	return rlpHash(extdata)
+}
+
+func NewBlockWithExtData(
+	header *Header, txs []*Transaction, uncles []*Header, receipts []*Receipt,
+	hasher TrieHasher, extdata []byte, recalc bool,
+) *Block {
+	b := NewBlock(header, txs, uncles, receipts, hasher)
+	b.setExtData(extdata, recalc)
+	return b
+}

core/types/block_test.go

@@ -363,7 +363,7 @@ func makeBenchBlock() *Block {
 			Extra:      []byte("benchmark uncle"),
 		}
 	}
-	return NewBlock(header, txs, uncles, receipts, newHasher(), nil, true)
+	return NewBlock(header, txs, uncles, receipts, newHasher())
 }
 
 func TestAP4BlockEncoding(t *testing.T) {

eth/filters/filter_system_test.go

@@ -222,7 +222,7 @@ func TestBlockSubscription(t *testing.T) {
 		api          = NewFilterAPI(sys)
 		genesis      = &core.Genesis{
 			Config:  params.TestChainConfig,
-			BaseFee: big.NewInt(params.ApricotPhase4MinBaseFee),
+			BaseFee: big.NewInt(1),
 		}
 		_, chain, _, _ = core.GenerateChainWithGenesis(genesis, dummy.NewFaker(), 10, 10, func(i int, b *core.BlockGen) {})
 		chainEvents    = []core.ChainEvent{}

eth/filters/filter_test.go

@@ -65,7 +65,7 @@ func BenchmarkFilters(b *testing.B) {
 		gspec = &core.Genesis{
 			Config:  params.TestChainConfig,
 			Alloc:   core.GenesisAlloc{addr1: {Balance: big.NewInt(1000000)}},
-			BaseFee: big.NewInt(params.ApricotPhase3InitialBaseFee),
+			BaseFee: big.NewInt(1),
 		}
 	)
 	defer db.Close()
@@ -106,6 +106,7 @@ func BenchmarkFilters(b *testing.B) {
 	require.NoError(b, err)
 
 	for i := 0; i < b.N; i++ {
+		filter.begin = 0
 		logs, _ := filter.Logs(context.Background())
 		if len(logs) != 4 {
 			b.Fatal("expected 4 logs, got", len(logs))
@@ -128,7 +129,7 @@ func TestFilters(t *testing.T) {
 		gspec = &core.Genesis{
 			Config:  params.TestChainConfig,
 			Alloc:   core.GenesisAlloc{addr: {Balance: big.NewInt(1000000)}},
-			BaseFee: big.NewInt(params.ApricotPhase3InitialBaseFee),
+			BaseFee: big.NewInt(1),
 		}
 	)
 	defer db.Close()

eth/tracers/api_test.go

@@ -232,7 +232,8 @@ func TestTraceCall(t *testing.T) {
 			accounts[0].addr: {Balance: big.NewInt(params.Ether)},
 			accounts[1].addr: {Balance: big.NewInt(params.Ether)},
 			accounts[2].addr: {Balance: big.NewInt(params.Ether)},
-		}}
+		},
+	}
 	genBlocks := 10
 	signer := types.HomesteadSigner{}
 	backend := newTestBackend(t, genBlocks, genesis, func(i int, b *core.BlockGen) {

ethclient/ethclient.go

@@ -260,7 +260,7 @@ func (ec *client) getBlock(ctx context.Context, method string, args ...interface
 		}
 		txs[i] = tx.tx
 	}
-	return types.NewBlockWithHeader(head).WithBody(txs, uncles, body.Version, (*[]byte)(body.BlockExtraData)), nil
+	return types.NewBlockWithHeader(head).WithBody(txs, uncles).WithExtData(body.Version, (*[]byte)(body.BlockExtraData)), nil
 }
 
 // HeaderByHash returns the block header with the given hash.

internal/ethapi/api_test.go

@@ -709,7 +709,7 @@ func TestRPCMarshalBlock(t *testing.T) {
 		}
 		txs = append(txs, tx)
 	}
-	block := types.NewBlock(&types.Header{Number: big.NewInt(100)}, txs, nil, nil, newHasher(), nil, false)
+	block := types.NewBlock(&types.Header{Number: big.NewInt(100)}, txs, nil, nil, newHasher())
 
 	var testSuite = []struct {
 		inclTx bool

plugin/evm/syncervm_test.go

@@ -556,7 +556,7 @@ func patchBlock(blk *types.Block, root common.Hash, db ethdb.Database) *types.Bl
 	header := blk.Header()
 	header.Root = root
 	receipts := rawdb.ReadRawReceipts(db, blk.Hash(), blk.NumberU64())
-	newBlk := types.NewBlock(
+	newBlk := types.NewBlockWithExtData(
 		header, blk.Transactions(), blk.Uncles(), receipts, trie.NewStackTrie(nil), blk.ExtData(), true,
 	)
 	rawdb.WriteBlock(db, newBlk)