chore: merge latest main into 04-channel-upgrades branch

.github/CODEOWNERS

@@ -13,23 +13,23 @@
 
 # CODEOWNERS for the core IBC module
 
-/modules/core/ @colin-axner @fedekunze @AdityaSripal 
-/proto/ibc/core/ @colin-axner @fedekunze @AdityaSripal 
+/modules/core/ @colin-axner @AdityaSripal 
+/proto/ibc/core/ @colin-axner @AdityaSripal 
 
 ## CODEOWNERS for core/02-client
 
-/modules/core/02-client @seantking @damiannolan
-/proto/ibc/core/client @seantking @damiannolan
+/modules/core/02-client @colin-axner @AdityaSripal @seantking @damiannolan
+/proto/ibc/core/client @colin-axner @AdityaSripal @seantking @damiannolan
 
 # CODEOWNERS for the light-clients
 
-/modules/light-clients/ @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
-/proto/ibc/lightclients/ @colin-axner @fedekunze @AdityaSripal @seantking @damiannolan
+/modules/light-clients/ @colin-axner @AdityaSripal @seantking @damiannolan
+/proto/ibc/lightclients/ @colin-axner @AdityaSripal @seantking @damiannolan
 
 # CODEOWNERS for ICS 20
 
-/modules/apps/transfer/ @colin-axner @fedekunze @AdityaSripal 
-/proto/ibc/applications/transfer/ @colin-axner @fedekunze @AdityaSripal 
+/modules/apps/transfer/ @colin-axner @AdityaSripal 
+/proto/ibc/applications/transfer/ @colin-axner @AdityaSripal 
 
 # CODEOWNERS for interchain-accounts module
 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -20,6 +20,10 @@ through the appropriate channels won't receive any bounty.
 
 <!-- Concisely describe the issue -->
 
+## Expected Behaviour
+
+<!-- What is the expected behaviour? -->
+
 ## Version
 
 <!-- git commit hash or release version -->

.github/ISSUE_TEMPLATE/epic-tracker.md

@@ -0,0 +1,64 @@
+---
+name: Epic Tracker
+about: Create an issue to track feature epic progress
+
+---
+
+<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
+v                            ✰  Thanks for opening an issue! ✰    
+v    Before smashing the submit button please review the template.
+v    Word of caution: poorly thought-out proposals may be rejected 
+v                     without deliberation 
+☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
+
+## Requirements document
+
+<!-- Link to requirements document -->
+
+## IBC spec
+
+<!-- Link to specification -->
+
+## ADRs
+
+<!-- Links to ADRs related to this epic -->
+
+## Milestones
+
+<!-- Links to alpha, beta, RC milestones -->
+
+## Implementation issues
+
+<!-- Links to specific issues, thematically/logically grouped -->
+
+## QA scenarios
+
+<!-- Lists of manual QA tests that need be performed -->
+
+## Automated e2e tests
+
+<!-- List of automated e2e tests that need be added to CI -->
+
+## Pre-releases
+
+<!-- Links to alpha, beta, RC tags/releases -->
+
+## Checklist
+
+<!-- Remove any items that are not applicable. -->
+
+- [ ] Internal audit(s)
+- [ ] External audit(s)
+- [ ] Documentation
+- [ ] Swagger
+- [ ] Integration with relayers:
+  - [ ] Hermes
+  - [ ] Rly
+
+____
+
+#### For Admin Use
+
+- [ ] Not duplicate issue
+- [ ] Appropriate labels applied
+- [ ] Appropriate contributors tagged/assigned

.github/ISSUE_TEMPLATE/release-tracker.md

