Improve plugin/evm/header tests (#816)

Author: StephenButtolph

eth/api_backend.go

@@ -522,7 +522,7 @@ func (b *EthAPIBackend) StateAtTransaction(ctx context.Context, block *types.Blo
 }
 
 func (b *EthAPIBackend) MinRequiredTip(ctx context.Context, header *types.Header) (*big.Int, error) {
-	return customheader.MinRequiredTip(b.ChainConfig(), header)
+	return customheader.EstimateRequiredTip(b.ChainConfig(), header)
 }
 
 func (b *EthAPIBackend) isLatestAndAllowed(number rpc.BlockNumber) bool {

eth/gasprice/gasprice_test.go

@@ -152,7 +152,7 @@ func newTestBackend(t *testing.T, config *params.ChainConfig, numBlocks int, ext
 }
 
 func (b *testBackend) MinRequiredTip(ctx context.Context, header *types.Header) (*big.Int, error) {
-	return customheader.MinRequiredTip(b.chain.Config(), header)
+	return customheader.EstimateRequiredTip(b.chain.Config(), header)
 }
 
 func (b *testBackend) CurrentHeader() *types.Header {

plugin/evm/ap3/window.go

@@ -7,7 +7,7 @@ package ap3
 import (
 	"math"
 
-	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/utils"
 	safemath "github.com/ethereum/go-ethereum/common/math"
 )
 
@@ -19,13 +19,13 @@ const (
 	// upgrade.
 	//
 	// This value was modified in Apricot Phase 4.
-	MinBaseFee = 75 * params.GWei
+	MinBaseFee = 75 * utils.GWei
 
 	// MaxBaseFee is the maximum base fee that is allowed after Apricot Phase 3
 	// upgrade.
 	//
 	// This value was modified in Apricot Phase 4.
-	MaxBaseFee = 225 * params.GWei
+	MaxBaseFee = 225 * utils.GWei
 
 	// InitialBaseFee is the base fee that is used for the first Apricot Phase 3
 	// block.

plugin/evm/ap4/cost.go

@@ -9,7 +9,7 @@ import (
 	"math"
 
 	safemath "github.com/ava-labs/avalanchego/utils/math"
-	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/utils"
 )
 
 const (
@@ -36,13 +36,13 @@ const (
 	// This value modifies the previously used `ap3.MinBaseFee`.
 	//
 	// This value was modified in Etna.
-	MinBaseFee = 25 * params.GWei
+	MinBaseFee = 25 * utils.GWei
 
 	// MaxBaseFee is the maximum base fee that is allowed after Apricot Phase 3
 	// upgrade.
 	//
 	// This value modifies the previously used `ap3.MaxBaseFee`.
-	MaxBaseFee = 1_000 * params.GWei
+	MaxBaseFee = 1_000 * utils.GWei
 )
 
 // BlockGasCost calculates the required block gas cost.

plugin/evm/export_tx_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/ava-labs/avalanchego/vms/secp256k1fx"
 	"github.com/ava-labs/coreth/params"
 	"github.com/ava-labs/coreth/plugin/evm/atomic"
+	"github.com/ava-labs/coreth/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/holiman/uint256"
 )
@@ -1491,7 +1492,7 @@ func TestExportTxGasCost(t *testing.T) {
 			Keys:            [][]*secp256k1.PrivateKey{{testKeys[0]}},
 			ExpectedGasUsed: 1230,
 			ExpectedFee:     30750,
-			BaseFee:         big.NewInt(25 * params.GWei),
+			BaseFee:         big.NewInt(25 * utils.GWei),
 		},
 		"simple export 225Gwei BaseFee": {
 			UnsignedExportTx: &atomic.UnsignedExportTx{
@@ -1523,7 +1524,7 @@ func TestExportTxGasCost(t *testing.T) {
 			Keys:            [][]*secp256k1.PrivateKey{{testKeys[0]}},
 			ExpectedGasUsed: 1230,
 			ExpectedFee:     276750,
-			BaseFee:         big.NewInt(225 * params.GWei),
+			BaseFee:         big.NewInt(225 * utils.GWei),
 		},
 		"complex export 25Gwei BaseFee": {
 			UnsignedExportTx: &atomic.UnsignedExportTx{
@@ -1567,7 +1568,7 @@ func TestExportTxGasCost(t *testing.T) {
 			Keys:            [][]*secp256k1.PrivateKey{{testKeys[0], testKeys[0], testKeys[0]}},
 			ExpectedGasUsed: 3366,
 			ExpectedFee:     84150,
-			BaseFee:         big.NewInt(25 * params.GWei),
+			BaseFee:         big.NewInt(25 * utils.GWei),
 		},
 		"complex export 225Gwei BaseFee": {
 			UnsignedExportTx: &atomic.UnsignedExportTx{
@@ -1611,7 +1612,7 @@ func TestExportTxGasCost(t *testing.T) {
 			Keys:            [][]*secp256k1.PrivateKey{{testKeys[0], testKeys[0], testKeys[0]}},
 			ExpectedGasUsed: 3366,
 			ExpectedFee:     757350,
-			BaseFee:         big.NewInt(225 * params.GWei),
+			BaseFee:         big.NewInt(225 * utils.GWei),
 		},
 	}
 

plugin/evm/gossip_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/ava-labs/coreth/core/types"
 	"github.com/ava-labs/coreth/core/vm"
 	"github.com/ava-labs/coreth/params"
+	"github.com/ava-labs/coreth/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/prometheus/client_golang/prometheus"
@@ -67,7 +68,7 @@ func TestGossipSubscribe(t *testing.T) {
 	}, 10*time.Second, 500*time.Millisecond, "expected gossipTxPool to be subscribed")
 
 	// create eth txs
-	ethTxs := getValidEthTxs(key, 10, big.NewInt(226*params.GWei))
+	ethTxs := getValidEthTxs(key, 10, big.NewInt(226*utils.GWei))
 
 	// Notify mempool about txs
 	errs := txPool.AddRemotesSync(ethTxs)

plugin/evm/header/base_fee.go

@@ -17,7 +17,11 @@ var errEstimateBaseFeeWithoutActivation = errors.New("cannot estimate base fee f
 // calculates the expected base fee for the child block.
 //
 // Prior to AP3, the returned base fee will be nil.
-func BaseFee(config *params.ChainConfig, parent *types.Header, timestamp uint64) (*big.Int, error) {
+func BaseFee(
+	config *params.ChainConfig,
+	parent *types.Header,
+	timestamp uint64,
+) (*big.Int, error) {
 	switch {
 	case config.IsApricotPhase3(timestamp):
 		return baseFeeFromWindow(config, parent, timestamp)
@@ -35,7 +39,11 @@ func BaseFee(config *params.ChainConfig, parent *types.Header, timestamp uint64)
 //
 // Warning: This function should only be used in estimation and should not be
 // used when calculating the canonical base fee for a block.
-func EstimateNextBaseFee(config *params.ChainConfig, parent *types.Header, timestamp uint64) (*big.Int, error) {
+func EstimateNextBaseFee(
+	config *params.ChainConfig,
+	parent *types.Header,
+	timestamp uint64,
+) (*big.Int, error) {
 	if config.ApricotPhase3BlockTimestamp == nil {
 		return nil, errEstimateBaseFeeWithoutActivation
 	}