chore: update supported verisons (#8071)

* chore: update supported verisons * remove release wasm workflow * fix upgrade test 6 -> 7 * fix upgrade test * fix v7 -> v7.1 upgrade test (cherry picked from commit 75a7a40)
cosmos · Mar 1, 2025 · 9b69120 · 9b69120
1 parent ae9ecbc
commit 9b69120
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 222 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -14,14 +14,6 @@ queue_rules:
     merge_method: squash
 
 pull_request_rules:
-  - name: backport patches to v0.1.x callbacks ibc-go v7.3.x branch
-    conditions:
-      - base=main
-      - label=backport-callbacks-to-v0.1.x+ibc-go-v7.3.x
-    actions:
-      backport:
-        branches:
-          - callbacks/release/v0.1.x+ibc-go-v7.3.x
   - name: backport patches to v0.2.x callbacks ibc-go v7.3.x branch
     conditions:
       - base=main
@@ -46,14 +38,6 @@ pull_request_rules:
       backport:
         branches:
           - callbacks/release/v0.3.x+ibc-go-v10.0.x
-  - name: backport patches to v0.3.x wasm ibc-go v7.4.x & wasmvm 1.5.x branch
-    conditions:
-      - base=main
-      - label=backport-wasm-v0.3.x+ibc-go-v7.4.x-wasmvm-v1.5.x
-    actions:
-      backport:
-        branches:
-          - 08-wasm/release/v0.3.x+ibc-go-v7.4.x-wasmvm-v1.5.x
   - name: backport patches to v0.4.x wasm ibc-go v7.4.x & wasmvm 1.5.x branch
     conditions:
       - base=main
@@ -62,14 +46,6 @@ pull_request_rules:
       backport:
         branches:
           - 08-wasm/release/v0.4.x+ibc-go-v7.4.x-wasmvm-v1.5.x
-  - name: backport patches to v0.4.x wasm ibc-go v8.4.x & wasmvm 2.0.x branch
-    conditions:
-      - base=main
-      - label=backport-wasm-v0.4.x+ibc-go-v8.4.x-wasmvm-v2.0.x
-    actions:
-      backport:
-        branches:
-          - 08-wasm/release/v0.4.x+ibc-go-v8.4.x-wasmvm-v2.0.x
   - name: backport patches to v0.5.x wasm ibc-go v8.4.x & wasmvm 2.1.x branch
     conditions:
       - base=main
@@ -86,46 +62,6 @@ pull_request_rules:
       backport:
         branches:
           - 08-wasm/release/v0.6.x+ibc-go-v10.0.x-wasmvm-v2.2.x
-  - name: backport patches to v7.4.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v7.4.x
-    actions:
-      backport:
-        branches:
-          - release/v7.4.x
-  - name: backport patches to v7.5.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v7.5.x
-    actions:
-      backport:
-        branches:
-          - release/v7.5.x
-  - name: backport patches to v7.6.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v7.6.x
-    actions:
-      backport:
-        branches:
-          - release/v7.6.x
-  - name: backport patches to v7.7.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v7.7.x
-    actions:
-      backport:
-        branches:
-          - release/v7.7.x
-  - name: backport patches to v7.8.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v7.8.x
-    actions:
-      backport:
-        branches:
-          - release/v7.8.x
   - name: backport patches to v7.9.x branch
     conditions:
       - base=main
@@ -134,22 +70,6 @@ pull_request_rules:
       backport:
         branches:
           - release/v7.9.x
-  - name: backport patches to v8.4.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v8.4.x
-    actions:
-      backport:
-        branches:
-          - release/v8.4.x
-  - name: backport patches to v8.5.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v8.5.x
-    actions:
-      backport:
-        branches:
-          - release/v8.5.x
   - name: backport patches to v8.6.x branch
     conditions:
       - base=main

diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
@@ -171,15 +171,6 @@ jobs:
       test-file: "e2e/tests/interchain_accounts/query_test.go"
       release-version: "${{ needs.determine-image-tag.outputs.release-version }}"
 
-  ica-upgrade-test:
-    needs:
-      - build-release-images
-      - determine-image-tag
-    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
-    with:
-      test-file: "e2e/tests/interchain_accounts/upgrades_test.go"
-      release-version: "${{ needs.determine-image-tag.outputs.release-version }}"
-
   transfer-base-test-a:
     needs:
       - build-release-images

diff --git a/.github/workflows/e2e-manual-simd.yaml b/.github/workflows/e2e-manual-simd.yaml
@@ -29,12 +29,8 @@ on:
         options:
           - main
           - v10.0.0
-          - v8.5.0
-          - v8.4.0
-          - v7.7.0
-          - v7.6.0
-          - v7.5.0
-          - v7.4.0
+          - v8.6.1
+          - v7.9.2
       chain-a-tag-override:
         description: 'Specify an arbitrary tag for chain A'
         required: false
@@ -47,12 +43,8 @@ on:
         options:
           - main
           - v10.0.0
-          - v8.5.0
-          - v8.4.0
-          - v7.7.0
-          - v7.6.0
-          - v7.5.0
-          - v7.4.0
+          - v8.6.1
+          - v7.9.2
       chain-b-tag-override:
         description: 'Specify an arbitrary tag for chain B'
         required: false

diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml
@@ -40,8 +40,8 @@ jobs:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-a-tag: v7.0.0
-      chain-b-tag: v7.0.0
+      chain-a-tag: v7.9.2
+      chain-b-tag: v7.9.2
       upgrade-plan-name: "v8"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV7ToV8ChainUpgrade"
@@ -62,8 +62,8 @@ jobs:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-a-tag: v8.5.0
-      chain-b-tag: v8.5.0
+      chain-a-tag: v8.6.1
+      chain-b-tag: v8.6.1
       upgrade-plan-name: "v10"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV10ChainUpgrade"
@@ -73,8 +73,8 @@ jobs:
     uses: ./.github/workflows/e2e-test-workflow-call.yml
     with:
       chain-image: ghcr.io/cosmos/ibc-go-simd
-      chain-a-tag: v8.4.0
-      chain-b-tag: v8.4.0
+      chain-a-tag: v8.6.1
+      chain-b-tag: v8.6.1
       upgrade-plan-name: "v10"
       test-entry-point:  "TestUpgradeTestSuite"
       test: "TestV8ToV10ChainUpgrade_Localhost"

diff --git a/.github/workflows/release-wasm.yml b/.github/workflows/release-wasm.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/RELEASES.md b/RELEASES.md
@@ -69,13 +69,8 @@ We reserve the right to drop support for releases if they are deemed unused (for
 
 |Release|End of Life Date|
 |-------|----------------|
-|`v7.4.x`|March 17, 2025|
-|`v7.5.x`|March 17, 2025|
-|`v7.6.x`|March 17, 2025|
-|`v7.7.x`|March 17, 2025|
-|`v7.8.x`|March 17, 2025|
-|`v8.4.x`|May 10, 2025|
-|`v8.5.x`|May 10, 2025|
+|`v7.9.x`|March 17, 2025|
+|`v8.6.x`|May 10, 2025|
 
 ### Callbacks middleware
 
@@ -124,13 +119,8 @@ Versions of Golang, Cosmos SDK and CometBFT used by ibc-go in the currently acti
 
 | Go | ibc-go | Cosmos SDK | Tendermint/CometBFT |
 |----|--------|------------|---------------------|
-| 1.19 | v7.4.0 | v0.47.8  | v0.37.4  |
-| 1.19 | v7.5.0 | v0.47.11 | v0.37.5  |
-| 1.19 | v7.6.0 | v0.47.12 | v0.37.5  |
-| 1.19 | v7.7.0 | v0.47.13 | v0.37.5  |
-| 1.19 | v7.8.0 | v0.47.13 | v0.37.5  |
-| 1.21 | v8.4.0 | v0.50.7  | v0.38.7  |
-| 1.21 | v8.5.0 | v0.50.9  | v0.38.11 |
+| 1.19 | v7.9.0 | v0.47.13 | v0.37.5  |
+| 1.21 | v8.6.0 | v0.50.9  | v0.38.11 |
 
 ### Callbacks middleware
 
@@ -145,7 +135,7 @@ Versions of Golang, ibc-go, Cosmos SDK and CometBFT used by callbacks middleware
 
 Versions of Golang, ibc-go, Cosmos SDK and CometBFT used by `08-wasm` module in the currently active releases:
 
-| Go | callbacks | ibc-go | Cosmos SDK | Tendermint/CometBFT |
+| Go | 08-wasm | ibc-go | Cosmos SDK | Tendermint/CometBFT |
 |----|-----------|--------|------------|---------------------|
 | 1.19 | v0.3.1+ibc-go-v7.4-wasmvm-v1.5 | v7.4.0 | v0.47.8 | v0.37.4 |
 | 1.21 | v0.4.1+ibc-go-v8.4-wasmvm-v2.0 | v8.4.0 | v0.50.7 | v0.38.9 |

diff --git a/e2e/tests/interchain_accounts/base_test.go b/e2e/tests/interchain_accounts/base_test.go
@@ -430,12 +430,10 @@ func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulTransfer_AfterReop
 	})
 }
 
-// compatibility:TestMsgSendTx_SuccessfulSubmitGovProposal:skip:true
-func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulSubmitGovProposal() {
+func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulSubmitGovProposal_OrderedChannel() {
 	s.testMsgSendTxSuccessfulGovProposal(channeltypes.ORDERED)
 }
 
-// compatibility:TestMsgSendTx_SuccessfulSubmitGovProposal_UnorderedChannel:skip:true
 func (s *InterchainAccountsTestSuite) TestMsgSendTx_SuccessfulSubmitGovProposal_UnorderedChannel() {
 	s.testMsgSendTxSuccessfulGovProposal(channeltypes.UNORDERED)
 }

diff --git a/e2e/tests/transfer/base_test.go b/e2e/tests/transfer/base_test.go
@@ -382,6 +382,8 @@ func (s *TransferTestSuite) TestMsgTransfer_EntireBalance() {
 		s.AssertTxSuccess(transferTxResp)
 	})
 
+	s.Require().NoError(test.WaitForBlocks(ctx, 5, chainA, chainB), "failed to wait for blocks")
+
 	t.Run("packets relayed", func(t *testing.T) {
 		// test that chainA has the entire balance back of its native token.
 		s.AssertPacketRelayed(ctx, chainB, channelA.Counterparty.PortID, channelA.Counterparty.ChannelID, 1)

diff --git a/e2e/tests/upgrades/upgrade_test.go b/e2e/tests/upgrades/upgrade_test.go
@@ -120,6 +120,10 @@ func (s *UpgradeTestSuite) UpgradeChain(ctx context.Context, chain *cosmos.Cosmo
 	s.Require().NoError(err, "error fetching height after upgrade")
 
 	s.Require().Greater(height, haltHeight, "height did not increment after upgrade")
+
+	// In case the query paths have changed after the upgrade, we need to repopulate them
+	err = query.PopulateQueryReqToPath(ctx, chain)
+	s.Require().NoError(err, "error populating query paths after upgrade")
 }
 
 func (s *UpgradeTestSuite) TestIBCChainUpgrade() {