Merge branch 'main' into damian/fee-env-branch-service

.github/workflows/e2e-fork.yml

@@ -32,28 +32,8 @@ jobs:
           output=$(go run cmd/build_test_matrix/main.go)
           echo "matrix=$output" >> $GITHUB_OUTPUT
         env:
-          TEST_EXCLUSIONS: 'TestUpgradeTestSuite,TestGrandpaTestSuite,TestIBCWasmUpgradeTestSuite'
+          TEST_EXCLUSIONS: 'TestUpgradeTestSuite,TestIBCWasmUpgradeTestSuite'
 
-  # dynamically build a matrix of test/test suite pairs to run
-  build-test-matrix-wasm:
-    # 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' }}
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: '1.23'
-      - id: set-matrix
-        run: |
-          output=$(go run cmd/build_test_matrix/main.go)
-          echo "matrix=$output" >> $GITHUB_OUTPUT
-        env:
-          TEST_ENTRYPOINT: 'TestGrandpaTestSuite'
-
-  # e2e-fork runs the e2e tests directly by using a matrix strategy.
   e2e-fork:
     env:
       CHAIN_A_TAG: latest
@@ -81,40 +61,3 @@ jobs:
         run: |
           cd e2e
           make e2e-test test=${{ matrix.test }}
-
-  # this workflow runs only the wasm tests.
-#  e2e-fork-wasm:
-#    env:
-#      CHAIN_A_TAG: latest
-#      CHAIN_B_TAG: latest
-#      CHAIN_IMAGE: ibc-go-wasm-simd
-#      RELAYER_ID: "hyperspace" # by default use hyperspace relayer for fork wasm tests.
-#      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' }}
-#    needs: build-test-matrix-wasm
-#    runs-on: ubuntu-latest
-#    strategy:
-#      fail-fast: false
-#      matrix: ${{ fromJSON(needs.build-test-matrix-wasm.outputs.matrix) }}
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-python@v5
-#        with:
-#          python-version: '3.10'
-#      - name: Install dependencies
-#        run: make python-install-deps
-#      - name: Docker Build Wasm
-#        run: |
-#          version="$(scripts/get-libwasm-version.py --get-version)"
-#          checksum="$(scripts/get-libwasm-version.py --get-checksum)"
-#          docker build . -t "${CHAIN_IMAGE}:${CHAIN_A_TAG}" -f modules/light-clients/08-wasm/Dockerfile --build-arg LIBWASM_VERSION=${version} --build-arg LIBWASM_CHECKSUM=${checksum}
-#      - name: Setup Go
-#        uses: actions/setup-go@v5
-#        with:
-#          go-version: '1.23'
-#          cache-dependency-path: 'e2e/go.sum'
-#      - name: Run e2e Test
-#        run: |
-#          cd e2e
-#          make e2e-test test=${{ matrix.test }}

.github/workflows/e2e.yaml

@@ -66,5 +66,5 @@ jobs:
       chain-b-tag: '${{ needs.determine-image-tag.outputs.simd-tag }}'
       # on regular PRs we won't run upgrade tests.
       # NOTE: we are exluding TestTransferTestSuite as we run this full suite instead of each individual test.
-      test-exclusions: 'TestUpgradeTestSuite,TestGrandpaTestSuite,TestIBCWasmUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite,TestIncentivizedTransferTestSuite,TestTransferForwardingTestSuite'
+      test-exclusions: 'TestUpgradeTestSuite,TestIBCWasmUpgradeTestSuite,TestTransferTestSuite,TestAuthzTransferTestSuite,TestTransferTestSuiteSendReceive,TestTransferTestSuiteSendEnabled,TestTransferLocalhostTestSuite,TestConnectionTestSuite,TestInterchainAccountsGovTestSuite,TestIncentivizedTransferTestSuite,TestTransferForwardingTestSuite'
       temp-run-full-suite: true

modules/apps/27-interchain-accounts/genesis/types/genesis_test.go

@@ -9,6 +9,7 @@ import (
 	genesistypes "github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/genesis/types"
 	hosttypes "github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts/types"
+	host "github.com/cosmos/ibc-go/v9/modules/core/24-host"
 	ibctesting "github.com/cosmos/ibc-go/v9/testing"
 )
 
@@ -34,33 +35,33 @@ func (suite *GenesisTypesTestSuite) TestValidateGenesisState() {
 	testCases := []struct {
 		name     string
 		malleate func()
-		expPass  bool
+		expErr   error
 	}{
 		{
 			"success",
 			func() {},
-			true,
+			nil,
 		},
 		{
 			"failed to validate - empty value",
 			func() {
 				genesisState = genesistypes.GenesisState{}
 			},
-			false,
+			host.ErrInvalidID,
 		},
 		{
 			"failed to validate - invalid controller genesis",
 			func() {
 				genesisState = *genesistypes.NewGenesisState(genesistypes.ControllerGenesisState{Ports: []string{"invalid|port"}}, genesistypes.DefaultHostGenesis())
 			},
-			false,
+			host.ErrInvalidID,
 		},
 		{
 			"failed to validate - invalid host genesis",
 			func() {
 				genesisState = *genesistypes.NewGenesisState(genesistypes.DefaultControllerGenesis(), genesistypes.HostGenesisState{})
 			},
-			false,
+			host.ErrInvalidID,
 		},
 	}
 
@@ -74,10 +75,11 @@ func (suite *GenesisTypesTestSuite) TestValidateGenesisState() {
 
 			err := genesisState.Validate()
 
-			if tc.expPass {
+			if tc.expErr == nil {
 				suite.Require().NoError(err, tc.name)
 			} else {
 				suite.Require().Error(err, tc.name)
+				suite.Require().ErrorIs(err, tc.expErr)
 			}
 		})
 	}

modules/apps/29-fee/types/keys.go

@@ -97,7 +97,7 @@ func KeyCounterpartyPayee(address, channelID string) []byte {
 }
 
 // ParseKeyCounterpartyPayee returns the registered relayer address and channelID used to store the counterparty payee address
-func ParseKeyCounterpartyPayee(key string) (address string, channelID string, error error) {
+func ParseKeyCounterpartyPayee(key string) (address string, channelID string, err error) {
 	keySplit := strings.Split(key, "/")
 	if len(keySplit) != 3 {
 		return "", "", errorsmod.Wrapf(