fix logic

x/feemarket/keeper/eip1559.go

@@ -25,11 +25,11 @@ func (k Keeper) CalculateBaseFee(ctx sdk.Context) *big.Int {
 
 	// If the current block is the first EIP-1559 block, return the InitialBaseFee.
 	if ctx.BlockHeight() == params.EnableHeight {
-		return k.GetBaseFee(ctx)
+		return params.BaseFee.BigInt()
 	}
 
 	// get the block gas used and the base fee values for the parent block.
-	parentBaseFee := k.GetBaseFee(ctx)
+	parentBaseFee := params.BaseFee.BigInt()
 	if parentBaseFee == nil {
 		return nil
 	}

x/feemarket/simulation/genesis.go

@@ -6,16 +6,14 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tharsis/ethermint/x/feemarket/types"
 )
 
 // RandomizedGenState generates a random GenesisState for nft
 func RandomizedGenState(simState *module.SimulationState) {
 	params := types.NewParams(simState.Rand.Uint32()%2 == 0, simState.Rand.Uint32(), simState.Rand.Uint32(), simState.Rand.Uint64(), simState.Rand.Int63())
-	baseFee := sdk.NewInt(simState.Rand.Int63())
 	blockGas := simState.Rand.Uint64()
-	feemarketGenesis := types.NewGenesisState(params, baseFee, blockGas)
+	feemarketGenesis := types.NewGenesisState(params, blockGas)
 
 	bz, err := json.MarshalIndent(feemarketGenesis, "", " ")
 	if err != nil {

x/feemarket/types/genesis.go

@@ -1,9 +1,5 @@
 package types
 
-import (
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
 // DefaultGenesisState sets default fee market genesis state.
 func DefaultGenesisState() *GenesisState {
 	return &GenesisState{
@@ -13,7 +9,7 @@ func DefaultGenesisState() *GenesisState {
 }
 
 // NewGenesisState creates a new genesis state.
-func NewGenesisState(params Params, baseFee sdk.Int, blockGas uint64) *GenesisState {
+func NewGenesisState(params Params, blockGas uint64) *GenesisState {
 	return &GenesisState{
 		Params:   params,
 		BlockGas: blockGas,

x/feemarket/types/genesis_test.go

@@ -3,7 +3,6 @@ package types
 import (
 	"testing"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -38,7 +37,6 @@ func (suite *GenesisTestSuite) TestValidateGenesis() {
 			"valid New genesis",
 			NewGenesisState(
 				DefaultParams(),
-				sdk.ZeroInt(),
 				uint64(1),
 			),
 			true,