Fix merge conflicts

.changelog/config.toml

@@ -0,0 +1,21 @@
+project_url = "https://github.com/cosmos/interchain-security"
+
+# Settings related to components/sub-modules. Only relevant if you make use of
+# components/sub-modules.
+[components]
+
+# The title to use for the section of entries not relating to a specific
+# component.
+general_entries_title = "General"
+
+# The number of spaces to inject before each component-related entry.
+entry_indent = 2
+
+    # The components themselves. Each component has a name (used when rendered
+    # to Markdown) and a path relative to the project folder (i.e. relative to
+    # the parent of the `.changelog` folder).
+    [components.all]
+    provider = { name = "Provider", path = "x/ccv/provider" }
+    consumer = { name = "Consumer", path = "x/ccv/consumer" }
+    tests = { name = "Tests", path = "tests" }
+    docs = { name = "Documentation", path = "docs/docs" }

.changelog/unreleased/api-breaking/provider/1340-add-cryptographic-verification-of-equivocation-feature.md

@@ -0,0 +1,2 @@
+- Deprecate equivocation proposals.  
+([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.changelog/unreleased/bug-fixes/consumer/1146-pending-packets.md

@@ -0,0 +1,2 @@
+- Fix deletion of pending packets that may cause duplicate sends 
+  ([\#1146](https://github.com/cosmos/interchain-security/pull/1146))

.changelog/unreleased/bug-fixes/consumer/1150-revert-wire-breaking.md

@@ -0,0 +1,2 @@
+- Remove `idx` field from the `ccv.ConsumerPacketData` type as this would break the
+  wire ([\#1150](https://github.com/cosmos/interchain-security/pull/1150))

.changelog/unreleased/bug-fixes/consumer/1244-validate-transfer.md

@@ -0,0 +1,2 @@
+- Validate token transfer messages before calling `Transfer()`.
+  ([\#1244](https://github.com/cosmos/interchain-security/pull/1244))

.changelog/unreleased/bug-fixes/consumer/1262-fee-pool-addr.md

@@ -0,0 +1,2 @@
+- Remove incorrect address validation on `ProviderFeePoolAddrStr` param.
+  ([\#1262](https://github.com/cosmos/interchain-security/pull/1262))

.changelog/unreleased/bug-fixes/consumer/1295-migration.md

@@ -0,0 +1,2 @@
+- Increment consumer consensus version and register consumer migration.
+  ([\#1295](https://github.com/cosmos/interchain-security/pull/1295))

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

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

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

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

.changelog/unreleased/dependencies/1258-bump-sdk.md

@@ -0,0 +1,3 @@
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+  [v0.47.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.4).
+  ([\#1258](https://github.com/cosmos/interchain-security/pull/1258))

.changelog/unreleased/dependencies/1259-bump-sdk.md

@@ -0,0 +1,3 @@
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+  [v0.47.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5).
+  ([\#1259](https://github.com/cosmos/interchain-security/pull/1259))

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

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

.changelog/unreleased/features/1336-quint-model.md

@@ -0,0 +1,2 @@
+- Add Quint model of Replicated Security.
+  ([\#1336](https://github.com/cosmos/interchain-security/pull/1336))

.changelog/unreleased/features/consumer/1024-jail-throttling-v2.md

@@ -0,0 +1,2 @@
+- Add the consumer-side changes for jail throttling with retries (cf. ADR 008).
+  ([\#1024](https://github.com/cosmos/interchain-security/pull/1024))

.changelog/unreleased/features/consumer/1164-provider-info-query.md

@@ -0,0 +1,4 @@
+- Introduce the gRPC query `/interchain_security/ccv/consumer/provider-
+  info` and CLI command `interchain-security-cd q ccvconsumer
+  provider-info` to retrieve provider info from the consumer chain.
+  ([\#1164](https://github.com/cosmos/interchain-security/pull/1164))

.changelog/unreleased/features/provider/1076-export-timestamps.md

@@ -0,0 +1,2 @@
+- Add `InitTimeoutTimestamps` and `ExportedVscSendTimestamps` to exported
+  genesis. ([\#1076](https://github.com/cosmos/interchain-security/pull/1076))

.changelog/unreleased/features/provider/1321-jail-throttling-v2.md

@@ -0,0 +1,2 @@
+- Add the provider-side changes for jail throttling with retries (cf. ADR 008).
+  ([\#1321](https://github.com/cosmos/interchain-security/pull/1321))

.changelog/unreleased/features/provider/1339-check-key-assignment-in-use.md

@@ -0,0 +1,3 @@
+- Update how consumer-assigned keys are checked when a validator is
+  created on the provider. 
+  ([\#1339](https://github.com/cosmos/interchain-security/pull/1339))

.changelog/unreleased/features/provider/1340-cryptographic-equivocation-feature.md

@@ -0,0 +1,4 @@
+- Introduce the cryptographic verification of equivocation feature to the provider
+  (cf. [ADR-005](/docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md)
+  & [ADR-013](/docs/docs/adrs/adr-013-equivocation-slashing.md)).  
+  ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.changelog/unreleased/improvements/1244-consumer-unbonding.md

@@ -0,0 +1,2 @@
+- Update the default consumer unbonding period to 2 weeks.
+  ([\#1244](https://github.com/cosmos/interchain-security/pull/1244))

.changelog/unreleased/improvements/1324-consumer-genesis.md

@@ -0,0 +1,16 @@
+- Split out consumer genesis state to reduce shared data between provider and
+  consumer. ([\#1324](https://github.com/cosmos/interchain-security/pull/1324))
+  - Note: This breaks json format used by augmenting Genesis files of consumer 
+  chains with consumer genesis content exported from provider chain. Consumer 
+  Genesis content exported from a provider chain using major version 1, 2 or 3 
+  of the provider module needs to be transformed with the transformation command 
+  introduced by this PR:
+    ```
+    Transform the consumer genesis file from a provider version v1, v2 or v3 to a version supported by this consumer. Result is printed to STDOUT.
+
+    Example:
+    $ <appd> transform /path/to/ccv_consumer_genesis.json
+
+    Usage:
+      interchain-security-cd genesis transform [genesis-file] [flags]
+    ```

.changelog/unreleased/improvements/1350-cleanup-types.md

@@ -0,0 +1,3 @@
+- Refactor shared events, codecs and errors assign to
+  consumer and provider dedicated types where possible.
+  ([\#1350](https://github.com/cosmos/interchain-security/pull/1350))

.changelog/unreleased/improvements/consumer/1037-optimize-storage.md

@@ -0,0 +1,2 @@
+- Optimize pending packets storage on consumer, with migration.
+  ([\#1037](https://github.com/cosmos/interchain-security/pull/1037))

.changelog/unreleased/state-breaking/1196-bump-ibc.md

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

.changelog/unreleased/state-breaking/1244-consumer-unbonding.md

@@ -0,0 +1,2 @@
+- Update the default consumer unbonding period to 2 weeks.
+  ([\#1244](https://github.com/cosmos/interchain-security/pull/1244))

.changelog/unreleased/state-breaking/1258-bump-ibc.md

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

.changelog/unreleased/state-breaking/1258-bump-sdk.md

@@ -0,0 +1,3 @@
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+  [v0.47.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.4).
+  ([\#1258](https://github.com/cosmos/interchain-security/pull/1258))

.changelog/unreleased/state-breaking/1259-bump-sdk.md

@@ -0,0 +1,3 @@
+- Bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to
+  [v0.47.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.47.5).
+  ([\#1259](https://github.com/cosmos/interchain-security/pull/1259))

.changelog/unreleased/state-breaking/1324-consumer-genesis.md

@@ -0,0 +1,2 @@
+- Split out consumer genesis state to reduce shared data between provider and
+  consumer. ([\#1324](https://github.com/cosmos/interchain-security/pull/1324))

.changelog/unreleased/state-breaking/consumer/1024-jail-throttling-v2.md

@@ -0,0 +1,2 @@
+- Add the consumer-side changes for jail throttling with retries (cf. ADR 008).
+  ([\#1024](https://github.com/cosmos/interchain-security/pull/1024))

.changelog/unreleased/state-breaking/consumer/1037-optimize-storage.md

@@ -0,0 +1,2 @@
+- Optimize pending packets storage on consumer, with migration.
+  ([\#1037](https://github.com/cosmos/interchain-security/pull/1037))

.changelog/unreleased/state-breaking/consumer/1146-pending-packets.md

@@ -0,0 +1,2 @@
+- Fix deletion of pending packets that may cause duplicate sends
+  ([\#1146](https://github.com/cosmos/interchain-security/pull/1146))

.changelog/unreleased/state-breaking/consumer/1150-revert-wire-breaking.md

@@ -0,0 +1,2 @@
+- Remove `idx` field from the `ccv.ConsumerPacketData` type as this would break the
+  wire ([\#1150](https://github.com/cosmos/interchain-security/pull/1150))

.changelog/unreleased/state-breaking/consumer/1244-validate-transfer.md

@@ -0,0 +1,2 @@
+- Validate token transfer messages before calling `Transfer()`.
+  ([\#1244](https://github.com/cosmos/interchain-security/pull/1244))

.changelog/unreleased/state-breaking/consumer/1262-fee-pool-addr.md

@@ -0,0 +1,2 @@
+- Remove incorrect address validation on `ProviderFeePoolAddrStr` param.
+  ([\#1262](https://github.com/cosmos/interchain-security/pull/1262))

.changelog/unreleased/state-breaking/consumer/1295-migration.md

@@ -0,0 +1,2 @@
+- Increment consumer consensus version and register consumer migration.
+  ([\#1295](https://github.com/cosmos/interchain-security/pull/1295))

.changelog/unreleased/state-breaking/provider/1321-jail-throttling-v2.md

@@ -0,0 +1,2 @@
+- Add the provider-side changes for jail throttling with retries (cf. ADR 008).
+  ([\#1321](https://github.com/cosmos/interchain-security/pull/1321))

.changelog/unreleased/state-breaking/provider/1339-check-key-assignment-in-use.md

@@ -0,0 +1,3 @@
+- Change the states by adding a consumer key for each chain that is
+  not yet registered meaning for which the gov proposal has not passed.
+  ([\#1339](https://github.com/cosmos/interchain-security/pull/1339))

.changelog/unreleased/state-breaking/provider/1340-cryptographic-equivocation-feature.md

@@ -0,0 +1,4 @@
+- Introduce the cryptographic verification of equivocation feature to the provider
+  (cf. [ADR-005](/docs/docs/adrs/adr-005-cryptographic-equivocation-verification.md)
+  & [ADR-013](/docs/docs/adrs/adr-013-equivocation-slashing.md)).  
+  ([\#1340](https://github.com/cosmos/interchain-security/pull/1340))

.github/PULL_REQUEST_TEMPLATE/production.md

@@ -30,7 +30,7 @@ I have...
 * [ ] Updated the relevant documentation or specification
 * [ ] Reviewed "Files changed" and left comments if necessary <!-- relevant if the changes are not obvious  -->
 * [ ] Confirmed all CI checks have passed
-* [ ] If this PR is library API breaking, bump the go.mod version string of the repo, and follow through on a new major release for both the consumer and provider
+* [ ] If this PR is library API breaking, bump the go.mod version string of the repo, and follow through on a new major release
 
 ### Reviewers Checklist
 

.github/dependabot.yml

@@ -72,7 +72,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v3.2.x-consumer"
+    target-branch: "release/v3.2.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:

.github/workflows/deploy-docs.yml

@@ -29,7 +29,7 @@ jobs:
           path: "."
 
       - name: Setup Node.js 🔧
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "16.x"
 

.github/workflows/gosec.yml

@@ -9,7 +9,7 @@ on:
       - main
       - feat/*
 jobs:
-  tests:
+  Gosec:
     runs-on: ubuntu-latest
     env:
       GO111MODULE: on

.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.27.0
+      - uses: bufbuild/buf-setup-action@v1.28.1
       - 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.27.0
+      - uses: bufbuild/buf-setup-action@v1.28.1
       - uses: bufbuild/buf-breaking-action@v1
         with:
           input: "proto"