test: add admin and performance test and fix upgrade test

Dockerfile

@@ -14,6 +14,7 @@ WORKDIR /go/delivery/zeta-node
 # Copy module files and download dependencies
 COPY go.mod .
 COPY go.sum .
+
 RUN go mod download
 
 # Copy the rest of the source code and build the application

Dockerfile-upgrade

@@ -20,8 +20,8 @@ WORKDIR /go/delivery/zeta-node
 RUN mkdir -p  $GOPATH/bin/old
 RUN mkdir -p  $GOPATH/bin/new
 
-ARG OLD_VERSION=v13.0.0
-ENV NEW_VERSION=v14
+ARG OLD_VERSION=v14.0.0
+ENV NEW_VERSION=v15
 
 # Build new release from the current source
 COPY go.mod /go/delivery/zeta-node/

LOCAL_TESTING.md

@@ -17,18 +17,26 @@ $ make zetanode
 
 This Makefile rule builds the zetanode image. **Rebuild if zetacored/zetaclientd code is updated**.
 ```bash
-# in zeta-node/
 $ docker build -t zetanode .
 ```
 
 ### Run e2e tests
 
 Now we have built all the docker images, we can run the e2e test with make command:
 ```bash
-# in zeta-node/
 make start-e2e-test
 ```
 
+#### Run admin functions e2e tests
+
+We define e2e tests allowing to test admin functionalities (emergency network pause for example).
+Since these tests interact with the network functionalities, these can't be run concurrently with the regular e2e tests.
+Moreover, these tests test scoped functionalities of the protocol, and won't be tested in the same pipeline as the regular e2e tests.
+Therefore, we provide a separate command to run e2e admin functions tests:
+```bash
+make start-e2e-admin-test
+```
+
 ### Run upgrade tests
 
 Upgrade tests run the E2E tests with an older version, upgrade the nodes to the new version, and run the E2E tests again.
@@ -46,18 +54,22 @@ NOTE: We only specify the major version for `NEW_VERSION` since we use major ver
 
 The upgrade tests can be run with the following command:
 ```bash
-# in zeta-node/
 make start-upgrade-test
 ```
 
+The test the upgrade script faster a light version of the upgrade test can be run with the following command:
+```bash
+make start-upgrade-test-light
+```
+This command will run the upgrade test with a lower height and will not populate the state.
+
 ### Run stress tests
 
 Stress tests run the E2E tests with a larger number of nodes and clients to test the performance of the network.
 It also stresses the network by sending a large number of cross-chain transactions.
 
 The stress tests can be run with the following command:
 ```bash
-# in zeta-node/
 make start-stress-test
 ```
 
@@ -68,15 +80,14 @@ If everything works fine, it should finish without panic.
 
 The logs can be observed with the following command:
 ```bash
-# in zeta-node/contrib/localnet/orchestrator
+# in node/contrib/localnet/orchestrator
 $ docker logs -f orchestrator
 ```
 
 ### Stop tests
 
 To stop the tests,
 ```bash
-# in zeta-node/
 make stop-test
 ```
 
@@ -86,7 +97,6 @@ Before starting the monitoring setup, make sure the Zetacore API is up at http:/
 You can also add any additional ETH addresses to monitor in `zeta-node/contrib/localnet/grafana/addresses.txt` file
 
 ```bash
-# in zeta-node/
 make start-monitoring
 ```
 
@@ -97,7 +107,6 @@ The Grafana default credentials are admin:admin. The dashboards are located at h
 ### Stop monitoring setup
 
 ```bash
-# in zeta-node/
 make stop-monitoring
 ```
 
@@ -108,7 +117,6 @@ In addition to running automated tests, you can also interact with the localnet
 The localnet can be started without running tests with the following command:
 
 ```bash
-# in zeta-node/
 make start-localnet
 ```
 

Makefile

@@ -192,20 +192,35 @@ install-zetae2e: go.sum
 	@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetae2e
 .PHONY: install-zetae2e
 
-start-e2e-test:
+start-e2e-test: zetanode
 	@echo "--> Starting e2e test"
 	cd contrib/localnet/ && $(DOCKER) compose up -d
 
+start-e2e-admin-test: zetanode
+	@echo "--> Starting e2e admin test"
+	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-admin.yml up -d
+
+start-e2e-performance-test: zetanode
+	@echo "--> Starting e2e performance test"
+	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-performance.yml up -d
+
 start-stress-test: zetanode
+	@echo "--> Starting stress test"
 	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-stresstest.yml up -d
 
 start-upgrade-test:
 	@echo "--> Starting upgrade test"
-	$(DOCKER) build --build-arg -t zetanode -f ./Dockerfile-upgrade .
+	$(DOCKER) build -t zetanode -f ./Dockerfile-upgrade .
 	$(DOCKER) build -t orchestrator -f contrib/localnet/orchestrator/Dockerfile.fastbuild .
 	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-upgrade.yml up -d
 
