Merge branch 'main' into bznein/transferEnvironment

cosmos · Dec 18, 2024 · a919b87 · a919b87
2 parents 846575a + 4baaa27
commit a919b87
Show file tree

Hide file tree

Showing 216 changed files with 4,710 additions and 4,130 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,8 +1,8 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
-*       @AdityaSripal @damiannolan @chatton @DimitrisJim @gjermundgaraba @bznein
+*       @AdityaSripal @damiannolan @DimitrisJim @gjermundgaraba
 
-# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner 
+# Our appreciation and gratitude to past code owners: @fedekunze @seantking @tmsdkeys @charleenfei @crodriguezvega @colin-axner @chatton @bznein
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only
@@ -11,42 +11,42 @@
 
 # CODEOWNERS for the CODEOWNER file
 
-/.github/CODEOWNERS @AdityaSripal @damiannolan @chatton
+/.github/CODEOWNERS @AdityaSripal @damiannolan
 
 # CODEOWNERS for the core IBC module
 
-/modules/core/ @AdityaSripal @damiannolan @chatton
-/proto/ibc/core/ @AdityaSripal @damiannolan @chatton
+/modules/core/ @AdityaSripal @damiannolan
+/proto/ibc/core/ @AdityaSripal @damiannolan
 
 # CODEOWNERS for the light-clients
 
-/modules/light-clients/ @AdityaSripal @damiannolan @chatton
-/proto/ibc/lightclients/ @AdityaSripal @damiannolan @chatton
+/modules/light-clients/ @AdityaSripal @damiannolan
+/proto/ibc/lightclients/ @AdityaSripal @damiannolan
 
 # CODEOWNERS for 08-wasm light client module
 
-/modules/light-clients/08-wasm/ @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk
+/modules/light-clients/08-wasm/ @AdityaSripal @damiannolan @DimitrisJim @srdtrk
 
 # CODEOWNERS for ICS 20
 
-/modules/apps/transfer/ @AdityaSripal @damiannolan @chatton @DimitrisJim
-/proto/ibc/applications/transfer/ @AdityaSripal @damiannolan @chatton @DimitrisJim
+/modules/apps/transfer/ @AdityaSripal @damiannolan @DimitrisJim
+/proto/ibc/applications/transfer/ @AdityaSripal @damiannolan @DimitrisJim
 
 # CODEOWNERS for interchain-accounts module
 
-/modules/apps/27-interchain-accounts/ @AdityaSripal @damiannolan @chatton
-/proto/ibc/applications/interchain_accounts/ @AdityaSripal @damiannolan @chatton
+/modules/apps/27-interchain-accounts/ @AdityaSripal @damiannolan
+/proto/ibc/applications/interchain_accounts/ @AdityaSripal @damiannolan
 
 # CODEOWNERS for fee module
 
-/modules/apps/29-fee/ @AdityaSripal @damiannolan @chatton
-/proto/ibc/applications/fee/ @AdityaSripal @damiannolan @chatton
+/modules/apps/29-fee/ @AdityaSripal @damiannolan
+/proto/ibc/applications/fee/ @AdityaSripal @damiannolan
 
 # CODEOWNERS for callbacks middleware
 
-/modules/apps/callbacks/ @AdityaSripal @damiannolan @srdtrk @chatton
+/modules/apps/callbacks/ @AdityaSripal @damiannolan @srdtrk
 
 # CODEOWNERS for docs
 
