Remove simulation checks (#1507)

* Add cli rollback command

it's useful in app-hash mismatch situation.

* Update CHANGELOG.md

* (refactor): removed old sim tests logic

* (fix): removed tests from CI

* (fix): fix test.yml

* (fix): format and lint

* (fix): fix linter issue

* (fix): fix linter issues v2

* (fix): linter

* (fix): removed sim-test references

* Applied changes from code review

Co-authored-by: HuangYi <huang@crypto.com>

x/evm/module.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/evmos/ethermint/x/evm/client/cli"
 	"github.com/evmos/ethermint/x/evm/keeper"
-	"github.com/evmos/ethermint/x/evm/simulation"
 	"github.com/evmos/ethermint/x/evm/types"
 )
 
@@ -65,7 +64,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
 
 // RegisterRESTRoutes performs a no-op as the EVM module doesn't expose REST
 // endpoints
-func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) {
+func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {
 }
 
 func (b AppModuleBasic) RegisterGRPCGatewayRoutes(c client.Context, serveMux *runtime.ServeMux) {
@@ -114,7 +113,7 @@ func (AppModule) Name() string {
 
 // RegisterInvariants interface for registering invariants. Performs a no-op
 // as the evm module doesn't expose invariants.
-func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {
+func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {
 }
 
 // RegisterServices registers a GRPC query service to respond to the
@@ -134,7 +133,7 @@ func (AppModule) QuerierRoute() string { return types.RouterKey }
 
 // LegacyQuerierHandler returns nil as the evm module doesn't expose a legacy
 // Querier.
-func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
+func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier {
 	return nil
 }
 
@@ -167,28 +166,24 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // RandomizedParams creates randomized evm param changes for the simulator.
-func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange {
-	return simulation.ParamChanges(r)
+func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange {
+	return nil
 }
 
 // RegisterStoreDecoder registers a decoder for evm module's types
-func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {
-	sdr[types.StoreKey] = simulation.NewDecodeStore()
+func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals.
-func (AppModule) ProposalContents(simState module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
 	return nil
 }
 
 // GenerateGenesisState creates a randomized GenState of the evm module.
-func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
-	simulation.RandomizedGenState(simState)
+func (AppModule) GenerateGenesisState(_ *module.SimulationState) {
 }
 
 // WeightedOperations returns the all the evm module operations with their respective weights.
-func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation {
-	return simulation.WeightedOperations(
-		simState.AppParams, simState.Cdc, am.ak, am.keeper,
-	)
+func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation {
+	return nil
 }

x/evm/simulation/decoder.go

@@ -1,31 +0,0 @@
-package simulation
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/cosmos/cosmos-sdk/types/kv"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-// NewDecodeStore returns a decoder function closure that unmarshals the KVPair's
-// value to the corresponding EVM type.
-func NewDecodeStore() func(kvA, kvB kv.Pair) string {
-	return func(kvA, kvB kv.Pair) string {
-		switch {
-		case bytes.Equal(kvA.Key[:1], types.KeyPrefixStorage):
-			storageA := common.BytesToHash(kvA.Value).Hex()
-			storageB := common.BytesToHash(kvB.Value).Hex()
-
-			return fmt.Sprintf("%v\n%v", storageA, storageB)
-		case bytes.Equal(kvA.Key[:1], types.KeyPrefixCode):
-			codeHashA := common.Bytes2Hex(kvA.Value)
-			codeHashB := common.Bytes2Hex(kvB.Value)
-
-			return fmt.Sprintf("%v\n%v", codeHashA, codeHashB)
-		default:
-			panic(fmt.Sprintf("invalid evm key prefix %X", kvA.Key[:1]))
-		}
-	}
-}

x/evm/simulation/decoder_test.go

@@ -1,47 +0,0 @@
-package simulation
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/cosmos/cosmos-sdk/types/kv"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-// TestDecodeStore tests that evm simulation decoder decodes the key value pairs as expected.
-func TestDecodeStore(t *testing.T) {
-	dec := NewDecodeStore()
-
-	hash := common.BytesToHash([]byte("hash"))
-	code := common.Bytes2Hex([]byte{1, 2, 3})
-
-	kvPairs := kv.Pairs{
-		Pairs: []kv.Pair{
-			{Key: types.KeyPrefixCode, Value: common.FromHex(code)},
-			{Key: types.KeyPrefixStorage, Value: hash.Bytes()},
-		},
-	}
-
-	tests := []struct {
-		name        string
-		expectedLog string
-	}{
-		{"Code", fmt.Sprintf("%v\n%v", code, code)},
-		{"Storage", fmt.Sprintf("%v\n%v", hash, hash)},
-		{"other", ""},
-	}
-	for i, tt := range tests {
-		i, tt := i, tt
-		t.Run(tt.name, func(t *testing.T) {
-			switch i {
-			case len(tests) - 1:
-				require.Panics(t, func() { dec(kvPairs.Pairs[i], kvPairs.Pairs[i]) }, tt.name)
-			default:
-				require.Equal(t, tt.expectedLog, dec(kvPairs.Pairs[i], kvPairs.Pairs[i]), tt.name)
-			}
-		})
-	}
-}

x/evm/simulation/genesis.go

@@ -1,61 +0,0 @@
-package simulation
-
-import (
-	"encoding/json"
-	"fmt"
-	"math/rand"
-
-	"github.com/cosmos/cosmos-sdk/types/module"
-
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-const (
-	extraEIPsKey = "extra_eips"
-)
-
-// GenExtraEIPs defines a set of extra EIPs with 50% probability
-func GenExtraEIPs(r *rand.Rand) []int64 {
-	var extraEIPs []int64
-	// 50% chance of having extra EIPs
-	if r.Intn(2) == 0 {
-		extraEIPs = []int64{1344, 1884, 2200, 2929, 3198, 3529}
-	}
-	return extraEIPs
-}
-
-// GenEnableCreate enables the EnableCreate param with 80% probability
-func GenEnableCreate(r *rand.Rand) bool {
-	// 80% chance of enabling create contract
-	enableCreate := r.Intn(100) < 80
-	return enableCreate
-}
-
-// GenEnableCall enables the EnableCall param with 80% probability
-func GenEnableCall(r *rand.Rand) bool {
-	// 80% chance of enabling evm account transfer and calling contract
-	enableCall := r.Intn(100) < 80
-	return enableCall
-}
-
-// RandomizedGenState generates a random GenesisState for the EVM module
-func RandomizedGenState(simState *module.SimulationState) {
-	// evm params
-	var extraEIPs []int64
-
-	simState.AppParams.GetOrGenerate(
-		simState.Cdc, extraEIPsKey, &extraEIPs, simState.Rand,
-		func(r *rand.Rand) { extraEIPs = GenExtraEIPs(r) },
-	)
-
-	params := types.NewParams(types.DefaultEVMDenom, true, true, types.DefaultChainConfig(), extraEIPs...)
-	evmGenesis := types.NewGenesisState(params, []types.GenesisAccount{})
-
-	bz, err := json.MarshalIndent(evmGenesis, "", " ")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Selected randomly generated %s parameters:\n%s\n", types.ModuleName, bz)
-
-	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(evmGenesis)
-}

x/evm/simulation/genesis_test.go

@@ -1,51 +0,0 @@
-package simulation_test
-
-import (
-	"encoding/json"
-	"math/rand"
-	"testing"
-
-	sdkmath "cosmossdk.io/math"
-	"github.com/stretchr/testify/require"
-
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/evmos/ethermint/x/evm/simulation"
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-// TestRandomizedGenState tests the normal scenario of applying RandomizedGenState.
-// Abonormal scenarios are not tested here.
-func TestRandomizedGenState(t *testing.T) {
-	registry := codectypes.NewInterfaceRegistry()
-	types.RegisterInterfaces(registry)
-	cdc := codec.NewProtoCodec(registry)
-
-	s := rand.NewSource(1)
-	r := rand.New(s)
-
-	simState := module.SimulationState{
-		AppParams:    make(simtypes.AppParams),
-		Cdc:          cdc,
-		Rand:         r,
-		NumBonded:    3,
-		Accounts:     simtypes.RandomAccounts(r, 3),
-		InitialStake: sdkmath.NewInt(1000),
-		GenState:     make(map[string]json.RawMessage),
-	}
-
-	simulation.RandomizedGenState(&simState)
-
-	var evmGenesis types.GenesisState
-	simState.Cdc.MustUnmarshalJSON(simState.GenState[types.ModuleName], &evmGenesis)
-
-	require.Equal(t, true, evmGenesis.Params.GetEnableCreate())
-	require.Equal(t, true, evmGenesis.Params.GetEnableCall())
-	require.Equal(t, types.DefaultEVMDenom, evmGenesis.Params.GetEvmDenom())
-	require.Equal(t, simulation.GenExtraEIPs(r), evmGenesis.Params.GetExtraEIPs())
-	require.Equal(t, types.DefaultChainConfig(), evmGenesis.Params.GetChainConfig())
-
-	require.Equal(t, len(evmGenesis.Accounts), 0)
-}

x/evm/simulation/operations.go

@@ -1,313 +0,0 @@
-package simulation
-
-import (
-	"encoding/json"
-	"fmt"
-	"math/big"
-	"math/rand"
-	"time"
-
-	sdkmath "cosmossdk.io/math"
-
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/codec"
-	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	sdktx "github.com/cosmos/cosmos-sdk/types/tx"
-	"github.com/cosmos/cosmos-sdk/x/auth/tx"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
-
-	"github.com/cosmos/cosmos-sdk/client"
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/evmos/ethermint/encoding"
-	"github.com/evmos/ethermint/tests"
-	"github.com/evmos/ethermint/x/evm/keeper"
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-const (
-	/* #nosec */
-	OpWeightMsgEthSimpleTransfer = "op_weight_msg_eth_simple_transfer"
-	/* #nosec */
-	OpWeightMsgEthCreateContract = "op_weight_msg_eth_create_contract"
-	/* #nosec */
-	OpWeightMsgEthCallContract = "op_weight_msg_eth_call_contract"
-)
-
-const (
-	WeightMsgEthSimpleTransfer = 50
-	WeightMsgEthCreateContract = 50
-)
-
-var ErrNoEnoughBalance = fmt.Errorf("no enough balance")
-
-var maxWaitSeconds = 10
-
-type simulateContext struct {
-	context sdk.Context
-	bapp    *baseapp.BaseApp
-	rand    *rand.Rand
-	keeper  *keeper.Keeper
-}
-
-// WeightedOperations generate Two kinds of operations: SimulateEthSimpleTransfer, SimulateEthCreateContract.
-// Contract call operations work as the future operations of SimulateEthCreateContract.
-func WeightedOperations(
-	appParams simtypes.AppParams, cdc codec.JSONCodec, ak types.AccountKeeper, k *keeper.Keeper,
-) simulation.WeightedOperations {
-	var (
-		weightMsgEthSimpleTransfer int
-		weightMsgEthCreateContract int
-	)
-
-	appParams.GetOrGenerate(cdc, OpWeightMsgEthSimpleTransfer, &weightMsgEthSimpleTransfer, nil,
-		func(_ *rand.Rand) {
-			weightMsgEthSimpleTransfer = WeightMsgEthSimpleTransfer
-		},
-	)
-
-	appParams.GetOrGenerate(cdc, OpWeightMsgEthCreateContract, &weightMsgEthCreateContract, nil,
-		func(_ *rand.Rand) {
-			weightMsgEthCreateContract = WeightMsgEthCreateContract
-		},
-	)
-
-	return simulation.WeightedOperations{
-		simulation.NewWeightedOperation(
-			weightMsgEthSimpleTransfer,
-			SimulateEthSimpleTransfer(ak, k),
-		),
-		simulation.NewWeightedOperation(
-			weightMsgEthCreateContract,
-			SimulateEthCreateContract(ak, k),
-		),
-	}
-}
-
-// SimulateEthSimpleTransfer simulate simple eth account transferring gas token.
-// It randomly choose sender, recipient and transferable amount.
-// Other tx details like nonce, gasprice, gaslimit are calculated to get valid value.
-func SimulateEthSimpleTransfer(ak types.AccountKeeper, k *keeper.Keeper) simtypes.Operation {
-	return func(
-		r *rand.Rand, bapp *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
-	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-		simAccount, _ := simtypes.RandomAcc(r, accs)
-		var recipient simtypes.Account
-		if r.Intn(2) == 1 {
-			recipient, _ = simtypes.RandomAcc(r, accs)
-		} else {
-			recipient = simtypes.RandomAccounts(r, 1)[0]
-		}
-		from := common.BytesToAddress(simAccount.Address)
-		to := common.BytesToAddress(recipient.Address)
-
-		simulateContext := &simulateContext{ctx, bapp, r, k}
-
-		return SimulateEthTx(simulateContext, &from, &to, nil, (*hexutil.Bytes)(&[]byte{}), simAccount.PrivKey, nil)
-	}
-}
-
-// SimulateEthCreateContract simulate create an ERC20 contract.
-// It makes operationSimulateEthCallContract the future operations of SimulateEthCreateContract
-// to ensure valid contract call.
-func SimulateEthCreateContract(ak types.AccountKeeper, k *keeper.Keeper) simtypes.Operation {
-	return func(
-		r *rand.Rand, bapp *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
-	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-		simAccount, _ := simtypes.RandomAcc(r, accs)
-
-		from := common.BytesToAddress(simAccount.Address)
-		nonce := k.GetNonce(ctx, from)
-
-		ctorArgs, err := types.ERC20Contract.ABI.Pack("", from, sdkmath.NewIntWithDecimal(1000, 18).BigInt())
-		if err != nil {
-			return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "can not pack owner and supply"), nil, err
-		}
-		data := types.ERC20Contract.Bin
-		data = append(data, ctorArgs...)
-
-		simulateContext := &simulateContext{ctx, bapp, r, k}
-
-		fops := make([]simtypes.FutureOperation, 1)
-		whenCall := ctx.BlockHeader().Time.Add(time.Duration(r.Intn(maxWaitSeconds)+1) * time.Second)
-		contractAddr := crypto.CreateAddress(from, nonce)
-		var tokenReceipient simtypes.Account
-		if r.Intn(2) == 1 {
-			tokenReceipient, _ = simtypes.RandomAcc(r, accs)
-		} else {
-			tokenReceipient = simtypes.RandomAccounts(r, 1)[0]
-		}
-		receipientAddr := common.BytesToAddress(tokenReceipient.Address)
-		fops[0] = simtypes.FutureOperation{
-			BlockTime: whenCall,
-			Op:        operationSimulateEthCallContract(k, &contractAddr, &receipientAddr, nil),
-		}
-		return SimulateEthTx(simulateContext, &from, nil, nil, (*hexutil.Bytes)(&data), simAccount.PrivKey, fops)
-	}
-}
-
-// operationSimulateEthCallContract simulate calling an contract.
-// It is always calling an ERC20 contract.
-func operationSimulateEthCallContract(k *keeper.Keeper, contractAddr, to *common.Address, amount *big.Int) simtypes.Operation {
-	return func(
-		r *rand.Rand, bapp *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
-	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-		simAccount, _ := simtypes.RandomAcc(r, accs)
-
-		from := common.BytesToAddress(simAccount.Address)
-
-		ctorArgs, err := types.ERC20Contract.ABI.Pack("transfer", to, amount)
-		if err != nil {
-			return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "can not pack method and args"), nil, err
-		}
-		data := types.ERC20Contract.Bin
-		data = append(data, ctorArgs...)
-
-		simulateContext := &simulateContext{ctx, bapp, r, k}
-
-		return SimulateEthTx(simulateContext, &from, contractAddr, nil, (*hexutil.Bytes)(&data), simAccount.PrivKey, nil)
-	}
-}
-
-// SimulateEthTx creates valid ethereum tx and pack it as cosmos tx, and deliver it.
-func SimulateEthTx(
-	ctx *simulateContext, from, to *common.Address, amount *big.Int, data *hexutil.Bytes, prv cryptotypes.PrivKey, fops []simtypes.FutureOperation,
-) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-	ethTx, err := CreateRandomValidEthTx(ctx, from, nil, nil, data)
-	if err == ErrNoEnoughBalance {
-		return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "no enough balance"), nil, nil
-	}
-	if err != nil {
-		return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "can not create valid eth tx"), nil, err
-	}
-
-	txConfig := encoding.MakeConfig(module.NewBasicManager()).TxConfig
-	txBuilder := txConfig.NewTxBuilder()
-	signedTx, err := GetSignedTx(ctx, txBuilder, ethTx, prv)
-	if err != nil {
-		return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "can not sign ethereum tx"), nil, err
-	}
-
-	_, _, err = ctx.bapp.SimDeliver(txConfig.TxEncoder(), signedTx)
-	if err != nil {
-		return simtypes.NoOpMsg(types.ModuleName, types.TypeMsgEthereumTx, "failed to deliver tx"), nil, err
-	}
-
-	return simtypes.OperationMsg{}, fops, nil
-}
-
-// CreateRandomValidEthTx create the ethereum tx with valid random values
-func CreateRandomValidEthTx(ctx *simulateContext,
-	from,
-	to *common.Address,
-	amount *big.Int,
-	data *hexutil.Bytes,
-) (ethTx *types.MsgEthereumTx, err error) {
-	gasCap := ctx.rand.Uint64()
-	estimateGas, err := EstimateGas(ctx, from, to, data, gasCap)
-	if err != nil {
-		return nil, err
-	}
-	// we suppose that gasLimit should be larger than estimateGas to ensure tx validity
-	gasLimit := estimateGas + uint64(ctx.rand.Intn(int(sdktx.MaxGasWanted-estimateGas)))
-	ethChainID := ctx.keeper.ChainID()
-	chainConfig := ctx.keeper.GetParams(ctx.context).ChainConfig.EthereumConfig(ethChainID)
-	gasPrice := ctx.keeper.GetBaseFee(ctx.context, chainConfig)
-	gasFeeCap := new(big.Int).Add(gasPrice, big.NewInt(int64(ctx.rand.Int())))
-	gasTipCap := big.NewInt(int64(ctx.rand.Int()))
-	nonce := ctx.keeper.GetNonce(ctx.context, *from)
-
-	if amount == nil {
-		amount, err = RandomTransferableAmount(ctx, *from, estimateGas, gasFeeCap)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	ethTx = types.NewTx(ethChainID, nonce, to, amount, gasLimit, gasPrice, gasFeeCap, gasTipCap, *data, nil)
-	ethTx.From = from.String()
-	return ethTx, nil
-}
-
-// EstimateGas estimates the gas used by quering the keeper.
-func EstimateGas(ctx *simulateContext, from, to *common.Address, data *hexutil.Bytes, gasCap uint64) (gas uint64, err error) {
-	args, err := json.Marshal(&types.TransactionArgs{To: to, From: from, Data: data})
-	if err != nil {
-		return 0, err
-	}
-
-	res, err := ctx.keeper.EstimateGas(sdk.WrapSDKContext(ctx.context), &types.EthCallRequest{
-		Args:   args,
-		GasCap: gasCap,
-	})
-	if err != nil {
-		return 0, err
-	}
-	return res.Gas, nil
-}
-
-// RandomTransferableAmount generates a random valid transferable amount.
-// Transferable amount is between the range [0, spendable), spendable = balance - gasFeeCap * GasLimit.
-func RandomTransferableAmount(ctx *simulateContext, address common.Address, estimateGas uint64, gasFeeCap *big.Int) (amount *big.Int, err error) {
-	balance := ctx.keeper.GetBalance(ctx.context, address)
-	feeLimit := new(big.Int).Mul(gasFeeCap, big.NewInt(int64(estimateGas)))
-	if (feeLimit.Cmp(balance)) > 0 {
-		return nil, ErrNoEnoughBalance
-	}
-	spendable := new(big.Int).Sub(balance, feeLimit)
-	if spendable.Cmp(big.NewInt(0)) == 0 {
-		amount = new(big.Int).Set(spendable)
-		return amount, nil
-	}
-	simAmount, err := simtypes.RandPositiveInt(ctx.rand, sdkmath.NewIntFromBigInt(spendable))
-	if err != nil {
-		return nil, err
-	}
-	amount = simAmount.BigInt()
-	return amount, nil
-}
-
-// GetSignedTx sign the ethereum tx and packs it as a signing.Tx .
-func GetSignedTx(
-	ctx *simulateContext,
-	txBuilder client.TxBuilder,
-	msg *types.MsgEthereumTx,
-	prv cryptotypes.PrivKey,
-) (signedTx signing.Tx, err error) {
-	builder, ok := txBuilder.(tx.ExtensionOptionsTxBuilder)
-	if !ok {
-		return nil, fmt.Errorf("can not initiate ExtensionOptionsTxBuilder")
-	}
-	option, err := codectypes.NewAnyWithValue(&types.ExtensionOptionsEthereumTx{})
-	if err != nil {
-		return nil, err
-	}
-	builder.SetExtensionOptions(option)
-
-	if err := msg.Sign(ethtypes.LatestSignerForChainID(ctx.keeper.ChainID()), tests.NewSigner(prv)); err != nil {
-		return nil, err
-	}
-
-	if err = builder.SetMsgs(msg); err != nil {
-		return nil, err
-	}
-
-	txData, err := types.UnpackTxData(msg.Data)
-	if err != nil {
-		return nil, err
-	}
-
-	fees := sdk.NewCoins(sdk.NewCoin(ctx.keeper.GetParams(ctx.context).EvmDenom, sdkmath.NewIntFromBigInt(txData.Fee())))
-	builder.SetFeeAmount(fees)
-	builder.SetGasLimit(msg.GetGas())
-
-	signedTx = builder.GetTx()
-	return signedTx, nil
-}

x/evm/simulation/params.go

@@ -1,41 +0,0 @@
-package simulation
-
-// DONTCOVER
-
-import (
-	"fmt"
-	"math/rand"
-
-	amino "github.com/cosmos/cosmos-sdk/codec"
-	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
-	"github.com/evmos/ethermint/x/evm/types"
-)
-
-// ParamChanges defines the parameters that can be modified by param change proposals
-// on the simulation.
-func ParamChanges(r *rand.Rand) []simtypes.ParamChange {
-	return []simtypes.ParamChange{
-		simulation.NewSimParamChange(types.ModuleName, string(types.ParamStoreKeyExtraEIPs),
-			func(r *rand.Rand) string {
-				extraEIPs := GenExtraEIPs(r)
-				amino := amino.NewLegacyAmino()
-				bz, err := amino.MarshalJSON(extraEIPs)
-				if err != nil {
-					panic(err)
-				}
-				return string(bz)
-			},
-		),
-		simulation.NewSimParamChange(types.ModuleName, string(types.ParamStoreKeyEnableCreate),
-			func(r *rand.Rand) string {
-				return fmt.Sprintf("%v", GenEnableCreate(r))
-			},
-		),
-		simulation.NewSimParamChange(types.ModuleName, string(types.ParamStoreKeyEnableCall),
-			func(r *rand.Rand) string {
-				return fmt.Sprintf("%v", GenEnableCall(r))
-			},
-		),
-	}
-}

x/evm/simulation/params_test.go

@@ -1,44 +0,0 @@
-package simulation_test
-
-import (
-	"encoding/json"
-	"fmt"
-	"math/rand"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/evmos/ethermint/x/evm/simulation"
-)
-
-// TestParamChanges tests the paramChanges are generated as expected.
-func TestParamChanges(t *testing.T) {
-	s := rand.NewSource(1)
-	r := rand.New(s)
-
-	extraEIPs := simulation.GenExtraEIPs(r)
-	bz, err := json.Marshal(extraEIPs)
-	require.NoError(t, err)
-
-	expected := []struct {
-		composedKey string
-		key         string
-		simValue    string
-		subspace    string
-	}{
-		{"evm/EnableExtraEIPs", "EnableExtraEIPs", string(bz), "evm"},
-		{"evm/EnableCreate", "EnableCreate", fmt.Sprintf("%v", simulation.GenEnableCreate(r)), "evm"},
-		{"evm/EnableCall", "EnableCall", fmt.Sprintf("%v", simulation.GenEnableCall(r)), "evm"},
-	}
-
-	paramChanges := simulation.ParamChanges(r)
-
-	require.Len(t, paramChanges, 3)
-
-	for i, p := range paramChanges {
-		require.Equal(t, expected[i].composedKey, p.ComposedKey())
-		require.Equal(t, expected[i].key, p.Key())
-		require.Equal(t, expected[i].simValue, p.SimValue()(r))
-		require.Equal(t, expected[i].subspace, p.Subspace())
-	}
-}

x/feemarket/module.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/evmos/ethermint/x/feemarket/client/cli"
 	"github.com/evmos/ethermint/x/feemarket/keeper"
-	"github.com/evmos/ethermint/x/feemarket/simulation"
 	"github.com/evmos/ethermint/x/feemarket/types"
 )
 
@@ -65,7 +64,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingCo
 
 // RegisterRESTRoutes performs a no-op as the EVM module doesn't expose REST
 // endpoints
-func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Router) {
+func (AppModuleBasic) RegisterRESTRoutes(_ client.Context, _ *mux.Router) {
 }
 
 func (b AppModuleBasic) RegisterGRPCGatewayRoutes(c client.Context, serveMux *runtime.ServeMux) {
@@ -110,7 +109,7 @@ func (AppModule) Name() string {
 
 // RegisterInvariants interface for registering invariants. Performs a no-op
 // as the fee market module doesn't expose invariants.
-func (am AppModule) RegisterInvariants(ir sdk.InvariantRegistry) {}
+func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}
 
 // RegisterServices registers the GRPC query service and migrator service to respond to the
 // module-specific GRPC queries and handle the upgrade store migration for the module.
@@ -128,7 +127,7 @@ func (AppModule) QuerierRoute() string { return types.RouterKey }
 
 // LegacyQuerierHandler returns nil as the fee market module doesn't expose a legacy
 // Querier.
-func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sdk.Querier {
+func (am AppModule) LegacyQuerierHandler(_ *codec.LegacyAmino) sdk.Querier {
 	return nil
 }
 
@@ -162,24 +161,23 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 }
 
 // RandomizedParams creates randomized fee market param changes for the simulator.
-func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange {
+func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange {
 	return nil
 }
 
 // RegisterStoreDecoder registers a decoder for fee market module's types
-func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {}
+func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {}
 
 // ProposalContents doesn't return any content functions for governance proposals.
-func (AppModule) ProposalContents(simState module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
 	return nil
 }
 
 // GenerateGenesisState creates a randomized GenState of the fee market module.
-func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
-	simulation.RandomizedGenState(simState)
+func (AppModule) GenerateGenesisState(_ *module.SimulationState) {
 }
 
 // WeightedOperations returns the all the fee market module operations with their respective weights.
-func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation {
+func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation {
 	return nil
 }

x/feemarket/simulation/genesis.go

@@ -1,33 +0,0 @@
-package simulation
-
-import (
-	"encoding/json"
-	"fmt"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-
-	"github.com/evmos/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(),
-		sdk.ZeroDec(),
-		types.DefaultMinGasMultiplier)
-
-	blockGas := simState.Rand.Uint64()
-	feemarketGenesis := types.NewGenesisState(params, blockGas)
-
-	bz, err := json.MarshalIndent(feemarketGenesis, "", " ")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Printf("Selected randomly generated %s parameters:\n%s\n", types.ModuleName, bz)
-
-	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(feemarketGenesis)
-}