chore: prepare v1.4 (backport #120) (#125)

Co-authored-by: Maximilian Breithecker <[email protected]>

.github/README.md

@@ -1,6 +1,6 @@
 # The KYVE Network
 
-###### v1.3.0
+###### v1.3.1
 
 The KYVE consensus layer is the backbone of the KYVE ecosystem. This layer is a
 sovereign Delegated Proof of Stake network built using the

.github/mergify.yml

@@ -38,3 +38,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v1.3.x
+  - name: backport patches to v1.4.x branch
+    conditions:
+      - base=main
+      - label=backport/v1.4.x
+    actions:
+      backport:
+        branches:
+          - release/v1.4.x

CHANGELOG.md

@@ -14,6 +14,12 @@
 
 An '!' indicates a state machine breaking change.
 
+## [v1.3.1](https://github.com/KYVENetwork/chain/releases/tag/v1.3.1) - 2023-08-02
+
+### Bug Fixes
+
+- [#122](https://github.com/KYVENetwork/chain/pull/122) Fix makefile go version parse cmd.
+
 ## [v1.3.0](https://github.com/KYVENetwork/chain/releases/tag/v1.3.0) - 2023-07-15
 
 ### Features

Makefile

@@ -1,6 +1,6 @@
 COMMIT := $(shell git log -1 --format='%H')
 GO_VERSION := $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1,2)
-VERSION := v1.3.0 # $(shell echo $(shell git describe --tags) | sed 's/^v//')
+VERSION := v1.3.1 # $(shell echo $(shell git describe --tags) | sed 's/^v//')
 
 TEAM_ALLOCATION := 165000000000000
 ifeq ($(ENV),kaon)

app/app.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	v1p3 "github.com/KYVENetwork/chain/app/upgrades/v1_3"
+	v1p4 "github.com/KYVENetwork/chain/app/upgrades/v1_4"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -802,15 +802,10 @@ func NewKYVEApp(
 	app.SetEndBlocker(app.EndBlocker)
 
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v1p3.UpgradeName,
-		v1p3.CreateUpgradeHandler(
+		v1p4.UpgradeName,
+		v1p4.CreateUpgradeHandler(
 			app.mm,
 			app.configurator,
-			app.PoolKeeper,
-			app.AccountKeeper,
-			app.BankKeeper,
-			app.StakingKeeper,
-			app.BundlesKeeper,
 		),
 	)
 
@@ -819,8 +814,8 @@ func NewKYVEApp(
 		panic(err)
 	}
 
-	if upgradeInfo.Name == v1p3.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		app.SetStoreLoader(v1p3.CreateStoreLoader(upgradeInfo.Height))
+	if upgradeInfo.Name == v1p4.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		app.SetStoreLoader(v1p4.CreateStoreLoader(upgradeInfo.Height))
 	}
 
 	if loadLatest {

app/upgrades/v1_4/constants.go

@@ -0,0 +1,10 @@
+package v1_4
+
+// UpgradeName is the name of this specific software upgrade used on-chain.
+const UpgradeName = "v1.4.0"
+
+// TestnetChainID is the Chain ID of the KYVE testnet (Kaon).
+const TestnetChainID = "kaon-1"
+
+// MainnetChainID is the Chain ID of the KYVE mainnet.
+const MainnetChainID = "kyve-1"

app/upgrades/v1_3/store.go → app/upgrades/v1_4/store.go

@@ -1,20 +1,16 @@
-package v1_3
+package v1_4
 
 import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 
-	// PFM
-	pfmTypes "github.com/strangelove-ventures/packet-forward-middleware/v6/router/types"
 	// Upgrade
 	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
 	storeUpgrades := storeTypes.StoreUpgrades{
-		Added: []string{
-			pfmTypes.StoreKey,
-		},
+		Added: []string{},
 	}
 
 	return upgradeTypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)

app/upgrades/v1_4/upgrade.go

@@ -0,0 +1,21 @@
+package v1_4
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	// Upgrade
+	upgradeTypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradeTypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradeTypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := ctx.Logger().With("upgrade", UpgradeName)
+		logger.Info("Run v1.4 upgrade")
+
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}