Merge branch 'main' into marko/15463

cosmos · Apr 13, 2023 · 66fe01f · 66fe01f
2 parents 68a6890 + c3fd0e7
commit 66fe01f
Show file tree

Hide file tree

Showing 167 changed files with 2,766 additions and 2,119 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+      time: "01:00"
 
   - package-ecosystem: npm
     directory: "/docs"
@@ -20,13 +21,15 @@ updates:
     directory: "/"
     schedule:
       interval: daily
+      time: "01:05"
     labels:
       - "A:automerge"
       - dependencies
   - package-ecosystem: gomod
     directory: "/simapp"
     schedule:
       interval: daily
+      time: "01:10"
     labels:
       - "A:automerge"
       - dependencies
@@ -35,6 +38,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
+      time: "01:15"
     labels:
       - "A:automerge"
       - dependencies
@@ -43,6 +47,7 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+      time: "01:20"
     labels:
       - "A:automerge"
       - dependencies
@@ -51,6 +56,7 @@ updates:
     schedule:
       interval: weekly
       day: wednesday
+      time: "01:25"
     labels:
       - "A:automerge"
       - dependencies
@@ -59,6 +65,7 @@ updates:
     schedule:
       interval: weekly
       day: thursday
+      time: "01:30"
     labels:
       - "A:automerge"
       - dependencies
@@ -67,6 +74,7 @@ updates:
     schedule:
       interval: weekly
       day: friday
+      time: "01:35"
     labels:
       - "A:automerge"
       - dependencies
@@ -75,6 +83,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
+      time: "01:40"
     labels:
       - "A:automerge"
       - dependencies
@@ -83,6 +92,7 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+      time: "01:45"
     labels:
       - "A:automerge"
       - dependencies
@@ -91,6 +101,7 @@ updates:
     schedule:
       interval: weekly
       day: wednesday
+      time: "01:50"
     labels:
       - "A:automerge"
       - dependencies
@@ -99,6 +110,7 @@ updates:
     schedule:
       interval: weekly
       day: thursday
+      time: "01:55"
     labels:
       - "A:automerge"
       - dependencies
@@ -107,6 +119,7 @@ updates:
     schedule:
       interval: weekly
       day: friday
+      time: "02:00"
     labels:
       - "A:automerge"
       - dependencies
@@ -115,6 +128,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
+      time: "02:05"
     labels:
       - "A:automerge"
       - dependencies
@@ -123,6 +137,7 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+      time: "02:10"
     labels:
       - "A:automerge"
       - dependencies
@@ -131,6 +146,7 @@ updates:
     schedule:
       interval: weekly
       day: thursday
+      time: "02:15"
     labels:
       - "A:automerge"
       - dependencies
@@ -139,6 +155,7 @@ updates:
     schedule:
       interval: weekly
       day: friday
+      time: "02:20"
     labels:
       - "A:automerge"
       - dependencies
@@ -147,6 +164,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
+      time: "02:25"
     labels:
       - "A:automerge"
       - dependencies
@@ -155,6 +173,7 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+      time: "02:30"
     labels:
       - "A:automerge"
       - dependencies
@@ -163,6 +182,7 @@ updates:
     schedule:
       interval: weekly
       day: wednesday
+      time: "02:35"
     labels:
       - "A:automerge"
       - dependencies
@@ -172,6 +192,7 @@ updates:
     schedule:
       interval: weekly
       day: thursday
+      time: "02:40"
     labels:
       - "A:automerge"
       - dependencies
@@ -180,6 +201,7 @@ updates:
     schedule:
       interval: weekly
       day: friday
+      time: "02:45"
     labels:
       - "A:automerge"
       - dependencies
@@ -188,6 +210,7 @@ updates:
     schedule:
       interval: weekly
       day: monday
+      time: "02:50"
     labels:
       - "A:automerge"
       - dependencies
@@ -196,6 +219,7 @@ updates:
     schedule:
       interval: weekly
       day: tuesday
+      time: "02:55"
     labels:
       - "A:automerge"
       - dependencies
@@ -206,6 +230,7 @@ updates:
     target-branch: "release/v0.47.x"
     schedule:
       interval: daily
+      time: "03:00"
     labels:
       - "A:automerge"
       - dependencies

diff --git a/.github/workflows/dependencies-review.yml b/.github/workflows/dependencies-review.yml
@@ -8,11 +8,11 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
+      - name: "Checkout Repository"
+        uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: 1.20.3
-      - name: "Checkout Repository"
-        uses: actions/checkout@v3
       - name: "Dependency Review"
         uses: actions/dependency-review-action@v3
       - name: "Dependency audit"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,8 +14,8 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: 1.20.3
-      - uses: actions/checkout@v3
       - run: make lint
diff --git a/.github/workflows/sims-045.yml b/.github/workflows/sims-045.yml
@@ -113,7 +113,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.45.x
           SLACK_ICON_EMOJI: ":white_check_mark:"
           SLACK_COLOR: good
@@ -132,7 +132,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.45.x
           SLACK_ICON_EMOJI: ":skull:"
           SLACK_COLOR: danger

