refactor: systemtests

CHANGELOG.md

@@ -64,7 +64,7 @@
 - [\#709](https://github.com/cosmos/evm/pull/709) Fix mempool e2e test
 - [\#710](https://github.com/cosmos/evm/pull/710) Fix EoA-CA Identification logic
 - [\#711](https://github.com/cosmos/evm/pull/711) Add debug_traceCall api
-
+- [\#720](https://github.com/cosmos/evm/pull/720) Refactor systemtests
 
 ### FEATURES
 

evmd/upgrades.go

@@ -2,14 +2,15 @@ package evmd
 
 import (
 	"context"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/cosmos/evm/x/vm/types"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/cosmos/evm/x/vm/types"
 
 	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
 // UpgradeName defines the on-chain upgrade name for the sample EVMD upgrade
@@ -49,6 +50,13 @@ func (app EVMD) RegisterUpgradeHandlers() {
 				URIHash: "example_uri_hash",
 			})
 
+			// Persist the EVM coin metadata in keeper state. Chains bootstrapped on earlier
+			// binaries never stored this information (it lived only in process globals),
+			// so migrating nodes would otherwise see an empty EvmCoinInfo on upgrade.
+			if err := app.EVMKeeper.InitEvmCoinInfo(sdkCtx); err != nil {
+				return nil, err
+			}
+
 			// (Required for NON-18 denom chains *only)
 			// Update EVM params to add Extended denom options
 			// Ensure that this corresponds to the EVM denom

tests/systemtests/Makefile

@@ -3,10 +3,4 @@
 WAIT_TIME ?= 20s
 
 test:
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestCosmosTxCompat --wait-time=$(WAIT_TIME) --block-time=9.5s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestTxsReplacement --wait-time=$(WAIT_TIME) --block-time=9.5s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestTxsOrdering --wait-time=$(WAIT_TIME) --block-time=3s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestExceptions --wait-time=$(WAIT_TIME) --block-time=8s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestEIP7702 --wait-time=$(WAIT_TIME) --block-time=5s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run TestEIP712 --wait-time=$(WAIT_TIME) --block-time=5s --binary evmd --chain-id local-4221
-	go test -failfast -timeout=30m -p=1 -mod=readonly -tags='system_test' -v ./... -run 'TestUpgrade|TestEth' --wait-time=$(WAIT_TIME) --block-time=5s --binary evmd --chain-id local-4221
+	go test -failfast -timeout=30m -mod=readonly -tags='system_test' -v ./... --wait-time=$(WAIT_TIME) --binary evmd --chain-id local-4221

tests/systemtests/README.md

@@ -23,33 +23,46 @@ cp ./build/evmd ./tests/systemtests/binaries/v0.4
 
 ## Run Individual test
 
-### Run test cases for txs ordering
+Each scenario now has its own `Test…` wrapper in `main_test.go`, so you can target a specific flow directly. For example, to exercise the mempool ordering suite:
 
 ```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
+cd tests/systemtests
+go test -failfast -mod=readonly -tags=system_test ./... -run TestMempoolTxsOrdering \
+  --verbose --binary evmd --block-time 3s --chain-id local-4221
 ```
 
-### Run test cases for txs replacement
+Mempool scenarios:
 
-```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
-```
+| Test name | Description |
+|-----------|-------------|
+| `TestMempoolTxsOrdering` | Ordering of pending transactions across nodes |
+| `TestMempoolTxsReplacement` | Replacement behaviour for EVM transactions |
+| `TestMempoolTxsReplacementWithCosmosTx` | Replacement when Cosmos transactions are present |
+| `TestMempoolMixedTxsReplacementEVMAndCosmos` | Mixed Cosmos/EVM replacement coverage |
+| `TestMempoolTxRebroadcasting` | Rebroadcasting and nonce-gap handling |
+| `TestMempoolCosmosTxsCompatibility` | Cosmos-only transactions interacting with the mempool |
 
-### Run test exceptions
+EIP-712 scenarios:
 
-```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
-```
+| Test name | Description |
+|-----------|-------------|
+| `TestEIP712BankSend` | Single transfer signed via EIP-712 |
+| `TestEIP712BankSendWithBalanceCheck` | Transfer plus balance assertions |
+| `TestEIP712MultipleBankSends` | Sequential transfers with nonce management |
 
-### Run EIP-7702 test
+Account abstraction:
 
-```shell
-go test -p 1 -mod=readonly -tags='system_test' -v ./... \
---run TestEIP7702 --verbose --binary evmd --block-time 3s --chain-id local-4221
-```
+| Test name | Description |
+|-----------|-------------|
+| `TestAccountAbstractionEIP7702` | Account abstraction (EIP-7702) flow |
+
+Chain lifecycle:
+
+| Test name | Description |
+|-----------|-------------|
+| `TestChainUpgrade` | End-to-end upgrade handling |
+
+> ℹ️ The shared system test suite keeps a single chain alive across multiple tests when the node arguments are identical. Running several tests back-to-back therefore re-uses the same process unless a scenario explicitly changes the node configuration.
 
 ## Run all tests
 

tests/systemtests/accountabstraction/test_eip7702.go

@@ -1,3 +1,5 @@
+//go:build system_test
+
 package accountabstraction
 
 import (
@@ -10,23 +12,29 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	//nolint:revive // dot imports are fine for Ginkgo
 	. "github.com/onsi/gomega"
-)
 
-func TestEIP7702(t *testing.T) {
-	const (
-		user0 = "acc0"
-		user1 = "acc1"
-	)
+	suite "github.com/cosmos/evm/tests/systemtests/suite"
+)
 
+func RunEIP7702(t *testing.T, base *suite.BaseTestSuite) {
 	Describe("test EIP-7702 scenorios", Ordered, func() {
 		var (
-			s AccountAbstractionTestSuite
+			s        *TestSuite
+			user0Acc *suite.TestAccount
+			user1Acc *suite.TestAccount
+			user0    string
+			user1    string
 		)
 
 		// We intentionally use BeforeAll instead of BeforeAll because,
 		// The test takes too much time if we restart network for each test case.
 		BeforeAll(func() {
-			s = NewTestSuite(t)
+			s = NewTestSuite(base)
+			user0Acc = s.BaseTestSuite.Acc(0)
+			user1Acc = s.BaseTestSuite.Acc(1)
+			user0 = user0Acc.ID
+			user1 = user1Acc.ID
+			s.SetPrimaryAccount(user0Acc)
 			s.SetupTest(t)
 		})
 
@@ -59,20 +67,20 @@ func TestEIP7702(t *testing.T) {
 			authChainID   func() uint64
 			authNonce     func() uint64
 			authAddress   func() common.Address
-			authSigner    string
-			txSender      string
+			authSigner    func() string
+			txSender      func() string
 			expDelegation bool
 		}
 
 		DescribeTable("SetCode authorization scenarios", func(tc testCase) {
 			authorization := createSetCodeAuthorization(tc.authChainID(), tc.authNonce(), tc.authAddress())
-			signedAuthorization, err := signSetCodeAuthorization(s.GetPrivKey(tc.authSigner), authorization)
+			signedAuthorization, err := signSetCodeAuthorization(s.GetPrivKey(tc.authSigner()), authorization)
 			Expect(err).To(BeNil())
 
-			txHash, err := s.SendSetCodeTx(tc.txSender, signedAuthorization)
+			txHash, err := s.SendSetCodeTx(tc.txSender(), signedAuthorization)
 			Expect(err).To(BeNil(), "error while sending SetCode tx")
 			s.WaitForCommit(txHash)
-			s.CheckSetCode(tc.authSigner, tc.authAddress(), tc.expDelegation)
+			s.CheckSetCode(tc.authSigner(), tc.authAddress(), tc.expDelegation)
 		},
 			Entry("setCode with invalid chainID should fail", testCase{
 				authChainID: func() uint64 { return s.GetChainID() + 1 },
@@ -82,8 +90,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetCounterAddr()
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: false,
 			}),
 			Entry("setCode with empty address should reset delegation", testCase{
@@ -94,8 +102,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return common.HexToAddress("0x0")
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: false,
 			}),
 			Entry("setCode with invalid address should fail", testCase{
@@ -106,8 +114,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return common.BytesToAddress([]byte("invalid"))
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: true,
 			}),
 			Entry("setCode with EoA address should fail", testCase{
@@ -118,8 +126,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetAddr(user1)
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: true,
 			}),
 			Entry("same signer/sender with matching nonce should fail", testCase{
@@ -130,8 +138,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetCounterAddr()
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: false,
 			}),
 			Entry("same signer/sender with future nonce sholud succeed", testCase{
@@ -142,8 +150,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetCounterAddr()
 				},
-				authSigner:    user0,
-				txSender:      user0,
+				authSigner:    func() string { return user0 },
+				txSender:      func() string { return user0 },
 				expDelegation: true,
 			}),
 			Entry("different signer/sender with current nonce should succeed", testCase{
@@ -154,8 +162,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetCounterAddr()
 				},
-				authSigner:    user1,
-				txSender:      user0,
+				authSigner:    func() string { return user1 },
+				txSender:      func() string { return user0 },
 				expDelegation: true,
 			}),
 			Entry("different signer/sender with future nonce should fail", testCase{
@@ -166,8 +174,8 @@ func TestEIP7702(t *testing.T) {
 				authAddress: func() common.Address {
 					return s.GetCounterAddr()
 				},
-				authSigner:    user1,
-				txSender:      user0,
+				authSigner:    func() string { return user1 },
+				txSender:      func() string { return user0 },
 				expDelegation: false,
 			}),
 		)