e2e: Port tests for packet forward middleware module

.github/workflows/e2e-fork.yml

@@ -38,6 +38,8 @@ jobs:
     env:
       CHAIN_A_TAG: latest
       CHAIN_B_TAG: latest
+      CHAIN_C_TAG: latest
+      CHAIN_D_TAG: latest
       CHAIN_IMAGE: ibc-go-simd
       FORK: "true"
     # run this job on forks and copies of ibc-go, for example: a public fork or a private copy of ibc-go.

.github/workflows/e2e-manual-simd.yaml

@@ -16,8 +16,9 @@ on:
           - TestInterchainAccountsGroupsTestSuite
           - TestInterchainAccountsGovTestSuite
           - TestAuthzTransferTestSuite
+          - TestForwardTransferSuite
       chain-image:
-        description: 'The image to use for chain A'
+        description: 'The image to use for chains'
         required: true
         type: string
         default: "ghcr.io/cosmos/ibc-go-simd"
@@ -49,6 +50,34 @@ on:
         description: 'Specify an arbitrary tag for chain B'
         required: false
         type: string
+      chain-c-tag:
+        description: 'The tag to use for chain C'
+        required: true
+        type: choice
+        default: main
+        options:
+          - main
+          - v10.0.0
+          - v8.7.0
+          - v7.10.0
+      chain-c-tag-override:
+        description: 'Specify an arbitrary tag for chain C'
+        required: false
+        type: string
+      chain-d-tag:
+        description: 'The tag to use for chain D'
+        required: true
+        type: choice
+        default: main
+        options:
+          - main
+          - v10.0.0
+          - v8.7.0
+          - v7.10.0
+      chain-d-tag-override:
+        description: 'Specify an arbitrary tag for chain A'
+        required: false
+        type: string
 
 jobs:
   e2e-manual:
@@ -57,4 +86,6 @@ jobs:
       chain-image: "${{ github.event.inputs.chain-image }}"
       chain-a-tag: "${{ github.event.inputs.chain-a-tag-override || github.event.inputs.chain-a-tag }}"
       chain-b-tag: "${{ github.event.inputs.chain-b-tag-override || github.event.inputs.chain-b-tag }}"
+      chain-c-tag: "${{ github.event.inputs.chain-c-tag-override || github.event.inputs.chain-c-tag }}"
+      chain-d-tag: "${{ github.event.inputs.chain-d-tag-override || github.event.inputs.chain-d-tag }}"
       test-entry-point:  "${{ github.event.inputs.test-entry-point }}"

.github/workflows/e2e-test-workflow-call.yml

@@ -36,6 +36,16 @@ on:
         description: 'The tag to use for chain B'
         required: true
         type: string
+      chain-c-tag:
+        description: 'The tag to use for chain C'
+        required: true
+        type: string
+        default: main
+      chain-d-tag:
+        default: main
+        description: 'The tag to use for chain D'
+        required: true
+        type: string
       # upgrade-plan-name is only required during upgrade tests, and is otherwise ignored.
       upgrade-plan-name:
         default: ''
@@ -78,6 +88,8 @@ 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 C Tag:       ${{ inputs.chain-c-tag }}"
+          echo "Chain D Tag:       ${{ inputs.chain-d-tag }}"
           echo "Upgrade Plan Name: ${{ inputs.upgrade-plan-name }}"
           echo "Test Entry Point:  ${{ inputs.test-entry-point }}"
           echo "Test:              ${{ inputs.test }}"
@@ -205,6 +217,8 @@ jobs:
       CHAIN_UPGRADE_PLAN: '${{ inputs.upgrade-plan-name }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
       CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
+      CHAIN_C_TAG: '${{ inputs.chain-c-tag }}'
+      CHAIN_D_TAG: '${{ inputs.chain-d-tag }}'
       E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
@@ -243,6 +257,8 @@ jobs:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
       CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
+      CHAIN_C_TAG: '${{ inputs.chain-c-tag }}'
+      CHAIN_D_TAG: '${{ inputs.chain-d-tag }}'
       E2E_CONFIG_PATH: '${{ inputs.e2e-config-path }}'
     strategy:
       fail-fast: false
@@ -256,6 +272,7 @@ jobs:
           - entrypoint: TestTransferLocalhostTestSuite
           - entrypoint: TestConnectionTestSuite
           - entrypoint: TestInterchainAccountsGovTestSuite
+          - entrypoint: TestForwardTransferSuite
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/e2e-upgrade.yaml

@@ -20,6 +20,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v6.1.0
       chain-b-tag: v6.1.0
+      chain-c-tag: v6.1.0
+      chain-d-tag: v6.1.0
       upgrade-plan-name: "v7"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV6ToV7ChainUpgrade"
@@ -31,6 +33,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v7.0.0
       chain-b-tag: v7.0.0
+      chain-c-tag: v7.0.0
+      chain-d-tag: v7.0.0
       upgrade-plan-name: "v7.1"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV7ToV7_1ChainUpgrade"
@@ -42,6 +46,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v7.10.0
       chain-b-tag: v7.10.0
+      chain-c-tag: v7.10.0
+      chain-d-tag: v7.10.0
       upgrade-plan-name: "v8"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV7ToV8ChainUpgrade"
@@ -53,6 +59,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v8.0.0
       chain-b-tag: v8.0.0
+      chain-c-tag: v8.0.0
+      chain-d-tag: v8.0.0
       upgrade-plan-name: "v8.1"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV8_1ChainUpgrade"
@@ -64,6 +72,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v8.7.0
       chain-b-tag: v8.7.0
+      chain-c-tag: v8.7.0
+      chain-d-tag: v8.7.0
       upgrade-plan-name: "v10"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV10ChainUpgrade"
