[TA-3671] (POC): upgrade integration testsuite with test upgrade

Dockerfile

@@ -20,7 +20,6 @@ RUN make lint
 RUN make test-poa
 # Integration tests
 RUN make test-integration
-RUN make test-upgrade
 # Simulation tests
 RUN make test-sim-benchmark-simulation
 RUN make test-sim-full-app-fast

Makefile

@@ -5,6 +5,9 @@ COMMIT := $(shell git log -1 --format='%H')
 BINDIR ?= $(GOPATH)/bin
 APP = ./app
 
+# Upgrade testsuite values
+LATEST_UPGRADE ?= $(shell ls -d ./app/upgrades/* | sort -r | head -n 1)
+SNAPSHOT_DIR ?= .exrpd
 # don't override user values
 ifeq (,$(VERSION))
   VERSION := $(shell git describe --tags)
@@ -126,11 +129,13 @@ mocks:
 	@echo "--> Generating mocks"
 	@./scripts/mockgen.sh
 
-test: test-poa test-integration test-upgrade test-sim-benchmark-simulation test-sim-full-app-fast
+test: test-poa test-integration test-sim-benchmark-simulation test-sim-full-app-fast
 
 test-upgrade:
-	@echo "--> Running upgrade testsuite"
-	@go test -mod=readonly -v ./tests/upgrade
+	@echo "--> Running upgrade testsuite from snapshot: $(SNAPSHOT_DIR), into $(LATEST_UPGRADE)"
+	@rm -rf $(LATEST_UPGRADE)/integration/.exrpd
+	@cp -r $(SNAPSHOT_DIR) $(LATEST_UPGRADE)/integration/.exrpd
+	@go test -mod=readonly -v $(LATEST_UPGRADE)/integration
 
 test-integration:
 	@echo "--> Running integration testsuite"

app/upgrades.go

@@ -12,6 +12,7 @@ import (
 	v4 "github.com/xrplevm/node/v6/app/upgrades/v4"
 	v5 "github.com/xrplevm/node/v6/app/upgrades/v5"
 	v6 "github.com/xrplevm/node/v6/app/upgrades/v6"
+	v7 "github.com/xrplevm/node/v6/app/upgrades/v7"
 )
 
 func (app *App) setupUpgradeHandlers() {
@@ -44,6 +45,14 @@ func (app *App) setupUpgradeHandlers() {
 			app.configurator,
 		),
 	)
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v7.UpgradeName,
+		v7.CreateUpgradeHandler(
+			app.mm,
+			app.configurator,
+			app.StakingKeeper,
+		),
+	)
 
 	// When a planned update height is reached, the old binary will panic
 	// writing on disk the height and name of the update that triggered it
@@ -68,7 +77,7 @@ func (app *App) setupUpgradeHandlers() {
 			},
 			Deleted: []string{},
 		}
-	case v5.UpgradeName, v6.UpgradeName:
+	case v5.UpgradeName, v6.UpgradeName, v7.UpgradeName:
 		// No store upgrades for v5
 		storeUpgrades = &storetypes.StoreUpgrades{}
 	}

app/upgrades/v7/constants.go

@@ -0,0 +1,5 @@
+package v7
+
+const (
+	UpgradeName = "v7.0.0"
+)

app/upgrades/v7/integration/auth_test.go

@@ -0,0 +1,44 @@
+//nolint:dupl
+package integration
+
+import (
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+)
+
+func (s *UpgradeTestSuite) TestUpgrade_Auth_Params() {
+	prevParams, err := s.network.GetAuthClient().Params(
+		s.network.GetContext(),
+		&authtypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	postParams, err := s.network.GetAuthClient().Params(
+		s.network.GetContext(),
+		&authtypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	// Check that not modified params are the same
+	s.Require().Equal(prevParams.Params, postParams.Params)
+}
+
+func (s *UpgradeTestSuite) TestUpgrade_Auth_Accounts() {
+	res, err := s.network.GetAuthClient().Accounts(
+		s.network.GetContext(),
+		&authtypes.QueryAccountsRequest{},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	postRes, err := s.network.GetAuthClient().Accounts(
+		s.network.GetContext(),
+		&authtypes.QueryAccountsRequest{},
+	)
+	s.Require().NoError(err)
+
+	// Check that not modified accounts are the same
+	s.Require().Equal(res.Accounts, postRes.Accounts)
+}

app/upgrades/v7/integration/bank_test.go

@@ -0,0 +1,102 @@
+package integration
+
+import (
+	sdktypes "github.com/cosmos/cosmos-sdk/types"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+)
+
+func (s *UpgradeTestSuite) TestUpgrade_Bank_Params() {
+	prevParams, err := s.network.GetBankClient().Params(
+		s.network.GetContext(),
+		&banktypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	postParams, err := s.network.GetBankClient().Params(
+		s.network.GetContext(),
+		&banktypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	// Check that not modified params are the same
+	s.Require().Equal(prevParams.Params, postParams.Params)
+}
+
+func (s *UpgradeTestSuite) TestUpgrade_Bank_TotalSupply() {
+	res, err := s.network.GetBankClient().TotalSupply(
+		s.network.GetContext(),
+		&banktypes.QueryTotalSupplyRequest{},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	postRes, err := s.network.GetBankClient().TotalSupply(
+		s.network.GetContext(),
+		&banktypes.QueryTotalSupplyRequest{},
+	)
+	s.Require().NoError(err)
+
+	// Check that not modified balances are the same
+	s.Require().Equal(res.Supply, postRes.Supply)
+}
+
+func (s *UpgradeTestSuite) TestUpgrade_Bank_Send() {
+	// Replace with the desired addresses
+	sender, err := sdktypes.AccAddressFromBech32("ethm1dakgyqjulg29m5fmv992g2y66m9g2mjn6hahwg")
+	s.Require().NoError(err)
+	receiver, err := sdktypes.AccAddressFromBech32("ethm1nqvn2hmte72e3z0xyqmh06hdwd9qu6hgdcavhh")
+	s.Require().NoError(err)
+	amount := sdktypes.NewInt64Coin(s.network.GetDenom(), 100)
+
+	prevBalancesSender, err := s.network.GetBankClient().Balance(
+		s.network.GetContext(),
+		&banktypes.QueryBalanceRequest{
+			Address: sender.String(),
+			Denom:   s.network.GetDenom(),
+		},
+	)
+	s.Require().NoError(err)
+
+	prevBalancesReceiver, err := s.network.GetBankClient().Balance(
+		s.network.GetContext(),
+		&banktypes.QueryBalanceRequest{
+			Address: receiver.String(),
+			Denom:   s.network.GetDenom(),
+		},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	err = s.network.BankKeeper().SendCoins(
+		s.network.GetContext(),
+		sender,
+		receiver,
+		sdktypes.NewCoins(amount),
+	)
+	s.Require().NoError(err)
+
+	postBalancesSender, err := s.network.GetBankClient().Balance(
+		s.network.GetContext(),
+		&banktypes.QueryBalanceRequest{
+			Address: sender.String(),
+			Denom:   s.network.GetDenom(),
+		},
+	)
+	s.Require().NoError(err)
+
+	postBalancesReceiver, err := s.network.GetBankClient().Balance(
+		s.network.GetContext(),
+		&banktypes.QueryBalanceRequest{
+			Address: receiver.String(),
+			Denom:   s.network.GetDenom(),
+		},
+	)
+	s.Require().NoError(err)
+
+	s.Require().Equal(prevBalancesSender.Balance.Amount.Sub(amount.Amount).String(), postBalancesSender.Balance.Amount.String())
+	s.Require().Equal(prevBalancesReceiver.Balance.Amount.Add(amount.Amount).String(), postBalancesReceiver.Balance.Amount.String())
+}

app/upgrades/v7/integration/distribution_test.go

@@ -0,0 +1,24 @@
+package integration
+
+import (
+	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+)
+
+func (s *UpgradeTestSuite) TestUpgrade_DistributionParams() {
+	prevParams, err := s.network.GetDistrClient().Params(
+		s.network.GetContext(),
+		&distributiontypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	s.RunUpgrade(upgradeName)
+
+	postParams, err := s.network.GetDistrClient().Params(
+		s.network.GetContext(),
+		&distributiontypes.QueryParamsRequest{},
+	)
+	s.Require().NoError(err)
+
+	// Check that not modified params are the same
+	s.Require().Equal(prevParams.Params, postParams.Params)
+}