try to get the v2 upgrade to work

Makefile

@@ -119,7 +119,7 @@ test-short:
 ## test-e2e: Run end to end tests via knuu. This command requires a kube/config file to configure kubernetes.
 test-e2e:
 	@echo "--> Running end to end tests"
-	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_LATEST_VERSION=$(shell git rev-parse --short main) E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
+	@KNUU_NAMESPACE=test KNUU_TIMEOUT=20m E2E_LATEST_VERSION=ef40921 E2E_VERSIONS="$(ALL_VERSIONS)" E2E=true go test ./test/e2e/... -timeout 20m -v
 .PHONY: test-e2e
 
 ## test-race: Run tests in race mode.

app/app.go

@@ -576,6 +576,7 @@ func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Respo
 	// NOTE: this is a specific feature for upgrading to v2 as v3 and onward is expected
 	// to be coordinated through the signalling protocol
 	if app.UpgradeKeeper.ShouldUpgrade(req.Height) {
+		app.Logger().Info("Upgrading to v2", "height", req.Height)
 		app.SetAppVersion(ctx, v2.Version)
 	}
 	return res

cmd/celestia-appd/cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -240,6 +241,7 @@ func NewAppServer(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts se
 	var upgradeHeight int64
 	upgradeHeightStr, ok := appOpts.Get(UpgradeHeightFlag).(string)
 	if ok {
+		fmt.Println("upgrade flag detected")
 		upgradeHeight, err = strconv.ParseInt(upgradeHeightStr, 10, 64)
 		if err != nil {
 			panic(err)

test/e2e/simple_test.go

@@ -33,6 +33,7 @@ func TestE2ESimple(t *testing.T) {
 		switch {
 		case isSemVer:
 		case latestVersion == "latest":
+		case len(latestVersion) == 7:
 		case len(latestVersion) == 8:
 			// assume this is a git commit hash (we need to trim the last digit to match the docker image tag)
 			latestVersion = latestVersion[:7]

test/e2e/upgrade_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
+	v1 "github.com/celestiaorg/celestia-app/pkg/appconsts/v1"
 	v2 "github.com/celestiaorg/celestia-app/pkg/appconsts/v2"
 	"github.com/celestiaorg/celestia-app/test/txsim"
 	"github.com/celestiaorg/knuu/pkg/knuu"
@@ -22,6 +23,7 @@ import (
 const MajorVersion = 1
 
 func TestMinorVersionCompatibility(t *testing.T) {
+	t.Skip()
 	if os.Getenv("E2E") != "true" {
 		t.Skip("skipping e2e test")
 	}
@@ -134,6 +136,7 @@ func TestMajorUpgradeToV2(t *testing.T) {
 		switch {
 		case isSemVer:
 		case latestVersion == "latest":
+		case len(latestVersion) == 7:
 		case len(latestVersion) == 8:
 			// assume this is a git commit hash (we need to trim the last digit to match the docker image tag)
 			latestVersion = latestVersion[:7]
@@ -175,7 +178,7 @@ func TestMajorUpgradeToV2(t *testing.T) {
 		resp, err := client.Header(ctx, nil)
 		require.NoError(t, err)
 		// FIXME: we are not correctly setting the app version at genesis
-		require.Equal(t, uint64(0), resp.Header.Version.App, "version mismatch before upgrade")
+		require.Equal(t, v1.Version, resp.Header.Version.App, "version mismatch before upgrade")
 	}
 
 	errCh := make(chan error)

x/upgrade/keeper.go

@@ -1,6 +1,8 @@
 package upgrade
 
 import (
+	fmt "fmt"
+
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
@@ -23,6 +25,7 @@ type VersionSetter func(version uint64)
 
 // NewKeeper constructs an upgrade keeper
 func NewKeeper(storeKey storetypes.StoreKey, upgradeHeight int64) Keeper {
+	fmt.Println("upgradeHeight", upgradeHeight)
 	return Keeper{
 		storeKey:      storeKey,
 		upgradeHeight: upgradeHeight,