-start-localnet:
+start-upgrade-test-light:
+	@echo "--> Starting light upgrade test (no ZetaChain state populating before upgrade)"
+	$(DOCKER) build -t zetanode -f ./Dockerfile-upgrade .
+	$(DOCKER) build -t orchestrator -f contrib/localnet/orchestrator/Dockerfile.fastbuild .
+	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-upgrade-light.yml up -d
+
+start-localnet: zetanode
 	@echo "--> Starting localnet"
 	cd contrib/localnet/ && $(DOCKER) compose -f docker-compose.yml -f docker-compose-setup-only.yml up -d
 

app/setup_handlers.go

@@ -5,10 +5,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
+	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
+	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
-const releaseVersion = "v14"
+const releaseVersion = "v15"
 
 func SetupHandlers(app *App) {
 	app.UpgradeKeeper.SetUpgradeHandler(releaseVersion, func(ctx sdk.Context, plan types.Plan, vm module.VersionMap) (module.VersionMap, error) {
@@ -17,7 +18,7 @@ func SetupHandlers(app *App) {
 		for m, mb := range app.mm.Modules {
 			vm[m] = mb.ConsensusVersion()
 		}
-		VersionMigrator{v: vm}.TriggerMigration(crosschaintypes.ModuleName)
+		VersionMigrator{v: vm}.TriggerMigration(observertypes.ModuleName)
 
 		return app.mm.RunMigrations(ctx, app.configurator, vm)
 	})
@@ -28,7 +29,7 @@ func SetupHandlers(app *App) {
 	}
 	if upgradeInfo.Name == releaseVersion && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
-			// Added: []string{},
+			Added: []string{authoritytypes.ModuleName},
 		}
 		// Use upgrade store loader for the initial loading of all stores when app starts,
 		// it checks if version == upgradeHeight and applies store upgrades before loading the stores,

changelog.md

@@ -31,6 +31,7 @@
 * [1840](https://github.com/zeta-chain/node/pull/1840) - fix code coverage test failures ignored in CI
 * [1851](https://github.com/zeta-chain/node/pull/1851) - rename usdt to erc20 in e2e tests
 * [1872](https://github.com/zeta-chain/node/pull/1872) - remove usage of RPC in unit test
+* [1805](https://github.com/zeta-chain/node/pull/1805) - add admin and performance test and fix upgrade test
 
 ### Fixes
 
@@ -93,7 +94,6 @@
 * [1584](https://github.com/zeta-chain/node/pull/1584) - allow to run E2E tests on any networks
 * [1746](https://github.com/zeta-chain/node/pull/1746) - rename smoke tests to e2e tests
 * [1753](https://github.com/zeta-chain/node/pull/1753) - fix gosec errors on usage of rand package
-
 * [1762](https://github.com/zeta-chain/node/pull/1762) - improve coverage for fungibile module
 * [1782](https://github.com/zeta-chain/node/pull/1782) - improve coverage for fungibile module system contract
 

cmd/zetae2e/config/clients.go

@@ -80,7 +80,6 @@ func getBtcClient(rpcConf config.BitcoinRPC) (*rpcclient.Client, error) {
 		HTTPPostMode: rpcConf.HTTPPostMode,
 		DisableTLS:   rpcConf.DisableTLS,
 		Params:       param,
-		//Endpoint:     "/wallet/user",
 	}
 	return rpcclient.New(connCfg, nil)
 }

cmd/zetae2e/config/config.go

@@ -100,6 +100,8 @@ func ExportContractsFromRunner(r *runner.E2ERunner, conf config.Config) config.C
 	conf.Contracts.ZEVM.BTCZRC20Addr = r.BTCZRC20Addr.Hex()
 	conf.Contracts.ZEVM.UniswapFactoryAddr = r.UniswapV2FactoryAddr.Hex()
 	conf.Contracts.ZEVM.UniswapRouterAddr = r.UniswapV2RouterAddr.Hex()
+	conf.Contracts.ZEVM.ConnectorZEVMAddr = r.ConnectorZEVMAddr.Hex()
+	conf.Contracts.ZEVM.WZetaAddr = r.WZetaAddr.Hex()
 	conf.Contracts.ZEVM.ZEVMSwapAppAddr = r.ZEVMSwapAppAddr.Hex()
 	conf.Contracts.ZEVM.ContextAppAddr = r.ContextAppAddr.Hex()
 	conf.Contracts.ZEVM.TestDappAddr = r.TestDAppAddr.Hex()

cmd/zetae2e/config/local.yml

@@ -7,7 +7,7 @@ rpcs:
   evm: "http://0.0.0.0:8545"
   bitcoin:
     host: "0.0.0.0:18443"
-    user: "e2e"
+    user: "smoketest"
     pass: "123"
     http_post_mode: true
     disable_tls: true

cmd/zetae2e/local/admin.go

@@ -17,6 +17,7 @@ func adminTestRoutine(
 	conf config.Config,
 	deployerRunner *runner.E2ERunner,
 	verbose bool,
+	testNames ...string,
 ) func() error {
 	return func() (err error) {
 		// return an error on panic
@@ -63,9 +64,7 @@ func adminTestRoutine(
 		// run erc20 advanced test
 		testsToRun, err := adminRunner.GetE2ETestsToRunByName(
 			e2etests.AllE2ETests,
-			e2etests.TestPauseZRC20Name,
-			e2etests.TestUpdateBytecodeName,
-			e2etests.TestDepositEtherLiquidityCapName,
+			testNames...,
 		)
 		if err != nil {
 			return fmt.Errorf("admin tests failed: %v", err)

cmd/zetae2e/local/bitcoin.go

@@ -17,6 +17,8 @@ func bitcoinTestRoutine(
 	deployerRunner *runner.E2ERunner,
 	verbose bool,
 	initBitcoinNetwork bool,
+	testHeader bool,
+	testNames ...string,
 ) func() error {
 	return func() (err error) {
 		// return an error on panic
@@ -59,18 +61,14 @@ func bitcoinTestRoutine(
 		bitcoinRunner.WaitForMinedCCTX(txERC20Deposit)
 
 		bitcoinRunner.SetupBitcoinAccount(initBitcoinNetwork)
-		bitcoinRunner.DepositBTC(true)
+		bitcoinRunner.DepositBTC(testHeader)
 
 		// run bitcoin test
 		// Note: due to the extensive block generation in Bitcoin localnet, block header test is run first
 		// to make it faster to catch up with the latest block header
 		testsToRun, err := bitcoinRunner.GetE2ETestsToRunByName(
 			e2etests.AllE2ETests,
-			e2etests.TestBitcoinWithdrawInvalidAddressName,
-			e2etests.TestBitcoinWithdrawName,
-			e2etests.TestZetaWithdrawBTCRevertName,
-			e2etests.TestCrosschainSwapName,
-			e2etests.TestBitcoinWithdrawRestrictedName,
+			testNames...,
 		)
 		if err != nil {
 			return fmt.Errorf("bitcoin tests failed: %v", err)

cmd/zetae2e/local/erc20.go

@@ -16,6 +16,7 @@ func erc20TestRoutine(
 	conf config.Config,
 	deployerRunner *runner.E2ERunner,
 	verbose bool,
+	testNames ...string,
 ) func() error {
 	return func() (err error) {
 		// return an error on panic
@@ -56,17 +57,10 @@ func erc20TestRoutine(
 		erc20Runner.WaitForMinedCCTX(txEtherDeposit)
 		erc20Runner.WaitForMinedCCTX(txERC20Deposit)
 
-		//erc20Runner.SetupBitcoinAccount()
-		//erc20Runner.DepositBTC()
-
 		// run erc20 test
 		testsToRun, err := erc20Runner.GetE2ETestsToRunByName(
 			e2etests.AllE2ETests,
-			e2etests.TestERC20WithdrawName,
-			e2etests.TestMultipleWithdrawsName,
-			e2etests.TestERC20DepositAndCallRefundName,
-			e2etests.TestZRC20SwapName,
-			e2etests.TestERC20DepositRestrictedName,
+			testNames...,
 		)
 		if err != nil {
 			return fmt.Errorf("erc20 tests failed: %v", err)

cmd/zetae2e/local/ethereum.go

@@ -16,6 +16,8 @@ func ethereumTestRoutine(
 	conf config.Config,
 	deployerRunner *runner.E2ERunner,
 	verbose bool,
+	testHeader bool,
+	testNames ...string,
 ) func() error {
 	return func() (err error) {
 		// return an error on panic
@@ -47,19 +49,15 @@ func ethereumTestRoutine(
 		startTime := time.Now()
 
 		// depositing the necessary tokens on ZetaChain
-		txEtherDeposit := ethereumRunner.DepositEther(true)
+		txEtherDeposit := ethereumRunner.DepositEther(testHeader)
 		ethereumRunner.WaitForMinedCCTX(txEtherDeposit)
 
 		// run ethereum test
 		// Note: due to the extensive block generation in Ethereum localnet, block header test is run first
 		// to make it faster to catch up with the latest block header
 		testsToRun, err := ethereumRunner.GetE2ETestsToRunByName(
 			e2etests.AllE2ETests,
-			e2etests.TestEtherWithdrawName,
-			e2etests.TestContextUpgradeName,
-			e2etests.TestEtherDepositAndCallName,
-			e2etests.TestDepositAndCallRefundName,
-			e2etests.TestEtherWithdrawRestrictedName,
+			testNames...,
 		)
 		if err != nil {
 			return fmt.Errorf("ethereum tests failed: %v", err)