@@ -75,6 +85,8 @@ jobs:
       chain-image: ghcr.io/cosmos/ibc-go-simd
       chain-a-tag: v8.7.0
       chain-b-tag: v8.7.0
+      chain-c-tag: v8.7.0
+      chain-d-tag: v8.7.0
       upgrade-plan-name: "v10"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV10ChainUpgrade_Localhost"

.github/workflows/e2e.yaml

@@ -64,6 +64,8 @@ jobs:
       # with regular tests, both images are the same.
       chain-a-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
+      chain-c-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
+      chain-d-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       # on regular PRs we won't run upgrade tests.
       # NOTE: we are excluding TestTransferTestSuite as we run this full suite instead of each individual test.
       test-exclusions: 'TestUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite'

.github/workflows/e2emodule.yml

@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
       - uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v2.0
+          version: v2.1
           only-new-issues: true
           args: --timeout 5m
           working-directory: e2e/

.github/workflows/golangci-feature.yml

@@ -29,6 +29,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v2.0
+          version: v2.1
           only-new-issues: true
           args: --timeout 10m

.github/workflows/golangci.yml

@@ -25,6 +25,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v2.0
+          version: v2.1
           only-new-issues: true
           args: --timeout 10m

.github/workflows/wasm-client.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: golangci/golangci-lint-action@v7.0.0
         with:
-          version: v2.0
+          version: v2.1
           only-new-issues: true
           args: --timeout 10m
           working-directory: modules/light-clients/08-wasm

e2e/ci-e2e-config.yaml

@@ -7,6 +7,8 @@
 # | CHAIN_IMAGE          | The image that will be used for the chain | ghcr.io/cosmos/ibc-go-simd   |
 # | CHAIN_A_TAG          | The tag used for chain A                  | N/A (must be set)            |
 # | CHAIN_B_TAG          | The tag used for chain B                  | N/A (must be set)            |
+# | CHAIN_C_TAG          | The tag used for chain C                  | N/A (must be set)            |
+# | CHAIN_D_TAG          | The tag used for chain D                  | N/A (must be set)            |
 # | CHAIN_BINARY         | The binary used in the container          | simd                         |
 # | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
 # | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
@@ -28,6 +30,20 @@ chains:
     numFullNodes: 1
     image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
     binary: simd # override with CHAIN_BINARY
+
+  # the entry at index 2 corresponds to CHAIN_C
+  - chainId: chainC-1
+    numValidators: 4
+    numFullNodes: 1
+    image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
+    binary: simd # override with CHAIN_BINARY
+
+  # the entry at index 3 corresponds to CHAIN_D
+  - chainId: chainD-1
+    numValidators: 4
+    numFullNodes: 1
+    image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
+    binary: simd # override with CHAIN_BINARY
 
 # activeRelayer must match the id of a relayer specified in the relayers list below.
 activeRelayer: hermes # override with RELAYER_ID

e2e/sample.config.extended.yaml

@@ -7,6 +7,8 @@
 # | CHAIN_IMAGE          | The image that will be used for the chain | ghcr.io/cosmos/ibc-go-simd   |
 # | CHAIN_A_TAG          | The tag used for chain A                  | N/A (must be set)            |
 # | CHAIN_B_TAG          | The tag used for chain B                  | N/A (must be set)            |
+# | CHAIN_C_TAG          | The tag used for chain C                  | N/A (must be set)            |
+# | CHAIN_D_TAG          | The tag used for chain D                  | N/A (must be set)            |
 # | CHAIN_BINARY         | The binary used in the container          | simd                         |
 # | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
 # | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
@@ -23,13 +25,29 @@ chains:
     tag: main # override with CHAIN_A_TAG
     binary: simd # override with CHAIN_BINARY
 
-    # the entry at index 1 corresponds to CHAIN_B
+  # the entry at index 1 corresponds to CHAIN_B
   - chainId: chainB-1
     numValidators: 4
     numFullNodes: 1
     image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
     tag: main # override with CHAIN_B_TAG
     binary: simd # override with CHAIN_BINARY
+
+  # the entry at index 2 corresponds to CHAIN_C
+  - chainId: chainC-1
+    numValidators: 4
+    numFullNodes: 1
+    image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
+    tag: main # override with CHAIN_C_TAG
+    binary: simd # override with CHAIN_BINARY
+
+  # the entry at index 3 corresponds to CHAIN_D
+  - chainId: chainD-1
+    numValidators: 4
+    numFullNodes: 1
+    image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE
+    tag: main # override with CHAIN_D_TAG
+    binary: simd # override with CHAIN_BINARY
 
 # activeRelayer must match the id of a relayer specified in the relayers list below.
 activeRelayer: hermes # override with RELAYER_ID

e2e/sample.config.yaml

@@ -6,3 +6,7 @@ chains:
     chainId: chainA-1
   - tag: main # override with CHAIN_B_TAG
     chainId: chainB-1
+  - tag: main # override with CHAIN_C_TAG
+    chainId: chainC-1
+  - tag: main # override with CHAIN_D_TAG
+    chainId: chainD-1

e2e/tests/core/03-connection/connection_test.go

@@ -35,7 +35,7 @@ type ConnectionTestSuite struct {
 }
 
 func (s *ConnectionTestSuite) CreateConnectionTestPath(testName string) (ibc.Relayer, ibc.ChannelOutput) {
-	return s.CreatePaths(ibc.DefaultClientOpts(), s.TransferChannelOptions(), testName), s.GetChainAChannelForTest(testName)
+	return s.CreatePaths(ibc.DefaultClientOpts(), s.TransferChannelOptions(), testName), s.GetChainAToChainBChannel(testName)
 }
 
 // QueryMaxExpectedTimePerBlockParam queries the on-chain max expected time per block param for 03-connection