Merge branch 'main' into thomas/fix-bug-reverted

x/evm/types/access_list_test.go

@@ -0,0 +1,38 @@
+package types
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
+)
+
+func (suite *TxDataTestSuite) TestTestNewAccessList() {
+	testCases := []struct {
+		name          string
+		ethAccessList *ethtypes.AccessList
+		expAl         AccessList
+	}{
+		{
+			"ethAccessList is nil",
+			nil,
+			nil,
+		},
+		{
+			"non-empty ethAccessList",
+			&ethtypes.AccessList{{Address: suite.addr, StorageKeys: []common.Hash{{0}}}},
+			AccessList{{Address: suite.hexAddr, StorageKeys: []string{common.Hash{}.Hex()}}},
+		},
+	}
+	for _, tc := range testCases {
+		al := NewAccessList(tc.ethAccessList)
+
+		suite.Require().Equal(tc.expAl, al)
+	}
+}
+
+func (suite *TxDataTestSuite) TestAccessListToEthAccessList() {
+	ethAccessList := ethtypes.AccessList{{Address: suite.addr, StorageKeys: []common.Hash{{0}}}}
+	al := NewAccessList(&ethAccessList)
+	actual := al.ToEthAccessList()
+
+	suite.Require().Equal(&ethAccessList, actual)
+}

x/evm/types/chain_config_test.go

@@ -238,7 +238,6 @@ func TestChainConfigValidate(t *testing.T) {
 			},
 			true,
 		},
-
 		{
 			"invalid CatalystBlock",
 			ChainConfig{
@@ -258,6 +257,25 @@ func TestChainConfigValidate(t *testing.T) {
 			},
 			true,
 		},
+		{
+			"invalid fork order - skip HomesteadBlock",
+			ChainConfig{
+				DAOForkBlock:        newIntPtr(0),
+				EIP150Block:         newIntPtr(0),
+				EIP150Hash:          defaultEIP150Hash,
+				EIP155Block:         newIntPtr(0),
+				EIP158Block:         newIntPtr(0),
+				ByzantiumBlock:      newIntPtr(0),
+				ConstantinopleBlock: newIntPtr(0),
+				PetersburgBlock:     newIntPtr(0),
+				IstanbulBlock:       newIntPtr(0),
+				MuirGlacierBlock:    newIntPtr(0),
+				BerlinBlock:         newIntPtr(0),
+				LondonBlock:         newIntPtr(0),
+				CatalystBlock:       newIntPtr(0),
+			},
+			true,
+		},
 	}
 
 	for _, tc := range testCases {

x/evm/types/dynamic_fee_tx.go

@@ -103,15 +103,15 @@ func (tx *DynamicFeeTx) GetGasPrice() *big.Int {
 	return tx.GetGasFeeCap()
 }
 
-// GetGasTipCap returns the gas price field.
+// GetGasTipCap returns the gas tip cap field.
 func (tx *DynamicFeeTx) GetGasTipCap() *big.Int {
 	if tx.GasTipCap == nil {
 		return nil
 	}
 	return tx.GasTipCap.BigInt()
 }
 
-// GetGasFeeCap returns the gas price field.
+// GetGasFeeCap returns the gas fee cap field.
 func (tx *DynamicFeeTx) GetGasFeeCap() *big.Int {
 	if tx.GasFeeCap == nil {
 		return nil