refactor: merge main into feature branch with fixes

.github/ISSUE_TEMPLATE/epic-template.md

@@ -4,20 +4,20 @@ about: Basic template for EPICs (used by the team)
 labels: epic, needs-triage
 ---
 
-# Problem
+## Problem
 
 <!-- Please write a concise 1-3 line problem. -->
 
-# Closing criteria
+## Closing criteria
 
 <!-- Please write a satisfiable criteria for closing this issue. -->
 
 
-# Problem details
+## Problem details
 
 <!-- Please describe the problem in all detail. -->
 
-# Task list
+## Task list
 
 ```[tasklist]
 ### Must have

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: Create a proposal to request a feature
-labels: enhancement, needs-triage
+labels: enhancement, epic, needs-triage
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
@@ -26,6 +26,20 @@ Are there any disadvantages of including this feature? -->
 
 <!-- Detailed description of requirements of implementation -->
 
+## Task list
+
+```[tasklist]
+### Must have
+- [ ] discuss proposal (if proposal rejected, close EPIC)
+- [ ] create ADR (if ADR rejected, close EPIC)
+- [ ] add sub-tasks needed to implement the proposed feature
+```
+
+```[tasklist]
+### Nice to have
+- [ ] add sub-tasks that are nice to have for the proposed feature
+```
+
 ____
 
 #### For Admin Use

.github/ISSUE_TEMPLATE/issue-template.md

@@ -10,15 +10,15 @@ v    Before smashing the submit button please review the template.
 v    Please also ensure that this is not a duplicate issue :)  
 ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
 
-# Problem
+## Problem
 
 <!-- Please write a concise 1-3 line problem. -->
 
-# Closing criteria
+## Closing criteria
 
 <!-- Please write a satisfiable criteria for closing this issue. -->
 
 
-# Problem details
+## Problem details
 
 <!-- Please describe the problem in all detail. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,49 +1,5 @@
-<!--
-The default pull request template is for types feat, fix, or refactor.
-For other templates, add one of the following parameters to the url:
-- template=docs.md
-- template=other.md
--->
+Please go the the `Preview` tab and select the appropriate sub-template:
 
-## Description
-
-Closes: #XXXX
-
-<!-- Add a description of the changes that this PR introduces and the files that
-are the most critical to review. -->
-
----
-
-### Author Checklist
-
-*All items are required. Please add a note to the item if the item is not applicable and
-please add links to any relevant follow up issues.*
-
-I have...
-
-* [ ] Included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
-* [ ] Added `!` to the type prefix if API or client breaking change
-* [ ] Targeted the correct branch (see [PR Targeting](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#pr-targeting))
-* [ ] Provided a link to the relevant issue or specification
-* [ ] Followed the guidelines for [building SDK modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules)
-* [ ] Included the necessary unit and integration [tests](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#testing)
-* [ ] Added a changelog entry to `CHANGELOG.md`
-* [ ] Included comments for [documenting Go code](https://blog.golang.org/godoc)
-* [ ] 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
-
-### Reviewers Checklist
-
-*All items are required. Please add a note if the item is not applicable and please add
-your handle next to the items reviewed if you only reviewed selected items.*
-
-I have...
-
-* [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
-* [ ] confirmed `!` in the type prefix if API or client breaking change
-* [ ] confirmed all author checklist items have been addressed 
-* [ ] reviewed state machine logic
-* [ ] reviewed API design and naming
-* [ ] reviewed documentation is accurate
-* [ ] reviewed tests and test coverage
+* [Production code](?expand=1&template=production.md) - for types `fix`, `feat`, and `refactor`.
+* [Docs](?expand=1&template=docs.md) - for documentation changes.
+* [Others](?expand=1&template=others.md) - for changes that do not affect production code.

.github/PULL_REQUEST_TEMPLATE/production.md

@@ -0,0 +1,48 @@
+<!--
+The production pull request template is for types feat, fix, or refactor.
+-->
+
+## Description
+
+Closes: #XXXX
+
+<!-- Add a description of the changes that this PR introduces and the files that
+are the most critical to review. -->
+
+---
+
+### Author Checklist
+
+*All items are required. Please add a note to the item if the item is not applicable and
+please add links to any relevant follow up issues.*
+
+I have...
+
+* [ ] Included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
+* [ ] Added `!` to the type prefix if API or client breaking change
+* [ ] Confirmed this PR does not introduce changes requiring state migrations, OR migration code has been added to consumer and/or provider modules
+* [ ] Targeted the correct branch (see [PR Targeting](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#pr-targeting))
+* [ ] Provided a link to the relevant issue or specification
+* [ ] Followed the guidelines for [building SDK modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules)
+* [ ] Included the necessary unit and integration [tests](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#testing)
+* [ ] Added a changelog entry to `CHANGELOG.md`
+* [ ] Included comments for [documenting Go code](https://blog.golang.org/godoc)
+* [ ] 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
+
+### Reviewers Checklist
+
+*All items are required. Please add a note if the item is not applicable and please add
+your handle next to the items reviewed if you only reviewed selected items.*
+
+I have...
+
+* [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
+* [ ] confirmed `!` in the type prefix if API or client breaking change
+* [ ] confirmed this PR does not introduce changes requiring state migrations, OR confirmed migration code has been added to consumer and/or provider modules
+* [ ] confirmed all author checklist items have been addressed
+* [ ] reviewed state machine logic
+* [ ] reviewed API design and naming
+* [ ] reviewed documentation is accurate
+* [ ] reviewed tests and test coverage

.github/dependabot.yml

@@ -15,5 +15,15 @@ updates:
       interval: weekly
     target-branch: "main"
     open-pull-requests-limit: 10
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v2.0.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
     labels:
       - dependencies

.github/workflows/automated-tests.yml

@@ -24,9 +24,9 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: "1.19" # The Go version to download (if necessary) and use.
-
+      # - name: Proto Check
+      #   run: make proto-check
       - name: Unit, integration and difference tests
         run: go test ./...
-
       - name: E2E tests
         run: make test-e2e-short

.github/workflows/build.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - feat/*
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

.github/workflows/codeql.yml

@@ -2,13 +2,18 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - feat/*
+
     paths-ignore:
-      - 'legacy_ibc_testing'
+      - "legacy_ibc_testing"
   pull_request:
-    branches: [main]
+    branches:
+      - main
+      - feat/*
     paths-ignore:
-      - 'legacy_ibc_testing'
+      - "legacy_ibc_testing"
   schedule:
     #        ┌───────────── minute (0 - 59)
     #        │  ┌───────────── hour (0 - 23)
@@ -62,4 +67,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/deploy-docs.yml

@@ -1,4 +1,3 @@
-
 name: Deploy docs
 # This job builds and deploys documenation to github pages.
 # It runs on every push to main with a change in the docs folder.
@@ -41,7 +40,7 @@ jobs:
           make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.2
         with:
           branch: gh-pages
           folder: ~/output

.github/workflows/golangci-lint.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - master
       - main
+      - feat/*
   pull_request:
 permissions:
   contents: read

.github/workflows/gosec.yml

@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - feat/*
   pull_request:
     branches:
       - main
+      - feat/*
 jobs:
   tests:
     runs-on: ubuntu-latest

.github/workflows/nightly-e2e.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify Slack on failure
-        uses: slackapi/slack-github-action@v1.23.0
+        uses: slackapi/slack-github-action@v1.24.0
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

.markdownlint.json

@@ -0,0 +1,4 @@
+{
+    "MD036": false,
+    "MD013": false
+}

.mergify.yml

@@ -0,0 +1,20 @@
+defaults:
+  actions:
+    backport:
+      assignees:
+        - "{{ author }}"
+
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>1"
+
+pull_request_rules:
+  - name: Backport patches to the release/v2.0.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v2.0.x
+    actions:
+      backport:
+        branches:
+          - release/v2.0.x