partial cherry-pick: Coreth/Implement ACP-176 (#815) (b1e098cd)

Author: ceyonur

consensus/dummy/consensus.go

@@ -4,7 +4,6 @@
 package dummy
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"math/big"
@@ -46,6 +45,16 @@ type (
 	}
 )
 
+func NewDummyEngine(
+	mode Mode,
+	clock *mockable.Clock,
+) *DummyEngine {
+	return &DummyEngine{
+		clock:         clock,
+		consensusMode: mode,
+	}
+}
+
 func NewETHFaker() *DummyEngine {
 	return &DummyEngine{
 		clock:         &mockable.Clock{},
@@ -116,7 +125,7 @@ func (eng *DummyEngine) verifyCoinbase(config *params.ChainConfig, header *types
 	return nil
 }
 
-func (eng *DummyEngine) verifyHeaderGasFields(config *params.ChainConfig, header *types.Header, parent *types.Header, chain consensus.ChainHeaderReader) error {
+func verifyHeaderGasFields(config *params.ChainConfig, header *types.Header, parent *types.Header, chain consensus.ChainHeaderReader) error {
 	// We verify the current block by checking the parent fee config
 	// this is because the current block cannot set the fee config for itself
 	// Fee config might depend on the state when precompile is activated
@@ -126,20 +135,14 @@ func (eng *DummyEngine) verifyHeaderGasFields(config *params.ChainConfig, header
 	if err != nil {
 		return err
 	}
-	// Verify that the gasUsed is <= gasLimit
-	if header.GasUsed > header.GasLimit {
-		return fmt.Errorf("invalid gasUsed: have %d, gasLimit %d", header.GasUsed, header.GasLimit)
+	if err := customheader.VerifyGasUsed(config, feeConfig, parent, header); err != nil {
+		return err
 	}
 	if err := customheader.VerifyGasLimit(config, feeConfig, parent, header); err != nil {
 		return err
 	}
-	// Verify header.Extra matches the expected value.
-	expectedExtraPrefix, err := customheader.ExtraPrefix(config, parent, header.Time)
-	if err != nil {
-		return fmt.Errorf("failed to calculate extra prefix: %w", err)
-	}
-	if !bytes.HasPrefix(header.Extra, expectedExtraPrefix) {
-		return fmt.Errorf("expected header.Extra to have prefix: %x, found %x", expectedExtraPrefix, header.Extra)
+	if err := customheader.VerifyExtraPrefix(config, parent, header); err != nil {
+		return err
 	}
 
 	// Verify header.BaseFee matches the expected value.
@@ -185,7 +188,7 @@ func (eng *DummyEngine) verifyHeader(chain consensus.ChainHeaderReader, header *
 	}
 
 	// Ensure gas-related header fields are correct
-	if err := eng.verifyHeaderGasFields(config, header, parent, chain); err != nil {
+	if err := verifyHeaderGasFields(config, header, parent, chain); err != nil {
 		return err
 	}
 	// Ensure that coinbase is valid
@@ -395,7 +398,7 @@ func (eng *DummyEngine) FinalizeAndAssemble(chain consensus.ChainHeaderReader, h
 	}
 
 	// finalize the header.Extra
-	extraPrefix, err := customheader.ExtraPrefix(config, parent, header.Time)
+	extraPrefix, err := customheader.ExtraPrefix(config, parent, header)
 	if err != nil {
 		return nil, fmt.Errorf("failed to calculate new header.Extra: %w", err)
 	}

core/chain_makers.go

@@ -378,7 +378,10 @@ func (cm *chainMaker) makeHeader(parent *types.Block, gap uint64, state *state.S
 	if err != nil {
 		panic(err)
 	}
-	gasLimit := header.GasLimit(cm.config, feeConfig, parent.Header(), time)
+	gasLimit, err := header.GasLimit(cm.config, feeConfig, parent.Header(), time)
+	if err != nil {
+		panic(err)
+	}
 	baseFee, err := header.BaseFee(cm.config, feeConfig, parent.Header(), time)
 	if err != nil {
 		panic(err)

core/state_processor_test.go

@@ -437,6 +437,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 	if err != nil {
 		panic(err)
 	}
+	gasLimit, _ := customheader.GasLimit(config, feeConfig, parent.Header(), time)
 	baseFee, _ := customheader.BaseFee(config, feeConfig, parent.Header(), time)
 	header := &types.Header{
 		ParentHash: parent.Hash(),
@@ -447,7 +448,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 			Difficulty: parent.Difficulty(),
 			UncleHash:  parent.UncleHash(),
 		}),
-		GasLimit:  parent.GasLimit(),
+		GasLimit:  gasLimit,
 		Number:    new(big.Int).Add(parent.Number(), common.Big1),
 		Time:      time,
 		UncleHash: types.EmptyUncleHash,
@@ -473,7 +474,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 		cumulativeGas += tx.Gas()
 		nBlobs += len(tx.BlobHashes())
 	}
-	header.Extra, _ = customheader.ExtraPrefix(config, parent.Header(), time)
+	header.Extra, _ = customheader.ExtraPrefix(config, parent.Header(), header)
 	header.Root = common.BytesToHash(hasher.Sum(nil))
 	if config.IsCancun(header.Number, header.Time) {
 		var pExcess, pUsed = uint64(0), uint64(0)

eth/gasprice/gasprice_test.go

@@ -109,7 +109,7 @@ func newTestBackendFakerEngine(t *testing.T, config *params.ChainConfig, numBloc
 	engine := dummy.NewETHFaker()
 
 	// Generate testing blocks
-	_, blocks, _, err := core.GenerateChainWithGenesis(gspec, engine, numBlocks, 0, genBlocks)
+	_, blocks, _, err := core.GenerateChainWithGenesis(gspec, engine, numBlocks, config.FeeConfig.TargetBlockRate-1, genBlocks)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -136,7 +136,7 @@ func newTestBackend(t *testing.T, config *params.ChainConfig, numBlocks int, gen
 	engine := dummy.NewFaker()
 
 	// Generate testing blocks
-	_, blocks, _, err := core.GenerateChainWithGenesis(gspec, engine, numBlocks, 1, genBlocks)
+	_, blocks, _, err := core.GenerateChainWithGenesis(gspec, engine, numBlocks, config.FeeConfig.TargetBlockRate-1, genBlocks)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -257,7 +257,7 @@ func TestSuggestTipCapNetworkUpgrades(t *testing.T) {
 	}
 }
 
-func TestSuggestTipCap(t *testing.T) {
+func TestSuggestTipCapSimple(t *testing.T) {
 	applyGasPriceTest(t, suggestTipCapTest{
 		chainConfig: params.TestChainConfig,
 		numBlocks:   3,

miner/worker.go

@@ -38,6 +38,7 @@ import (
 
 	"github.com/ava-labs/avalanchego/utils/timer/mockable"
 	"github.com/ava-labs/avalanchego/utils/units"
+	"github.com/ava-labs/subnet-evm/commontype"
 	"github.com/ava-labs/subnet-evm/consensus"
 	"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
 	"github.com/ava-labs/subnet-evm/core"
@@ -46,7 +47,7 @@ import (
 	"github.com/ava-labs/subnet-evm/core/types"
 	"github.com/ava-labs/subnet-evm/core/vm"
 	"github.com/ava-labs/subnet-evm/params"
-	"github.com/ava-labs/subnet-evm/plugin/evm/header"
+	customheader "github.com/ava-labs/subnet-evm/plugin/evm/header"
 	"github.com/ava-labs/subnet-evm/precompile/precompileconfig"
 	"github.com/ava-labs/subnet-evm/predicate"
 	"github.com/ethereum/go-ethereum/common"
@@ -150,8 +151,11 @@ func (w *worker) commitNewWork(predicateContext *precompileconfig.PredicateConte
 	if err != nil {
 		return nil, err
 	}
-	gasLimit := header.GasLimit(w.chainConfig, feeConfig, parent, timestamp)
-	baseFee, err := header.BaseFee(w.chainConfig, feeConfig, parent, timestamp)
+	gasLimit, err := customheader.GasLimit(w.chainConfig, feeConfig, parent, timestamp)
+	if err != nil {
+		return nil, fmt.Errorf("calculating new gas limit: %w", err)
+	}
+	baseFee, err := customheader.BaseFee(w.chainConfig, feeConfig, parent, timestamp)
 	if err != nil {
 		return nil, fmt.Errorf("failed to calculate new base fee: %w", err)
 	}
@@ -200,7 +204,7 @@ func (w *worker) commitNewWork(predicateContext *precompileconfig.PredicateConte
 		return nil, fmt.Errorf("failed to prepare header for mining: %w", err)
 	}
 
-	env, err := w.createCurrentEnvironment(predicateContext, parent, header, tstart)
+	env, err := w.createCurrentEnvironment(predicateContext, parent, header, feeConfig, tstart)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create new current environment: %w", err)
 	}
@@ -269,11 +273,15 @@ func (w *worker) commitNewWork(predicateContext *precompileconfig.PredicateConte
 	return w.commit(env)
 }
 
-func (w *worker) createCurrentEnvironment(predicateContext *precompileconfig.PredicateContext, parent *types.Header, header *types.Header, tstart time.Time) (*environment, error) {
+func (w *worker) createCurrentEnvironment(predicateContext *precompileconfig.PredicateContext, parent *types.Header, header *types.Header, feeConfig commontype.FeeConfig, tstart time.Time) (*environment, error) {
 	currentState, err := w.chain.StateAt(parent.Root)
 	if err != nil {
 		return nil, err
 	}
+	capacity, err := customheader.GasCapacity(w.chainConfig, feeConfig, parent, header.Time)
+	if err != nil {
+		return nil, fmt.Errorf("calculating gas capacity: %w", err)
+	}
 	numPrefetchers := w.chain.CacheConfig().TriePrefetcherParallelism
 	currentState.StartPrefetcher("miner", state.WithConcurrentWorkers(numPrefetchers))
 	return &environment{
@@ -282,7 +290,7 @@ func (w *worker) createCurrentEnvironment(predicateContext *precompileconfig.Pre
 		parent:           parent,
 		header:           header,
 		tcount:           0,
-		gasPool:          new(core.GasPool).AddGas(header.GasLimit),
+		gasPool:          new(core.GasPool).AddGas(capacity),
 		rules:            w.chainConfig.Rules(header.Number, header.Time),
 		predicateContext: predicateContext,
 		predicateResults: predicate.NewResults(),

plugin/evm/header/extra.go

@@ -4,6 +4,7 @@
 package header
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 
@@ -12,18 +13,21 @@ import (
 	"github.com/ava-labs/subnet-evm/plugin/evm/upgrade/subnetevm"
 )
 
-var errInvalidExtraLength = errors.New("invalid header.Extra length")
+var (
+	errInvalidExtraPrefix = errors.New("invalid header.Extra prefix")
+	errInvalidExtraLength = errors.New("invalid header.Extra length")
+)
 
 // ExtraPrefix takes the previous header and the timestamp of its child
 // block and calculates the expected extra prefix for the child block.
 func ExtraPrefix(
 	config *params.ChainConfig,
 	parent *types.Header,
-	timestamp uint64,
+	header *types.Header,
 ) ([]byte, error) {
 	switch {
-	case config.IsSubnetEVM(timestamp):
-		window, err := feeWindow(config, parent, timestamp)
+	case config.IsSubnetEVM(header.Time):
+		window, err := feeWindow(config, parent, header.Time)
 		if err != nil {
 			return nil, fmt.Errorf("failed to calculate fee window: %w", err)
 		}
@@ -34,8 +38,35 @@ func ExtraPrefix(
 	}
 }
 
+// VerifyExtraPrefix verifies that the header's Extra field is correctly
+// formatted.
+func VerifyExtraPrefix(
+	config *params.ChainConfig,
+	parent *types.Header,
+	header *types.Header,
+) error {
+	switch {
+	case config.IsSubnetEVM(header.Time):
+		feeWindow, err := feeWindow(config, parent, header.Time)
+		if err != nil {
+			return fmt.Errorf("calculating expected fee window: %w", err)
+		}
+		feeWindowBytes := feeWindow.Bytes()
+		if !bytes.HasPrefix(header.Extra, feeWindowBytes) {
+			return fmt.Errorf("%w: expected %x as prefix, found %x",
+				errInvalidExtraPrefix,
+				feeWindowBytes,
+				header.Extra,
+			)
+		}
+	}
+	return nil
+}
+
 // VerifyExtra verifies that the header's Extra field is correctly formatted for
-// [rules].
+// rules.
+//
+// TODO: Should this be merged with VerifyExtraPrefix?
 func VerifyExtra(rules params.AvalancheRules, extra []byte) error {
 	extraLen := len(extra)
 	switch {
@@ -72,13 +103,13 @@ func VerifyExtra(rules params.AvalancheRules, extra []byte) error {
 
 // PredicateBytesFromExtra returns the predicate result bytes from the header's
 // extra data. If the extra data is not long enough, an empty slice is returned.
-func PredicateBytesFromExtra(_ params.AvalancheRules, extra []byte) []byte {
+func PredicateBytesFromExtra(rules params.AvalancheRules, extra []byte) []byte {
+	offset := subnetevm.WindowSize
 	// Prior to Durango, the VM enforces the extra data is smaller than or equal
-	// to this size.
-	// After Durango, the VM pre-verifies the extra data past the dynamic fee
-	// rollup window is valid.
-	if len(extra) <= subnetevm.WindowSize {
+	// to `offset`.
+	// After Durango, the VM pre-verifies the extra data past `offset` is valid.
+	if len(extra) <= offset {
 		return nil
 	}
-	return extra[subnetevm.WindowSize:]
+	return extra[offset:]
 }