Merge branch 'main' into cbrumm/merkle-bundles-migration

# Conflicts:
#	app/app.go

.github/workflows/lint.yml

@@ -33,7 +33,8 @@ jobs:
           go-version-file: 'go.mod'
       # Lint go files with golangci-lint
       - name: Lint go files with golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
-          args: --timeout=10m
+          # TODO temporarily disable govet
+          args: --timeout=10m -D govet

.github/workflows/test.yml

@@ -18,23 +18,24 @@ jobs:
       - name: Test & coverage report creation
         run: go test -cover -mod=readonly ./x/...
 
-  interchaintest:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repository
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      # Setup Golang
-      - name: 🐿 Setup Golang
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-      # Setup heighliner
-      - name: Setup heighliner
-        run: make heighliner-setup
-      # Run heighliner
-      - name: Run heighliner
-        run: make heighliner
-      # Run interchaintest
-      - name: Run interchaintest
-        run: make interchaintest
+# TODO Heighliner is currently broken
+#  interchaintest:
+#    runs-on: ubuntu-latest
+#    steps:
+#      # Checkout the repository
+#      - name: Check out repository code
+#        uses: actions/checkout@v4
+#      # Setup Golang
+#      - name: 🐿 Setup Golang
+#        uses: actions/setup-go@v4
+#        with:
+#          go-version-file: 'go.mod'
+#      # Setup heighliner
+#      - name: Setup heighliner
+#        run: make heighliner-setup
+#      # Run heighliner
+#      - name: Run heighliner
+#        run: make heighliner
+#      # Run interchaintest
+#      - name: Run interchaintest
+#        run: make interchaintest

CHANGELOG.md

@@ -14,6 +14,22 @@
 
 An '!' indicates a state machine breaking change.
 
+## Unreleased
+
+### Features
+
+- ! (`x/stakers`) [#209](https://github.com/KYVENetwork/chain/pull/209) Shared Staking: Consensus-validator stake is now used for the protocol.
+- ! (`x/stakers`) [#210](https://github.com/KYVENetwork/chain/pull/210) Shared Staking: Pool specific commission and stake fraction.
+- ! (`x/stakers`) [#211](https://github.com/KYVENetwork/chain/pull/211) Shared Staking: Maximum voting power per pool.
+
+### Improvements
+
+- (deps) [#213](https://github.com/KYVENetwork/chain/pull/213) Bump to CosmosSDK v0.50.11 and cleanup deps.
+
+### Bug Fixes
+
+- ! [#207](https://github.com/KYVENetwork/chain/pull/207) Added test case for points.
+
 ## [v1.5.0](https://github.com/KYVENetwork/chain/releases/tag/v1.5.0) - 2024-07-05
 
 ### Features

Makefile

@@ -134,7 +134,7 @@ dev-continue:
 ###############################################################################
 
 gofumpt_cmd=mvdan.cc/gofumpt
-golangci_lint_cmd=github.com/golangci/golangci-lint/cmd/golangci-lint
+golangci_lint_cmd=github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
 
 format:
 	@echo "🤖 Running formatter..."
@@ -143,7 +143,8 @@ format:
 
 lint:
 	@echo "🤖 Running linter..."
-	@go run $(golangci_lint_cmd) run --skip-dirs scripts --timeout=10m
+	# TODO temporarily disabled govet
+	@go run $(golangci_lint_cmd) run --exclude-dirs scripts --timeout=10m -D govet
 	@echo "✅ Completed linting!"
 
 ###############################################################################
@@ -212,7 +213,8 @@ test:
 	@go test -cover -mod=readonly ./x/...
 	@echo "✅ Completed tests!"
 
-interchaintest: ensure_heighliner
-	@echo "🤖 Running interchain tests..."
-	@go test -mod=readonly ./interchaintest/...
-	@echo "✅ Completed interchain tests!"
+interchaintest: # ensure_heighliner
+#   TODO Heighliner is currently broken
+#	@echo "🤖 Running interchain tests..."
+#	@go test -mod=readonly ./interchaintest/...
+#	@echo "✅ Completed interchain tests!"

README.md

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

app/app.go

@@ -1,11 +1,11 @@
 package app
 
 import (
-	"github.com/KYVENetwork/chain/app/upgrades/v1_6"
 	"io"
 	"os"
 	"path/filepath"
 
+	"github.com/KYVENetwork/chain/app/upgrades/v2_0"
 	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -400,24 +400,27 @@ func New(
 		return app.App.InitChainer(ctx, req)
 	})
 
-	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
-	if err != nil {
-		return nil, err
-	}
-
 	app.UpgradeKeeper.SetUpgradeHandler(
-		v1_6.UpgradeName,
-		v1_6.CreateUpgradeHandler(
+		v2_0.UpgradeName,
+		v2_0.CreateUpgradeHandler(
 			app.ModuleManager,
 			app.Configurator(),
-			upgradeInfo.Height,
+			app.DelegationKeeper,
+			app.StakersKeeper,
+			app.StakingKeeper,
+			app.BankKeeper,
 			app.BundlesKeeper,
 		),
 	)
 
-	if upgradeInfo.Name == v1_6.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		return nil, err
+	}
+
+	if upgradeInfo.Name == v2_0.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		// configure store loader that checks if version == upgradeHeight and applies store upgrades
-		app.SetStoreLoader(v1_6.CreateStoreLoader(upgradeInfo.Height))
+		app.SetStoreLoader(v2_0.CreateStoreLoader(upgradeInfo.Height))
 	}
 
 	if err := app.Load(loadLatest); err != nil {