implemented upgrade handler for v6.1.7 (#1072) (#1073)

(cherry picked from commit 041ad26)

Co-authored-by: CJPotter10 <91627020+CJPotter10@users.noreply.github.com>

Author: github-actions[bot]

app/upgrades.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/tellor-io/layer/app/upgrades"
-	v_6_1_6 "github.com/tellor-io/layer/app/upgrades/v6.1.6"
+	v_6_1_7 "github.com/tellor-io/layer/app/upgrades/v6.1.7"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 )
@@ -13,26 +13,22 @@ var (
 	// `Upgrades` defines the upgrade handlers and store loaders for the application.
 	// New upgrades should be added to this slice after they are implemented.
 	Upgrades = []*upgrades.Upgrade{
-		&v_6_1_6.Upgrade,
+		&v_6_1_7.Upgrade,
 	}
 	Forks = []upgrades.Fork{}
 )
 
 // setupUpgradeHandlers registers the upgrade handlers to perform custom upgrade
 // logic and state migrations for software upgrades.
 func (app *App) setupUpgradeHandlers() {
-	if app.UpgradeKeeper.HasHandler(v_6_1_6.UpgradeName) {
-		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_6_1_6.UpgradeName))
+	if app.UpgradeKeeper.HasHandler(v_6_1_7.UpgradeName) {
+		panic(fmt.Sprintf("Cannot register duplicate upgrade handler '%s'", v_6_1_7.UpgradeName))
 	}
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v_6_1_6.UpgradeName,
-		v_6_1_6.CreateUpgradeHandler(
+		v_6_1_7.UpgradeName,
+		v_6_1_7.CreateUpgradeHandler(
 			app.ModuleManager(),
 			app.configurator,
-			app.AccountKeeper,
-			app.ReporterKeeper,
-			app.ICAControllerKeeper,
-			app.ICAHostKeeper,
 		),
 	)
 }

app/upgrades/v6.1.7/constants.go

@@ -0,0 +1,16 @@
+package v6_1_7
+
+import (
+	"github.com/tellor-io/layer/app/upgrades"
+
+	store "cosmossdk.io/store/types"
+)
+
+const (
+	UpgradeName = "v6.1.7"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:   UpgradeName,
+	StoreUpgrades: store.StoreUpgrades{},
+}

app/upgrades/v6.1.7/upgrade.go

@@ -0,0 +1,47 @@
+package v6_1_7
+
+import (
+	"context"
+	"fmt"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+)
+
+/*
+Upgrade to v6.1.7 includes (since v6.1.6):
+  - Dispute vote validation and accounting (#1061): reject invalid vote choices;
+    counted selector stake moves stored ReporterPower on revote (no re-snapshot,
+    re-peel, or re-reserve); lock only blocks first acquisition of reporter stake;
+    peels target evidence-reporter ownership after a switch when needed; fail-closed
+    bucket underflow/overflow; same safeguards applied to team votes.
+  - MsgBatchSubmitValue correctness (#1064): align with MsgSubmitValue power caching,
+    call ReporterStake on the first verified valid report, and return an error when
+    all reports in the batch fail.
+  - Reporter self-demotion hardening (#1065): safer demotion lifecycle (reporter not
+    deleted immediately), block pending switches onto a demoting reporter, and handle
+    rewards/liveness after demotion when the reporter object is gone.
+  - Bridge module authority wiring (#1058): inject authority correctly into
+    ProvideModule via the module config proto.
+  - Bridge vote-extension signing (#1046 / #1063): sign via validated
+    checkpoint/attestation RPCs (VoteExtensionSigner), not SignRaw; follow-up signer
+    API and registration-sig updates.
+
+No custom state migration is required beyond RunMigrations: dispute vote store
+layout and protos are unchanged. In-flight disputes keep existing tallies;
+subsequent votes use the corrected accounting.
+*/
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		sdkCtx := sdk.UnwrapSDKContext(ctx)
+		sdkCtx.Logger().Info(fmt.Sprintf("Running %s Upgrade...", UpgradeName))
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}

e2e/upgrade_test.go

@@ -29,7 +29,7 @@ const (
 )
 
 func TestLayerUpgrade(t *testing.T) {
-	ChainUpgradeTest(t, "layer", "layer", "local", "v6.1.6")
+	ChainUpgradeTest(t, "layer", "layer", "local", "v6.1.7")
 }
 
 func ChainUpgradeTest(t *testing.T, chainName, upgradeContainerRepo, upgradeVersion, upgradeName string) {