-/docs/ @AdityaSripal @damiannolan @chatton @DimitrisJim @srdtrk
+/docs/ @AdityaSripal @damiannolan @DimitrisJim @srdtrk
 
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,23 +1,19 @@
 queue_rules:
   - name: default
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - base=main
+      - label=automerge
     commit_message_template: |
       {{ title }} (#{{ number }})
       {{ body }}
     merge_conditions:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
+    merge_method: squash
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
-    conditions:
-      - "#approved-reviews-by>=1"
-      - base=main
-      - label=automerge
-    actions:
-      queue:
-        name: default
-        merge_method: squash
   - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main
@@ -130,3 +126,7 @@ pull_request_rules:
       backport:
         branches:
           - release/v9.0.x
+  - name: automerge to main with label automerge and branch protection passing
+    conditions: []
+    actions:
+      queue:
diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml
@@ -18,7 +18,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: '1.23'
-          cache: false
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -63,7 +62,7 @@ jobs:
     steps:
       - name: sonarcloud
         if: ${{ env.GIT_DIFF && !github.event.pull_request.draft && env.SONAR_TOKEN != null }}
-        uses: SonarSource/sonarcloud-github-action@v3.1.0
+        uses: SonarSource/sonarcloud-github-action@v4.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -27,7 +27,7 @@ jobs:
         run: make build-docs
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.6.9
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
         with:
           branch: gh-pages
           folder: docs/build

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -28,7 +28,7 @@ jobs:
         images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
     - name: Build Docker image
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
       with:
         context: .
         tags: ${{ steps.meta.outputs.tags }}
@@ -46,7 +46,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push Docker image
-      uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
+      uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
       with:
         context: .
         push: true

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -60,10 +60,8 @@ jobs:
           # Note: this is significant as the standard behaviour when running e2es on PRs
           # is that there is a set of env vars that are the same for each run. e.g. the same docker image is used
           # for every test. With compatibility tests, each test may be running different combinations of images.
-          CHAIN_IMAGE: 'ghcr.io/cosmos/ibc-go-simd'
           CHAIN_A_TAG: '${{ matrix.chain-a }}'
           CHAIN_B_TAG: '${{ matrix.chain-b }}'
-          CHAIN_BINARY: 'simd'
           RELAYER_ID: '${{ matrix.relayer-type }}'
       - name: Upload Diagnostics
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
@@ -59,7 +59,6 @@ jobs:
       CHAIN_A_TAG: latest
       CHAIN_B_TAG: latest
       CHAIN_IMAGE: ibc-go-simd
-      RELAYER_ID: "hermes" # by default use hermes for fork e2es.
       FORK: "true"
     # run this job on forks and copies of ibc-go, for example: a public fork or a private copy of ibc-go.
     if: ${{ github.repository != 'cosmos/ibc-go' || github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch' }}

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml
@@ -23,7 +23,7 @@ on:
         default: '' # empty string means don't skip any test.
       chain-image:
         description: 'The image to use for chains'
-        required: true
+        required: false
         type: string
         default: 'ghcr.io/cosmos/ibc-go-simd'
       chain-a-tag:
@@ -36,37 +36,12 @@ on:
         description: 'The tag to use for chain B'
         required: true
         type: string
-      chain-binary:
-        default: 'simd'
-        description: 'The chain binary'
-        required: false
-        type: string
-      chain-upgrade-tag:
-        default: ''
-        description: 'The image tag that the chain will be upgraded to'
-        required: false
-        type: string
       # upgrade-plan-name is only required during upgrade tests, and is otherwise ignored.
       upgrade-plan-name:
         default: ''
         description: 'The upgrade plan name'
         required: false
         type: string
-      relayer-image:
-        description: 'The image to use for the relayer'
-        required: false
-        default: '' # the tests themselves will choose a sensible default when unset.
-        type: string
-      relayer-type:
-        description: 'The type of relayer to use'
-        required: false
-        default: 'hermes'
-        type: string
-      relayer-tag:
-        description: 'The tag to use for the relayer'
-        required: false
-        default: '' # the tests themselves will choose a sensible default when unset.
-        type: string
       build-and-push-docker-image:
         description: 'Flag to specify if the docker image should be built and pushed beforehand'
         required: false
@@ -82,6 +57,11 @@ on:
         required: false
         type: boolean
         default: false
+      e2e-config-path:
+        description: 'Specify relative or absolute path of config file for test'
+        required: false
+        type: string
+        default: 'ci-e2e-config.yaml'
 
 env:
   REGISTRY: ghcr.io
@@ -98,11 +78,7 @@ jobs:
           echo "Chain Image:       ${{ inputs.chain-image }}"
           echo "Chain A Tag:       ${{ inputs.chain-a-tag }}"
           echo "Chain B Tag:       ${{ inputs.chain-b-tag }}"
-          echo "Chain Upgrade Tag: ${{ inputs.chain-upgrade-tag }}"
           echo "Upgrade Plan Name: ${{ inputs.upgrade-plan-name }}"
-          echo "Relayer Image:"    ${{ inputs.relayer-image }}
-          echo "Relayer Type:      ${{ inputs.relayer-type }}"
-          echo "Relayer Tag:       ${{ inputs.relayer-tag }}"
           echo "Test Entry Point:  ${{ inputs.test-entry-point }}"
           echo "Test:              ${{ inputs.test }}"
           echo "Github Ref Name:   ${{ github.ref_name }}"
@@ -132,7 +108,7 @@ jobs:
 
       - name: Build and push Docker image
         if: ${{ inputs.build-and-push-docker-image }}
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           push: true
@@ -179,7 +155,7 @@ jobs:
 
       - name: Build and push Docker image
         if: ${{ inputs.build-and-push-docker-image-wasm }}
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
         with:
           context: .
           push: true
@@ -226,14 +202,10 @@ jobs:
       - docker-build-wasm
     env:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
+      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
       CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
-      RELAYER_IMAGE: '${{ inputs.relayer-image }}'
-      RELAYER_TAG: '${{ inputs.relayer-tag }}'
-      RELAYER_ID: '${{ inputs.relayer-type }}'
-      CHAIN_BINARY: '${{ inputs.chain-binary }}'
-      CHAIN_UPGRADE_TAG: '${{ inputs.chain-upgrade-tag }}'
-      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
+      E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.build-test-matrix.outputs.matrix) }}
@@ -271,14 +243,7 @@ jobs:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
       CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
-      RELAYER_IMAGE: '${{ inputs.relayer-image }}'
-      RELAYER_TAG: '${{ inputs.relayer-tag }}'
-      RELAYER_ID: '${{ inputs.relayer-type }}'
-      CHAIN_BINARY: '${{ inputs.chain-binary }}'
-      CHAIN_UPGRADE_TAG: '${{ inputs.chain-upgrade-tag }}'
-      CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
-      # explicitly set to true so that if a test fails, it doesn't delete the chain and cause other tests to fail.
-      KEEP_CONTAINERS: "true"
+      E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
       matrix: