chore: prepare v1.2 (#31)

KYVENetwork · Apr 19, 2023 · f89babb · f89babb
1 parent b07023d
commit f89babb
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 2,065 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -22,3 +22,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v1.1.x
+  - name: backport patches to v1.2.x branch
+    conditions:
+      - base=main
+      - label=backport/v1.2.x
+    actions:
+      backport:
+        branches:
+          - release/v1.2.x
diff --git a/app/app.go b/app/app.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	v11 "github.com/KYVENetwork/chain/app/upgrades/v1_1"
+	v12 "github.com/KYVENetwork/chain/app/upgrades/v1_2"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -775,18 +775,10 @@ func NewKYVEApp(
 	app.SetEndBlocker(app.EndBlocker)
 
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v11.UpgradeName,
-		v11.CreateUpgradeHandler(
+		v12.UpgradeName,
+		v12.CreateUpgradeHandler(
 			app.mm,
 			app.configurator,
-			appCodec,
-			keys[bundlesTypes.StoreKey],
-			keys[delegationTypes.StoreKey],
-			keys[stakersTypes.StoreKey],
-			app.AccountKeeper,
-			app.ICAControllerKeeper,
-			app.ICAHostKeeper,
-			app.IBCTransferKeeper,
 		),
 	)
 
@@ -795,8 +787,8 @@ func NewKYVEApp(
 		panic(err)
 	}
 
-	if upgradeInfo.Name == v11.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		app.SetStoreLoader(v11.CreateStoreLoader(upgradeInfo.Height))
+	if upgradeInfo.Name == v12.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		app.SetStoreLoader(v12.CreateStoreLoader(upgradeInfo.Height))
 	}
 
 	if loadLatest {

diff --git a/app/upgrades/v1_1/constants.go b/app/upgrades/v1_1/constants.go