Resolved conflicts

.changelog/unreleased/api-breaking/provider/2079-inactive-validators.md

@@ -0,0 +1,15 @@
+- Add the _Inactive Provider Validators_ feature (as per 
+  [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)),
+  which entails the following changes on the provider.
+  ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))
+
+  - Add `max_provider_consensus_validators`, a provider module param that sets 
+    the maximum number of validators that will be passed to the provider consensus engine.
+  - Add `no_valupdates_genutil` and `no_valupdates_staking`, "wrapper" modules around 
+    the Cosmos SDK's native genutil and staking modules. Both modules provide the exact 
+    same functionality as the native modules, except for *not* returning validator set updates 
+    to the provider consensus engine.
+  - Return the first `max_provider_consensus_validators` validators (sorted by largest amount of stake first)
+    to the provider consensus engine. 
+  - Use the `max_validators` validators as basis for the validator sets sent to the consumers 
+    (`max_validators` is a staking module param).

.changelog/unreleased/api-breaking/provider/2098-vscmatured-removal.md

@@ -0,0 +1,7 @@
+- The removal of `VSCMaturedPackets` entail several API breaking changes.
+  ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))
+
+  - Remove the `oldest_unconfirmed_vsc` query -- used to get
+  the send timestamp of the oldest unconfirmed VSCPacket.
+  - Deprecate the `init_timeout_period` and `vsc_timeout_period` parameters 
+  from the provider module. 

.changelog/unreleased/api-breaking/provider/2130-remove-legacy-proposal.md

