refactor for SDK v47 and merge with main branch

.dockerignore

@@ -0,0 +1,9 @@
+.git/
+Dockerfile
+*.md
+.gitignore
+.gitattributes
+scripts/
+.vscode/
+.github/
+proto/

.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,51 +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
-* [ ] 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
+* [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,49 @@
+<!--
+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 state-machine breaking change (i.e., requires coordinated upgrade)
+* [ ] 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
+* [ ] 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
+
+### 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

@@ -16,4 +16,64 @@ updates:
     target-branch: "main"
     open-pull-requests-limit: 10
     labels:
-      - dependencies
+      - 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
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v2.0.x-lsm"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v2.1.x-provider-lsm"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v3.0.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v3.1.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v3.2.x-consumer"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies

.github/pr_labeler.yml

@@ -0,0 +1,29 @@
+"C:x/consumer":
+  - x/ccv/consumer/**/*
+"C:x/democracy":
+  - x/ccv/democracy/**/*
+"C:x/provider":
+  - x/ccv/provider/**/*
+"C:x/types":
+  - x/ccv/types/**/*
+"C:Docs":
+  - docs/docs/**/*
+"C:ADR":
+  - docs/docs/adrs/**/*
+"C:CI":
+  - .github/**/*.yml
+  - buf.work.yaml
+  - .mergify.yml
+  - .golangci.yml
+  - mlc_config.json
+  - sonar-project.properties
+"C:Build":
+  - Makefile
+  - Dockerfile
+  - scripts/*
+"C:Testing":
+  - app/**/*
+  - cmd/**/*
+  - legacy_ibc_testing/**/*
+  - tests/**/*
+  - testutil/**/*

.github/workflows/automated-tests.yml

@@ -15,18 +15,44 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Checkout LFS objects
         run: git lfs checkout
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.19" # The Go version to download (if necessary) and use.
+          go-version: "1.20" # 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 ./...
+  E2E_Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
       - name: E2E tests
         run: make test-e2e-short
+  Cometmock_Tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Checkout LFS objects
+        run: git lfs checkout
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.20"
+      - name: E2E tests
+        run: make test-e2e-short-cometmock

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
           lfs: true
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.19" # The Go version to download (if necessary) and use.
+          go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: Test with coverage
         run: go test -coverpkg=./x/... -coverprofile=coverage.out ./...
       - name: SonarCloud Scan

.github/workflows/codeql.yml

@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/deploy-docs.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -40,7 +40,7 @@ jobs:
           make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/[email protected].2
+        uses: JamesIves/[email protected].3
         with:
           branch: gh-pages
           folder: ~/output

.github/workflows/golangci-lint.yml

@@ -19,13 +19,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
-      - uses: actions/checkout@v3
+          go-version: '1.20'
+      - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.52.2
+          version: v1.54.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir