Fixed config usage.

Author: Frozen

consensus/misc/eip1559/eip1559.go

@@ -17,24 +17,26 @@
 package eip1559
 
 import (
+	"fmt"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/consensus/misc"
 	"github.com/harmony-one/harmony/block"
 	"github.com/harmony-one/harmony/internal/params"
+	"github.com/pkg/errors"
 )
 
-/*
 // VerifyEIP1559Header verifies some header attributes which were changed in EIP-1559,
 // - gas limit check
 // - basefee check
-func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Header) error {
+func VerifyEIP1559Header(config *params.ChainConfig, parent, header *block.Header) error {
 	// Verify that the gas limit remains within allowed bounds
-	parentGasLimit := parent.GasLimit
-	if !config.IsLondon(parent.Number) {
-		parentGasLimit = parent.GasLimit * config.ElasticityMultiplier()
+	parentGasLimit := parent.GasLimit()
+	if !config.IsLondon(parent.Number()) {
+		parentGasLimit = parent.GasLimit() * config.ElasticityMultiplier()
 	}
-	if err := misc.VerifyGaslimit(parentGasLimit, header.GasLimit); err != nil {
+	if err := misc.VerifyGaslimit(parentGasLimit, header.GasLimit()); err != nil {
 		return err
 	}
 	// Verify the header is not malformed
@@ -43,13 +45,12 @@ func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Heade
 	}
 	// Verify the baseFee is correct based on the parent header.
 	expectedBaseFee := CalcBaseFee(config, parent)
-	if header.BaseFee.Cmp(expectedBaseFee) != 0 {
+	if header.BaseFee().Cmp(expectedBaseFee) != 0 {
 		return fmt.Errorf("invalid baseFee: have %s, want %s, parentBaseFee %s, parentGasUsed %d",
-			header.BaseFee, expectedBaseFee, parent.BaseFee, parent.GasUsed)
+			header.BaseFee(), expectedBaseFee, parent.BaseFee(), parent.GasUsed())
 	}
 	return nil
 }
-*/
 
 // CalcBaseFee calculates the basefee of the header.
 func CalcBaseFee(config *params.ChainConfig, parent *block.Header) *big.Int {

consensus/misc/eip1559/eip1559_test.go

@@ -22,7 +22,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/harmony-one/harmony/internal/params"
+
+	"github.com/harmony-one/harmony/block"
+	v4 "github.com/harmony-one/harmony/block/v4"
 )
 
 // copyConfig does a _shallow_ copy of a given config. Safe to set new values, but
@@ -51,7 +54,7 @@ func copyConfig(original *params.ChainConfig) *params.ChainConfig {
 
 func config() *params.ChainConfig {
 	config := copyConfig(params.TestChainConfig)
-	config.LondonBlock = big.NewInt(5)
+	config.EIP1559Epoch = big.NewInt(1)
 	return config
 }
 
@@ -83,7 +86,7 @@ func TestBlockGasLimits(t *testing.T) {
 		{40000000, 5, 39960939, true},  // lower limit
 		{40000000, 5, 39960938, false}, // Lower limit -1
 	} {
-		parent := &types.Header{
+		parent := &block.Header{
 			GasUsed:  tc.pGasLimit / 2,
 			GasLimit: tc.pGasLimit,
 			BaseFee:  initial,
@@ -118,7 +121,7 @@ func TestCalcBaseFee(t *testing.T) {
 		{params.InitialBaseFee, 20000000, 11000000, 1012500000},            // usage above target
 	}
 	for i, test := range tests {
-		parent := &types.Header{
+		parent := &v4.Header{
 			Number:   common.Big32,
 			GasLimit: test.parentGasLimit,
 			GasUsed:  test.parentGasUsed,

internal/params/config.go

@@ -323,6 +323,7 @@ var (
 		MaxRateEpoch:                          EpochTBD,
 		DevnetExternalEpoch:                   EpochTBD,
 		TestnetExternalEpoch:                  EpochTBD,
+		EIP1559Epoch:                          big.NewInt(1),
 	}
 
 	// AllProtocolChanges ...
@@ -374,6 +375,7 @@ var (
 		big.NewInt(0),
 		big.NewInt(0),
 		big.NewInt(0),
+		big.NewInt(0),
 	}
 
 	// TestChainConfig ...
@@ -425,6 +427,7 @@ var (
 		big.NewInt(0),        // MaxRateEpoch
 		big.NewInt(0),
 		big.NewInt(0),
+		big.NewInt(0),
 	}
 
 	// TestRules ...
@@ -899,7 +902,7 @@ func (c *ChainConfig) IsOneEpochBeforeHIP30(epoch *big.Int) bool {
 }
 
 func (c *ChainConfig) IsLondon(epoch *big.Int) bool {
-	panic("unimplemented")
+	return false
 }
 
 // BaseFeeChangeDenominator