@@ -0,0 +1,25 @@
+- Remove support for legacy-proposal to add/modify/remove consumer proposals and change reward denoms
+  ([\#2130](https://github.com/cosmos/interchain-security/pull/2130))
+  To submit a proposal to add/modify/remove a consumer use the following command
+  ```shell
+  interchain-security-pd tx gov submit-proposal [proposal-file]
+  ```
+
+  Run `interchain-security-pd tx gov draft-proposal` command and select in `other` one of the following
+  message types to generate a draft proposal json file:
+  - `/interchain_security.ccv.provider.v1.MsgConsumerAddition`
+
+  - `/interchain_security.ccv.provider.v1.MsgConsumerModification`
+
+  - `/interchain_security.ccv.provider.v1.MsgConsumerRemoval`
+
+  - `/interchain_security.ccv.provider.v1.MsgChangeRewardDenoms`
+
+  This replaces the following command which are not supported anymore:
+
+  ```shell
+  interchain-security-pd tx gov submit-legacy-proposal consumer-addition [proposal-file]
+  interchain-security-pd tx gov submit-legacy-proposal consumer-modification [proposal-file]
+  interchain-security-pd tx gov submit-legacy-proposal consumer-removal [proposal-file]
+  interchain-security-pd tx gov submit-legacy-proposal change-reward-denoms [proposal-file]
+  ```

.changelog/unreleased/dependencies/2113-bump-ibc.md

@@ -0,0 +1,3 @@
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.4.0](https://github.com/cosmos/ibc-go/releases/tag/v8.4.0).
+  ([\#2113](https://github.com/cosmos/interchain-security/pull/2113))

.changelog/unreleased/features/provider/2035-min-stake-max-rank.md

@@ -0,0 +1,3 @@
+- Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
+  the minimum amount of provider stake every validator needs to be eligible to opt-in.
+  ([\#2035](https://github.com/cosmos/interchain-security/pull/2035))

.changelog/unreleased/features/provider/2066-allow-inactive-vals.md

@@ -0,0 +1,3 @@
+- Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
+  to specify whether validators outside the active provider validator set are eligible to opt-in. 
+  ([\#2066](https://github.com/cosmos/interchain-security/pull/2066))

.changelog/unreleased/features/provider/2079-inactive-validators.md

@@ -0,0 +1,15 @@
+- Add the _Inactive Provider Validators_ feature (as per 
+  [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)),
+  which entails the following changes on the provider.
+  ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))
+
+  - Add `max_provider_consensus_validators`, a provider module param that sets 
+    the maximum number of validators that will be passed to the provider consensus engine.
+  - Add `no_valupdates_genutil` and `no_valupdates_staking`, "wrapper" modules around 
+    the Cosmos SDK's native genutil and staking modules. Both modules provide the exact 
+    same functionality as the native modules, except for *not* returning validator set updates 
+    to the provider consensus engine.
+  - Return the first `max_provider_consensus_validators` validators (sorted by largest amount of stake first)
+    to the provider consensus engine. 
+  - Use the `max_validators` validators as basis for the validator sets sent to the consumers 
+    (`max_validators` is a staking module param).

.changelog/unreleased/features/provider/2098-vscmatured-removal.md

@@ -0,0 +1,8 @@
+- Remove `VSCMaturedPackets` from the provider module, which entails the following 
+  changes to the provider. 
+  ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))
+
+  - Remove unbonding operations pausing. 
+  - Remove the CCV channel initialization timeout.
+  - Remove `VSCPackets` timeout.
+  - Redesign key assignment pruning -- prune old consumer keys after the unbonding period elapses.

.changelog/unreleased/features/provider/2106-query-blocks-until-next-epoch.md

@@ -0,0 +1,2 @@
+- Add a query to get the blocks until the next epoch begins
+  ([\#2106](https://github.com/cosmos/interchain-security/pull/2106))

.changelog/unreleased/state-breaking/provider/2035-min-stake-max-rank.md

@@ -0,0 +1,3 @@
+- Add `min_stake`, a power shaping configuration parameter that enables consumers to set 
+  the minimum amount of provider stake every validator needs to be eligible to opt-in.
+  ([\#2035](https://github.com/cosmos/interchain-security/pull/2035))

.changelog/unreleased/state-breaking/provider/2066-allow-inactive-vals.md

@@ -0,0 +1,3 @@
+- Add `allow_inactive_vals`, a power shaping configuration parameter that enables consumers 
+  to specify whether validators outside the active provider validator set are eligible to opt-in. 
+  ([\#2066](https://github.com/cosmos/interchain-security/pull/2066))

.changelog/unreleased/state-breaking/provider/2079-inactive-validators.md

@@ -0,0 +1,3 @@
+- Add the _Inactive Provider Validators_ feature (as per 
+  [ADR-017](https://cosmos.github.io/interchain-security/adrs/adr-017-allowing-inactive-validators)).
+  ([\#2079](https://github.com/cosmos/interchain-security/pull/2079))

.changelog/unreleased/state-breaking/provider/2098-vscmatured-removal.md

@@ -0,0 +1,2 @@
+- Remove `VSCMaturedPackets` from the provider module.
+  ([\#2098](https://github.com/cosmos/interchain-security/pull/2098))

.changelog/v5.1.0/api-breaking/1995-deprecate-soft-opt-out.md

@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).

.changelog/v5.1.0/features/1995-deprecate-soft-opt-out.md

@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).

.changelog/v5.1.0/state-breaking/1995-deprecate-soft-opt-out.md

@@ -0,0 +1,2 @@
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).

.changelog/v5.1.0/summary.md

@@ -0,0 +1 @@
+*July 19, 2024*

.changelog/v5.1.1/api-breaking/provider/2095-proto-message-fix.md

@@ -0,0 +1,2 @@
+- Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))

.changelog/v5.1.1/state-breaking/provider/2095-proto-message-fix.md

@@ -0,0 +1,2 @@
+- Fix incorrect message definitions in the proto files of the provider module
+  ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))

.changelog/v5.1.1/summary.md

@@ -0,0 +1 @@
+*July 26, 2024*

.coderabbit.yml

@@ -9,6 +9,7 @@ reviews:
     path_filters:
         - "!api/"
         - "!docs/"
+        - "!*.md"
     path_instructions:
         - path: "**/*.go"
           instructions: "Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations. Only report issues that you have a high degree of confidence in."
@@ -21,14 +22,8 @@ reviews:
         - path: "**/*_test.go"
           instructions: |
               "Assess the unit test code assessing sufficient code coverage for the changes associated in the pull request. Only report issues that you have a high degree of confidence in."
-        - path: "**/*.md"
-          instructions: |
-              "Assess the documentation for misspellings, grammatical errors, missing documentation and correctness. Please DO NOT report any missing or superfluous newlines, in particular at the end or beginning of files. Only report issues that you have a high degree of confidence in."
-        - path: ".changelog/*"
-          instructions: |
-              "Assess the changes in the changelog for correctness and completeness, particularly flagging missing changes. Only report issues that you have a high degree of confidence in."
     auto_review:
-        enabled: true
+        enabled: false
         ignore_title_keywords:
             - "WIP"
             - "DO NOT MERGE"

.github/workflows/docker-publish.yml

@@ -42,15 +42,15 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
+        uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 #v3.6.0
         with:
           cosign-release: 'v2.2.3'
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
 
 
       # Login against a Docker registry except on PR
@@ -80,7 +80,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 #v6.5.0
+        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 #v6.7.0
         with:
           context: .
           file: ./Dockerfile

.github/workflows/gosec.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Run Gosec Security Scanner
         uses: securego/gosec@master
         with:
-          args: -exclude-dir=tests ./... -exclude-generated ./...
+          args: -exclude-dir=tests -exclude-dir=app -exclude-generated ./...

.github/workflows/nightly-e2e.yml

@@ -36,7 +36,7 @@ jobs:
         # Run compatibility tests for different consumer (-cv) and provider (-pv) versions.
         # Combination of all provider versions with consumer versions are tested.
         # For new versions to be tested add/modify -pc/-cv parameters.
-        run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v4.3.0-lsm -pv v3.3.3-lsm -cv latest -cv v4.3.0 -cv v3.3.0
+        run: go run ./tests/e2e/... --tc compatibility -pv latest -pv v4.3.1-lsm -pv v3.3.3-lsm -cv latest -cv v4.4.0 -cv v3.3.0
   happy-path-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
@@ -310,6 +310,23 @@ jobs:
       - name: E2E active set changes
         run: go run ./tests/e2e/... --tc active-set-changes
 
+  inactive-provider-validators-on-consumer-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+      - uses: actions/checkout@v4
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22" # The Go version to download (if necessary) and use.
+      - name: E2E inactive provider validators on consumer
+        run: go run ./tests/e2e/... --tc inactive-provider-validators-on-consumer
+
   nightly-test-fail:
     needs:
       - happy-path-test

.github/workflows/proto-registry.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.34.0
+      - uses: bufbuild/buf-setup-action@v1.38.0
       - uses: bufbuild/buf-push-action@v1
         with:
           input: "proto"

.github/workflows/proto.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.34.0
+      - uses: bufbuild/buf-setup-action@v1.38.0
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"

.github/workflows/simulation.yml

@@ -0,0 +1,69 @@
+name: Simulation
+on:
+  workflow_call:
+  pull_request:
+  merge_group:
+  push:
+    branches:
+      - main
+      - release/v*
+      - feat/*
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.ref }}-tests
+  cancel-in-progress: true
+
+jobs:
+  simulation-full:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+            **/Makefile
+            Makefile
+      - name: full simulation test
+        if: env.GIT_DIFF
+        run: |
+          make sim-full
+  simulation-no-inactive:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+          cache: true
+          cache-dependency-path: go.sum
+      - uses: technote-space/[email protected]
+        id: git_diff
+        with:
+          PATTERNS: |
+            **/*.go
+            go.mod
+            go.sum
+            **/go.mod
+            **/go.sum
+            **/Makefile
+            Makefile
+      - name: simulation test without inactive validators
+        if: env.GIT_DIFF
+        run: |
+          make sim-full-no-inactive-vals

.gitignore

@@ -8,7 +8,9 @@ vendor/
 build/
 .vscode
 .idea
+__debug_*
 
 # docusaurus versioned docs created during build
+docs/versions.json
 docs/versioned_docs
 docs/versioned_sidebars

CHANGELOG.md

@@ -1,5 +1,71 @@
 # CHANGELOG
 
+## v5.1.1
+
+*July 26, 2024*
+
+### API BREAKING
+
+- [Provider](x/ccv/provider)
+  - Fix incorrect message definitions in the proto files of the provider module
+    ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
+
+### STATE BREAKING
+
+- [Provider](x/ccv/provider)
+  - Fix incorrect message definitions in the proto files of the provider module
+    ([\#2095](https://github.com/cosmos/interchain-security/pull/2095))
+
+## v5.1.0
+
+*July 19, 2024*
+
+### API BREAKING
+
+- General
+  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+- [Provider](x/ccv/provider)
+  - Change the UX in key assignment by returning an error if a validator tries to
+    reuse the same consumer key.
+    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+
+### DEPENDENCIES
+
+- Bump [CometBFT](https://github.com/cometbft/cometbft) to
+  [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
+  ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
+- Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+  [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+  ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+[v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
+([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+
+### FEATURES
+
+- Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+  Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+
+### STATE BREAKING
+
+- General
+  - Remove soft opt-out feature. ([\#1995](https://github.com/cosmos/interchain-security/pull/1995))
+    Backporting of ([\#1964](https://github.com/cosmos/interchain-security/pull/1964)).
+  - Bump [CometBFT](https://github.com/cometbft/cometbft) to
+    [v0.38.9](https://github.com/cometbft/cometbft/releases/tag/v0.38.9).
+    ([\#2013](https://github.com/cosmos/interchain-security/pull/2013))
+  - Bump [ibc-go](https://github.com/cosmos/ibc-go) to
+    [v8.3.2](https://github.com/cosmos/ibc-go/releases/tag/v8.3.2).
+    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+  - Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+    [v0.50.8](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.8)
+    ([\#2053](https://github.com/cosmos/interchain-security/pull/2053))
+- [Provider](x/ccv/provider)
+  - Change the UX in key assignment by returning an error if a validator tries to
+    reuse the same consumer key.
+    ([\#1998](https://github.com/cosmos/interchain-security/pull/1998))
+
 ## v5.0.0
 
 *May 9, 2024*