@@ -0,0 +1,66 @@
+---
+name: Release tracker
+about: Create an issue to track release progress
+
+---
+
+<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
+v                            ✰  Thanks for opening an issue! ✰    
+v    Before smashing the submit button please review the template.
+v    Word of caution: poorly thought-out proposals may be rejected 
+v                     without deliberation 
+☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
+
+## Milestones
+
+<!-- Links to alpha, beta, RC or final milestones -->
+
+### IBC spec compatibility
+
+<!-- Version of the IBC spec that this release is compatible with -->
+
+### QA
+
+#### Backwards compatibility
+
+<!-- List of tests that need be performed with previous
+versions of ibc-go to guarantee that no regression is introduced -->
+
+- [ ] Fungible token transfers over a non-incentivised channel works with a counterparty chain running each previous major version.
+- [ ] Fungible token transfers over an incentivised channel works with a counterparty chain running each previous major version that supports ICS-29 Fee Middleware.
+- [ ] Interchain Accounts over a non-incentivised channel works with a counterparty chain running each previous major version that supports ICS-27 Interchain Accounts over non-incentivised channels.
+- [ ] Interchain Accounts over an incentivised channel works with a counterparty chain running each previous major version that supports ICS-27 Interchain Accounts over incentivised channels.
+
+### Migration 
+
+<!-- Link to migration document -->
+
+## Checklist
+
+<!-- Remove any items that are not applicable. -->
+
+- [ ] Bump [go package version](https://github.com/cosmos/ibc-go/blob/main/go.mod#L3).
+- [ ] Change all imports starting with `github.com/cosmos/ibc-go/v{x}` to `github.com/cosmos/ibc-go/v{x+1}`.
+- [ ] Branch off main to create release branch in the form  of `release/vx.y.z`.
+- [ ] Add branch protection rules to new release branch.
+- [ ] Add backport task to [`mergify.yml`](https://github.com/cosmos/ibc-go/blob/main/.github/mergify.yml)
+- [ ] Upgrade ibc-go version in [ibctest](https://github.com/strangelove-ventures/ibctest).
+- [ ] Check Swagger is up-to-date.
+
+## Post-release checklist
+
+- [ ] Update [`CHANGELOG.md`](https://github.com/cosmos/ibc-go/blob/main/CHANGELOG.md)
+- [ ] Update the table of supported release lines (and End of Life dates) in [`RELEASES.md`](https://github.com/cosmos/ibc-go/blob/main/RELEASES.md).
+- [ ] Update [version matrix](https://github.com/cosmos/ibc-go/blob/main/RELEASES.md#version-matrix) in `RELEASES.md`.
+- [ ] Update docs site:
+  - [ ] Add new release branch to [`docs/versions`](https://github.com/cosmos/ibc-go/blob/main/docs/versions) file.
+  - [ ] Add `label` and `key` to `versions` array in [`config.js`](https://github.com/cosmos/ibc-go/blob/main/docs/.vuepress/config.js#L33).
+- [ ] After changes to docs site are deployed, check [ibc.cosmos.network](https://ibc.cosmos.network) is updated.
+
+____
+
+#### For Admin Use
+
+- [ ] Not duplicate issue
+- [ ] Appropriate labels applied
+- [ ] Appropriate contributors tagged/assigned

.github/mergify.yml

@@ -18,67 +18,67 @@ pull_request_rules:
         commit_message_template: |
            {{ title }} (#{{ number }})
            {{ body }}
-  - name: backport patches to v1.3.x branch
+  - name: backport patches to v2.1.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.3.x
+      - label=backport-to-v2.1.x
     actions:
       backport:
         branches:
-          - release/v1.3.x
-  - name: backport patches to v1.4.x branch
+          - release/v2.1.x
+  - name: backport patches to v2.2.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.4.x
+      - label=backport-to-v2.2.x
     actions:
       backport:
         branches:
-          - release/v1.4.x     
-  - name: backport patches to v1.5.x branch
+          - release/v2.2.x
+  - name: backport patches to v2.3.x branch
     conditions:
       - base=main
-      - label=backport-to-v1.5.x
+      - label=backport-to-v2.3.x
     actions:
       backport:
         branches:
-          - release/v1.5.x
-  - name: backport patches to v2.1.x branch
+          - release/v2.3.x
+  - name: backport patches to v2.4.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.1.x
+      - label=backport-to-v2.4.x
     actions:
       backport:
         branches:
-          - release/v2.1.x
-  - name: backport patches to v2.2.x branch
+          - release/v2.4.x
+  - name: backport patches to v3.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.2.x
+      - label=backport-to-v3.0.x
     actions:
       backport:
         branches:
-          - release/v2.2.x
-  - name: backport patches to v2.3.x branch
+          - release/v3.0.x
+  - name: backport patches to v3.1.x branch
     conditions:
       - base=main
-      - label=backport-to-v2.3.x
+      - label=backport-to-v3.1.x
     actions:
       backport:
         branches:
-          - release/v2.3.x           
-  - name: backport patches to v3.0.x branch
+          - release/v3.1.x
+  - name: backport patches to v3.2.x branch
     conditions:
       - base=main
-      - label=backport-to-v3.0.x
+      - label=backport-to-v3.2.x
     actions:
       backport:
         branches:
-          - release/v3.0.x
-  - name: backport patches to v3.1.x branch
+          - release/v3.2.x
+  - name: backport patches to v4.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v3.1.x
+      - label=backport-to-v4.0.x
     actions:
       backport:
         branches:
-          - release/v3.1.x        
+          - release/v4.0.x  

.github/scripts/go-imports.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+formatted_files="$(docker run -v "$(pwd)":/ibc-go --rm -w "/ibc-go" --entrypoint="" cytopia/goimports goimports -l -local 'github.com/cosmos/ibc-go' /ibc-go)"
+
+exit_code=0
+for f in $formatted_files
+do
+  # we don't care about formatting in pb.go files.
+  if [ "${f: -5}" == "pb.go" ]; then
+    continue
+  fi
+  exit_code=1
+  echo "formatted file ${f}..."
+done
+
+if [ "${exit_code}" == 1 ]; then
+    echo "not all files were correctly formated, run the following:"
+    echo "make goimports"
+fi
+
+exit $exit_code

.github/workflows/codeql-analysis.yml

@@ -56,9 +56,25 @@ jobs:
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
+        queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
       if: env.GIT_DIFF
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
 
-    - run: make build
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+      if: env.GIT_DIFF
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/e2e-fork.yml

@@ -0,0 +1,50 @@
+name: Tests / E2E Fork
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - docs/**
+
+jobs:
+  # dynamically build a matrix of test/test suite pairs to run
+  build-test-matrix:
+    if: ${{ github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - id: set-matrix
+        run: echo "::set-output name=matrix::$(go run cmd/build_test_matrix/main.go)"
+
+  e2e:
+    env:
+      SIMD_TAG: latest
+      SIMD_IMAGE: ibc-go-simd-e2e
+    if: ${{ github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch' }}
+    needs:
+      - build-test-matrix
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.build-test-matrix.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Docker Build
+        run: docker build . -t "${SIMD_IMAGE}:${SIMD_TAG}"
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - name: Run e2e Test
+        env:
+          # see images here https://github.com/cosmos/relayer/pkgs/container/relayer/versions
+          RLY_TAG: "v2.0.0-rc2"
+        run: |
+          cd e2e
+          make e2e-test suite=${{ matrix.suite }} test=${{ matrix.test }}