test(systemtests): add appside mempool e2e test

CHANGELOG.md

@@ -26,11 +26,11 @@
 - [\#511](https://github.com/cosmos/evm/pull/511) Minor code cleanup for `AddPrecompileFn`.
 - [\#544](https://github.com/cosmos/evm/pull/544) Parse logs from the txResult.Data and avoid emitting EVM events to cosmos-sdk events.
 - [\#582](https://github.com/cosmos/evm/pull/582) Add block max-gas (from genesis.json) and new min-tip (from app.toml/flags) ingestion into mempool config
+- [\#580](https://github.com/cosmos/evm/pull/580) add appside mempool e2e test
 
 ### FEATURES
 
 - [\#346](https://github.com/cosmos/evm/pull/346) Add eth_createAccessList method and implementation
-- [\#502](https://github.com/cosmos/evm/pull/502) Add block time in derived logs.
 
 ### STATE BREAKING
 

crypto/ethsecp256k1/ethsecp256k1.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/crypto"
 
-	tmcrypto "github.com/cometbft/cometbft/crypto"
-
 	"github.com/cosmos/evm/ethereum/eip712"
 
 	errorsmod "cosmossdk.io/errors"
@@ -147,13 +145,13 @@ var (
 
 // Address returns the address of the ECDSA public key.
 // The function will return an empty address if the public key is invalid.
-func (pubKey PubKey) Address() tmcrypto.Address {
+func (pubKey PubKey) Address() cryptotypes.Address {
 	pubk, err := crypto.DecompressPubkey(pubKey.Key)
 	if err != nil {
 		return nil
 	}
 
-	return tmcrypto.Address(crypto.PubkeyToAddress(*pubk).Bytes())
+	return cryptotypes.Address(crypto.PubkeyToAddress(*pubk).Bytes())
 }
 
 // Bytes returns the raw bytes of the ECDSA public key.

mempool/blockchain.go

@@ -86,11 +86,6 @@ func (b Blockchain) CurrentBlock() *types.Header {
 	}
 
 	blockHeight := ctx.BlockHeight()
-	// prevent the reorg from triggering after a restart since previousHeaderHash is stored as an in-memory variable
-	if blockHeight > 1 && b.previousHeaderHash == (common.Hash{}) {
-		return b.zeroHeader
-	}
-
 	blockTime := ctx.BlockTime().Unix()
 	gasUsed := b.feeMarketKeeper.GetBlockGasWanted(ctx)
 	appHash := common.BytesToHash(ctx.BlockHeader().AppHash)
@@ -204,7 +199,7 @@ func (b Blockchain) StateAt(hash common.Hash) (vm.StateDB, error) {
 	}
 
 	appHash := ctx.BlockHeader().AppHash
-	stateDB := statedb.New(ctx, b.vmKeeper, statedb.NewEmptyTxConfig())
+	stateDB := statedb.New(ctx, b.vmKeeper, statedb.NewEmptyTxConfig(common.Hash(appHash)))
 
 	b.logger.Debug("StateDB created successfully", "app_hash", common.Hash(appHash).Hex())
 	return stateDB, nil

mempool/mempool.go

@@ -386,7 +386,7 @@ func (m *ExperimentalEVMMempool) SelectBy(goCtx context.Context, i [][]byte, f f
 
 // SetEventBus sets CometBFT event bus to listen for new block header event.
 func (m *ExperimentalEVMMempool) SetEventBus(eventBus *cmttypes.EventBus) {
-	if m.HasEventBus() {
+	if m.eventBus != nil {
 		m.eventBus.Unsubscribe(context.Background(), SubscriberName, stream.NewBlockHeaderEvents) //nolint: errcheck
 	}
 	m.eventBus = eventBus
@@ -401,11 +401,6 @@ func (m *ExperimentalEVMMempool) SetEventBus(eventBus *cmttypes.EventBus) {
 	}()
 }
 
-// HasEventBus returns true if the blockchain is configured to use an event bus for block notifications.
-func (m *ExperimentalEVMMempool) HasEventBus() bool {
-	return m.eventBus != nil
-}
-
 // Close unsubscribes from the CometBFT event bus and shuts down the mempool.
 func (m *ExperimentalEVMMempool) Close() error {
 	var errs []error

precompiles/common/balance_handler_test.go

@@ -149,7 +149,7 @@ func TestAfterBalanceChange(t *testing.T) {
 	tKey := storetypes.NewTransientStoreKey("test_t")
 	ctx := sdktestutil.DefaultContext(storeKey, tKey)
 
-	stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig())
+	stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())))
 
 	_, addrs, err := testutil.GeneratePrivKeyAddressPairs(2)
 	require.NoError(t, err)
@@ -191,7 +191,7 @@ func TestAfterBalanceChangeErrors(t *testing.T) {
 	storeKey := storetypes.NewKVStoreKey("test")
 	tKey := storetypes.NewTransientStoreKey("test_t")
 	ctx := sdktestutil.DefaultContext(storeKey, tKey)
-	stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig())
+	stateDB := statedb.New(ctx, mocks.NewEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())))
 
 	_, addrs, err := testutil.GeneratePrivKeyAddressPairs(1)
 	require.NoError(t, err)

tests/integration/precompiles/gov/test_gov.go

@@ -107,10 +107,11 @@ func (s *PrecompileTestSuite) TestRun() {
 			s.Require().NoError(err, "failed to instantiate EVM config")
 
 			// Instantiate EVM
+			headerHash := ctx.HeaderHash()
 			stDB := statedb.New(
 				ctx,
 				s.network.App.GetEVMKeeper(),
-				statedb.NewEmptyTxConfig(),
+				statedb.NewEmptyTxConfig(common.BytesToHash(headerHash)),
 			)
 			evm := s.network.App.GetEVMKeeper().NewEVM(
 				ctx, *msg, cfg, nil, stDB,

tests/integration/precompiles/staking/test_staking.go

@@ -436,10 +436,11 @@ func (s *PrecompileTestSuite) TestRun() {
 			s.Require().NoError(err, "failed to instantiate EVM config")
 
 			// Instantiate EVM
+			headerHash := ctx.HeaderHash()
 			stDB := statedb.New(
 				ctx,
 				s.network.App.GetEVMKeeper(),
-				statedb.NewEmptyTxConfig(),
+				statedb.NewEmptyTxConfig(common.BytesToHash(headerHash)),
 			)
 			evm := s.network.App.GetEVMKeeper().NewEVM(
 				ctx, *msg, cfg, nil, stDB,

tests/integration/x/vm/test_genesis.go

@@ -119,7 +119,7 @@ func (s *GenesisTestSuite) TestInitGenesis() {
 			ctx = s.network.GetContext()
 			vmdb = statedb.New(
 				ctx, s.network.App.GetEVMKeeper(),
-				statedb.NewEmptyTxConfig())
+				statedb.NewEmptyTxConfig(common.BytesToHash(ctx.HeaderHash())))
 
 			tc.malleate(s.network)
 			err := vmdb.Commit()

tests/integration/x/vm/test_grpc_query.go

@@ -425,6 +425,7 @@ func (s *KeeperTestSuite) TestQueryTxLogs() {
 	for _, tc := range testCases {
 		s.Run(fmt.Sprintf("Case %s", tc.msg), func() {
 			txCfg := statedb.NewTxConfig(
+				common.BytesToHash(s.Network.GetContext().HeaderHash()),
 				txHash,
 				txIndex,
 				logIndex,

tests/integration/x/vm/test_hooks.go

@@ -70,6 +70,7 @@ func (s *KeeperTestSuite) TestEvmHooks() {
 		ctx := s.Network.GetContext()
 		txHash := common.BigToHash(big.NewInt(1))
 		vmdb := statedb.New(ctx, k, statedb.NewTxConfig(
+			common.BytesToHash(ctx.HeaderHash()),
 			txHash,
 			0,
 			0,

tests/integration/x/vm/test_statedb.go

@@ -754,6 +754,7 @@ func (s *KeeperTestSuite) TestAddLog() {
 		s.Run(tc.name, func() {
 			s.SetupTest()
 			vmdb := statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewTxConfig(
+				common.BytesToHash(s.Network.GetContext().HeaderHash()),
 				tc.hash,
 				0, 0,
 			))

tests/integration/x/vm/utils.go

@@ -24,7 +24,7 @@ func (s *KeeperTestSuite) EvmDenom() string {
 }
 
 func (s *KeeperTestSuite) StateDB() *statedb.StateDB {
-	return statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewEmptyTxConfig())
+	return statedb.New(s.Network.GetContext(), s.Network.App.GetEVMKeeper(), statedb.NewEmptyTxConfig(common.BytesToHash(s.Network.GetContext().HeaderHash())))
 }
 
 // DeployTestContract deploy a test erc20 contract and returns the contract address

tests/systemtests/README.md

@@ -0,0 +1,51 @@
+# Getting started with a new system test
+
+## Overview
+
+The systemtests suite is an end-to-end test suite that runs the evmd process and sends RPC requests from separate Ethereum/Cosmos clients. The systemtests for cosmos/evm use the `cosmossdk.io/systemtests` package by default. For more details, please refer to https://github.com/cosmos/cosmos-sdk/tree/main/tests/systemtests.
+
+## Preparation
+
+Build a new binary from current branch and copy it to the `tests/systemtests/binaries` folder by running system tests.
+
+```shell
+make test-system
+```
+
+Or via manual steps
+
+```shell
+make build
+mkdir -= ./tests/systemtests/binaries
+cp ./build/evmd ./tests/systemtests/binaries
+cp ./build/evmd ./tests/systemtests/binaries/v0.4
+```
+
+## Run Individual test
+
+### Run test cases for txs ordering
+
+```shell
+go test -p 1 -parallel 1 -mod=readonly -tags='system_test' -v ./... 
+--run TestTxsOrdering --verbose --binary evmd --block-time 5s --chain-id local-4221
+```
+
+### Run test cases for txs replacement
+
+```shell
+go test -p 1 -parallel 1 -mod=readonly -tags='system_test' -v ./... 
+--run TestTxsReplacement --verbose --binary evmd --block-time 5s --chain-id local-4221
+```
+
+### Run test exceptions
+
+```shell
+go test -p 1 -parallel 1 -mod=readonly -tags='system_test' -v ./... 
+--run TestExceptions --verbose --binary evmd --block-time 5s --chain-id local-4221
+```
+
+## Run Entire test
+
+```shell
+make test
+```

tests/systemtests/clients/config.go

@@ -0,0 +1,75 @@
+package clients
+
+import (
+	"fmt"
+	"math/big"
+)
+
+/**
+# ---------------- dev mnemonics source ----------------
+# dev0 address 0xC6Fe5D33615a1C52c08018c47E8Bc53646A0E101 | cosmos1cml96vmptgw99syqrrz8az79xer2pcgp84pdun
+# dev0's private key: 0x88cbead91aee890d27bf06e003ade3d4e952427e88f88d31d61d3ef5e5d54305 # gitleaks:allow
+
+# dev1 address 0x963EBDf2e1f8DB8707D05FC75bfeFFBa1B5BaC17 | cosmos1jcltmuhplrdcwp7stlr4hlhlhgd4htqh3a79sq
+# dev1's private key: 0x741de4f8988ea941d3ff0287911ca4074e62b7d45c991a51186455366f10b544 # gitleaks:allow
+
+# dev2 address 0x40a0cb1C63e026A81B55EE1308586E21eec1eFa9 | cosmos1gzsvk8rruqn2sx64acfsskrwy8hvrmafqkaze8
+# dev2's private key: 0x3b7955d25189c99a7468192fcbc6429205c158834053ebe3f78f4512ab432db9 # gitleaks:allow
+
+# dev3 address 0x498B5AeC5D439b733dC2F58AB489783A23FB26dA | cosmos1fx944mzagwdhx0wz7k9tfztc8g3lkfk6rrgv6l
+# dev3's private key: 0x8a36c69d940a92fcea94b36d0f2928c7a0ee19a90073eda769693298dfa9603b # gitleaks:allow
+*/
+
+const (
+	ChainID    = "local-4221"
+	EVMChainID = "262144"
+
+	Acc0PrivKey = "88cbead91aee890d27bf06e003ade3d4e952427e88f88d31d61d3ef5e5d54305"
+	Acc1PrivKey = "741de4f8988ea941d3ff0287911ca4074e62b7d45c991a51186455366f10b544"
+	Acc2PrivKey = "3b7955d25189c99a7468192fcbc6429205c158834053ebe3f78f4512ab432db9"
+	Acc3PrivKey = "8a36c69d940a92fcea94b36d0f2928c7a0ee19a90073eda769693298dfa9603b"
+
+	JsonRPCUrl0 = "http://127.0.0.1:8545"
+	JsonRPCUrl1 = "http://127.0.0.1:8555"
+	JsonRPCUrl2 = "http://127.0.0.1:8565"
+	JsonRPCUrl3 = "http://127.0.0.1:8575"
+
+	NodeRPCUrl0 = "http://127.0.0.1:26657"
+	NodeRPCUrl1 = "http://127.0.0.1:26658"
+	NodeRPCUrl2 = "http://127.0.0.1:26659"
+	NodeRPCUrl3 = "http://127.0.0.1:26660"
+)
+
+type Config struct {
+	ChainID     string
+	EVMChainID  *big.Int
+	PrivKeys    []string
+	JsonRPCUrls []string
+	NodeRPCUrls []string
+}
+
+// NewConfig creates a new Config instance.
+func NewConfig() (*Config, error) {
+	// evm chainID
+	evmChainID, ok := new(big.Int).SetString(EVMChainID, 10)
+	if !ok {
+		return nil, fmt.Errorf("error whilte setting chain id")
+	}
+
+	// private keys of test accounts
+	privKeys := []string{Acc0PrivKey, Acc1PrivKey, Acc2PrivKey, Acc3PrivKey}
+
+	// jsonrpc urls of testnet nodes
+	jsonRPCUrls := []string{JsonRPCUrl0, JsonRPCUrl1, JsonRPCUrl2, JsonRPCUrl3}
+
+	// rpc urls of test nodes
+	nodeRPCUrls := []string{NodeRPCUrl0, NodeRPCUrl1, NodeRPCUrl2, NodeRPCUrl3}
+
+	return &Config{
+		ChainID:     ChainID,
+		EVMChainID:  evmChainID,
+		PrivKeys:    privKeys,
+		JsonRPCUrls: jsonRPCUrls,
+		NodeRPCUrls: nodeRPCUrls,
+	}, nil
+}