diff --git a/.github/workflows/sims-046.yml b/.github/workflows/sims-046.yml
@@ -113,7 +113,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.46.x
           SLACK_ICON_EMOJI: ":white_check_mark:"
           SLACK_COLOR: good
@@ -132,7 +132,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.46.x
           SLACK_ICON_EMOJI: ":skull:"
           SLACK_COLOR: danger

diff --git a/.github/workflows/sims-047.yml b/.github/workflows/sims-047.yml
@@ -113,7 +113,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.47.x
           SLACK_ICON_EMOJI: ":white_check_mark:"
           SLACK_COLOR: good
@@ -132,7 +132,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests release/0.47.x
           SLACK_ICON_EMOJI: ":skull:"
           SLACK_COLOR: danger

diff --git a/.github/workflows/sims-nightly.yml b/.github/workflows/sims-nightly.yml
@@ -63,7 +63,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests
           SLACK_ICON_EMOJI: ":white_check_mark:"
           SLACK_COLOR: good
@@ -81,7 +81,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests
           SLACK_ICON_EMOJI: ":skull:"
           SLACK_COLOR: danger

diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -99,7 +99,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests
           SLACK_ICON_EMOJI: ":white_check_mark:"
           SLACK_COLOR: good
@@ -118,7 +118,7 @@ jobs:
         uses: rtCamp/action-slack-notify@v2.2.0
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: cosmos-sdk-sims
+          SLACK_CHANNEL: sdk-sims
           SLACK_USERNAME: Sim Tests
           SLACK_ICON_EMOJI: ":skull:"
           SLACK_COLOR: danger

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -99,12 +99,14 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### State Machine Breaking
 
+* (x/staking) [#15701](https://github.com/cosmos/cosmos-sdk/pull/15701) The `HistoricalInfoKey` has been updated to use a binary format.
 * (x/slashing) [#15580](https://github.com/cosmos/cosmos-sdk/pull/15580) The validator slashing window now stores "chunked" bitmap entries for each validator's signing window instead of a single boolean entry per signing window index.
 * (x/feegrant) [#14294](https://github.com/cosmos/cosmos-sdk/pull/14294) Moved the logic of rejecting duplicate grant from `msg_server` to `keeper` method.
 * (x/staking) [#14590](https://github.com/cosmos/cosmos-sdk/pull/14590) `MsgUndelegateResponse` now includes undelegated amount. `x/staking` module's `keeper.Undelegate` now returns 3 values (completionTime,undelegateAmount,error)  instead of 2.
 
 ### API Breaking Changes
 
+* (x/*all*) [#15648](https://github.com/cosmos/cosmos-sdk/issues/15648) Make `SetParams` consistent across all modules and validate the params at the message handling instead of `SetParams` method.
 * (x/genutil) [#15679](https://github.com/cosmos/cosmos-sdk/pull/15679) `MigrateGenesisCmd` now takes a `MigrationMap` instead of having the SDK genesis migration hardcoded.
 * (client) [#15673](https://github.com/cosmos/cosmos-sdk/pull/15673) Move `client/keys.OutputFormatJSON` and `client/keys.OutputFormatText` to `client/flags` package.
 * (x/nft) [#15588](https://github.com/cosmos/cosmos-sdk/pull/15588) `NewKeeper` now takes a `KVStoreService` instead of a `StoreKey` and methods in the `Keeper` now take a `context.Context` instead of a `sdk.Context`. 
@@ -160,6 +162,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Client Breaking Changes
 
+* (x/staking) [#15701](https://github.com/cosmos/cosmos-sdk/pull/15701) `HistoricalInfoKey` now has a binary format.
 * (grpc-web) [#14652](https://github.com/cosmos/cosmos-sdk/pull/14652) Use same port for gRPC-Web and the API server.
 
 ### CLI Breaking Changes
@@ -173,6 +176,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (baseapp) [#15789](https://github.com/cosmos/cosmos-sdk/pull/15789) Ensure `PrepareProposal` and `ProcessProposal` respect `InitialHeight` set by CometBFT when set to a value greater than 1.
 * (types) [#15691](https://github.com/cosmos/cosmos-sdk/pull/15691) Make Coin.Validate() check that .Amount is not nil
 * (types) [#15433](https://github.com/cosmos/cosmos-sdk/pull/15433) Allow disabling of account address caches (for printing bech32 account addresses).
 * (x/auth) [#15059](https://github.com/cosmos/cosmos-sdk/pull/15059) `ante.CountSubKeys` returns 0 when passing a nil `Pubkey`.

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
 PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
-export VERSION := $(shell echo $(shell git describe --always --match "v*") | sed 's/^v//')
+export VERSION := $(shell echo $(shell git describe --tags --always --match "v*") | sed 's/^v//')
 export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 export COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
@@ -379,12 +379,12 @@ golangci_version=v1.51.2
 lint:
 	@echo "--> Running linter"
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@sh ./scripts/go-lint-all.sh --timeout=15m
+	@./scripts/go-lint-all.bash --timeout=15m
 
 lint-fix:
 	@echo "--> Running linter"
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
-	@sh ./scripts/go-lint-all.sh --fix
+	@./scripts/go-lint-all.bash --fix
 
 .PHONY: lint lint-fix