From b5c71850654f1a6e6f505acfa5f1263368efdaa9 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 14:58:15 +0100
Subject: [PATCH 01/19] chore: fixing workflow inputs

---
 .github/workflows/e2e-compatibility.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 482d8d321de..5ff39ef3f00 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -1,12 +1,13 @@
 name: Compatibility E2E
 on:
   workflow_dispatch:
-    release-branch:
-      description: 'Release branch to test'
-      required: true
-      type: choice
-      options:
-        - release/v5.0.x
+    inputs:
+      release-branch:
+        description: 'Release branch to test'
+        required: true
+        type: choice
+        options:
+          - release/v5.0.x
 
 env:
   REGISTRY: ghcr.io

From 329d8e0645554de710412c3fcdf8b5a164080d2c Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 15:01:54 +0100
Subject: [PATCH 02/19] chore: updating release v5.0.x json

---
 .../release-v5.0.x.json                       | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 3730a89478d..cfd48887774 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -6,7 +6,31 @@
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
     }
   ]
 }

From b86a65a20b2ab35368d83280ea602bd13c621808 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 15:08:51 +0100
Subject: [PATCH 03/19] chore: add full set of transfer tests

---
 .../release-v5.0.x.json                       | 248 ++++++++++++++++++
 1 file changed, 248 insertions(+)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index cfd48887774..56250c3b7c2 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -31,6 +31,254 @@
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Fails_InvalidAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestMsgTransfer_Timeout_Nonincentivized"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestSendEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestTransferTestSuite",
+      "test": "TestReceiveEnabledParam"
     }
   ]
 }

From 536e37d89c96f0ab41779c925006bdd16299af56 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 15:15:37 +0100
Subject: [PATCH 04/19] chore: adding incentivized tests

---
 .../release-v5.0.x.json                       | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 56250c3b7c2..67c8c8a6d10 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -279,6 +279,151 @@
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestReceiveEnabledParam"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
+    },
+
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestIncentivizedTransferTestSuite",
+      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
     }
   ]
 }

From d5c758b8ebec9637d874d31c97d4403f6bc5373e Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 15:26:31 +0100
Subject: [PATCH 05/19] chore: adding tests for client update

---
 .../release-v5.0.x.json                       | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 67c8c8a6d10..312b0ea0ff7 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -424,6 +424,62 @@
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestIncentivizedTransferTestSuite",
       "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v4.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v3.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "release-v5.0.x",
+      "chain-b-tag": "v2.0.0",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v4.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v3.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
+    },
+    {
+      "chain-binary": "simd",
+      "chain-a-tag": "v2.0.0",
+      "chain-b-tag": "release-v5.0.x",
+      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
+      "entrypoint": "TestClientTestSuite",
+      "test": "TestClientUpdateProposal_Succeeds"
     }
   ]
 }

From 275908651f25afa2b998b69bee7f0dc3ae48057c Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 22 Sep 2022 16:58:28 +0100
Subject: [PATCH 06/19] chore: change to 3.2 and 2.4

---
 .github/compatibility-test-matrices/release-v5.0.x.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 312b0ea0ff7..6c13fb11804 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -444,7 +444,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.4.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",
       "test": "TestClientUpdateProposal_Succeeds"
@@ -452,7 +452,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.4.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",
       "test": "TestClientUpdateProposal_Succeeds"
@@ -467,7 +467,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.2.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",
@@ -475,7 +475,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.4.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",

From 1a4cc7d5ffe6483a59cf571969b9d5f7ada9be03 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Fri, 23 Sep 2022 10:25:07 +0100
Subject: [PATCH 07/19] corrected tag

---
 .github/compatibility-test-matrices/release-v5.0.x.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 6c13fb11804..323a50f0ee5 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -444,7 +444,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.4.0",
+      "chain-b-tag": "v3.2.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",
       "test": "TestClientUpdateProposal_Succeeds"

From c6508d9327f36dd4d49e5c0060646d9dd8f15b2b Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Fri, 23 Sep 2022 11:21:39 +0100
Subject: [PATCH 08/19] chore: bump 3.0 to 3.3 and 2.0 to 2.1

---
 .../release-v5.0.x.json                       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 323a50f0ee5..523242d6799 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -19,7 +19,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Succeeds_Nonincentivized"
@@ -27,7 +27,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.1.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Succeeds_Nonincentivized"
@@ -42,7 +42,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -50,7 +50,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.1.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -75,7 +75,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Fails_InvalidAddress"
@@ -83,7 +83,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.1.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Fails_InvalidAddress"
@@ -98,7 +98,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -106,7 +106,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.1.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -131,7 +131,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Timeout_Nonincentivized"
@@ -139,7 +139,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.1.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestMsgTransfer_Timeout_Nonincentivized"
@@ -154,7 +154,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -162,7 +162,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.1.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -187,7 +187,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestSendEnabledParam"
@@ -195,7 +195,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.1.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestSendEnabledParam"
@@ -210,7 +210,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -218,7 +218,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.1.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -243,7 +243,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.0.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestReceiveEnabledParam"
@@ -251,7 +251,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.0.0",
+      "chain-b-tag": "v2.1.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
       "test": "TestReceiveEnabledParam"
@@ -266,7 +266,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.0.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -274,7 +274,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v2.0.0",
+      "chain-a-tag": "v2.1.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestTransferTestSuite",
@@ -444,7 +444,7 @@
     {
       "chain-binary": "simd",
       "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.2.0",
+      "chain-b-tag": "v3.3.0",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",
       "test": "TestClientUpdateProposal_Succeeds"
@@ -467,7 +467,7 @@
     },
     {
       "chain-binary": "simd",
-      "chain-a-tag": "v3.2.0",
+      "chain-a-tag": "v3.3.0",
       "chain-b-tag": "release-v5.0.x",
       "chain-image": "ghcr.io/cosmos/ibc-go-simd",
       "entrypoint": "TestClientTestSuite",

From 0880657d4e84eba321237864baa120941f227caf Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:05:23 +0100
Subject: [PATCH 09/19] chore: change release json into non include format

---
 .../release-v5.0.x.json                       | 492 +-----------------
 .github/workflows/e2e-compatibility.yaml      |   4 +-
 2 files changed, 26 insertions(+), 470 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 523242d6799..0bdbf0bd1f4 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -1,485 +1,41 @@
 {
-  "include": [
+  "entrypoint": ["TestTransferTestSuite"],
+  "chain-binary": ["simd"],
+  "test": [
+    "TestMsgTransfer_Succeeds_Nonincentivized",
+    "TestMsgTransfer_Fails_InvalidAddress",
+    "TestMsgTransfer_Timeout_Nonincentivized",
+    "TestSendEnabledParam",
+    "TestReceiveEnabledParam"
+  ],
+  "version-pair": [
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "release-v5.0.x",
+      "chain-b": "release-v5.0.x"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "release-v5.0.x",
+      "chain-b": "v4.0.0"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "release-v5.0.x",
+      "chain-b": "v3.3.0"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.1.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "release-v5.0.x",
+      "chain-b": "v2.1.0"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "v4.0.0",
+      "chain-b": "release-v5.0.x"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
+      "chain-a": "v3.3.0",
+      "chain-b": "release-v5.0.x"
     },
     {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.1.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Succeeds_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.1.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.1.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Fails_InvalidAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.1.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.1.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestMsgTransfer_Timeout_Nonincentivized"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.1.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.1.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestSendEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.1.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.1.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestTransferTestSuite",
-      "test": "TestReceiveEnabledParam"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncSingleSender_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_InvalidReceiverAccount"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMultiMsg_MsgPayPacketFeeSingleSender"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_SingleSender_TimesOut"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress"
-    },
-
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestIncentivizedTransferTestSuite",
-      "test": "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v4.0.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v3.3.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "release-v5.0.x",
-      "chain-b-tag": "v2.4.0",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v4.0.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v3.3.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
-    },
-    {
-      "chain-binary": "simd",
-      "chain-a-tag": "v2.4.0",
-      "chain-b-tag": "release-v5.0.x",
-      "chain-image": "ghcr.io/cosmos/ibc-go-simd",
-      "entrypoint": "TestClientTestSuite",
-      "test": "TestClientUpdateProposal_Succeeds"
+      "chain-a": "v2.1.0",
+      "chain-b": "release-v5.0.x"
     }
   ]
 }
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 5ff39ef3f00..542c40cad67 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -83,7 +83,7 @@ jobs:
         env:
           # each test has its own set of variables to specify which images are used.
           CHAIN_IMAGE: "${{ matrix.chain-image }}"
-          CHAIN_A_TAG: "${{ matrix.chain-a-tag }}"
-          CHAIN_B_TAG: "${{ matrix.chain-b-tag }}"
+          CHAIN_A_TAG: "${{ matrix.version-pair.chain-a-tag }}"
+          CHAIN_B_TAG: "${{ matrix.version-pair.chain-b-tag }}"
           CHAIN_BINARY: "${{ matrix.chain-binary }}"
           RLY_TAG: "v2.0.0"

From a18213af5041f1439cf3735bf765326b2777016f Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:15:38 +0100
Subject: [PATCH 10/19] chore: separate chain a and chain b lists

---
 .../release-v5.0.x.json                       | 34 ++-----------
 .github/workflows/e2e-compatibility.yaml      | 48 +++++++++----------
 2 files changed, 27 insertions(+), 55 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x.json
index 0bdbf0bd1f4..f00589f6f82 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x.json
@@ -1,6 +1,7 @@
 {
+  "chain-a": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.1.0"],
+  "chain-b": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.1.0"],
   "entrypoint": ["TestTransferTestSuite"],
-  "chain-binary": ["simd"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",
     "TestMsgTransfer_Fails_InvalidAddress",
@@ -8,34 +9,5 @@
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
-  "version-pair": [
-    {
-      "chain-a": "release-v5.0.x",
-      "chain-b": "release-v5.0.x"
-    },
-    {
-      "chain-a": "release-v5.0.x",
-      "chain-b": "v4.0.0"
-    },
-    {
-      "chain-a": "release-v5.0.x",
-      "chain-b": "v3.3.0"
-    },
-    {
-      "chain-a": "release-v5.0.x",
-      "chain-b": "v2.1.0"
-    },
-    {
-      "chain-a": "v4.0.0",
-      "chain-b": "release-v5.0.x"
-    },
-    {
-      "chain-a": "v3.3.0",
-      "chain-b": "release-v5.0.x"
-    },
-    {
-      "chain-a": "v2.1.0",
-      "chain-b": "release-v5.0.x"
-    }
-  ]
+  "chain-binary": ["simd"]
 }
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 542c40cad67..5492bfbc2d3 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -27,26 +27,26 @@ jobs:
           echo "::set-output name=docker-tag::$docker_tag"
         id: set-docker-tag
 
-  build-release-image:
-    runs-on: ubuntu-latest
-    needs: determine-docker-tag
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: "${{ env.RELEASE_BRANCH }}"
-          fetch-depth: 0
-      - name: Log in to the Container registry
-        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Dockerfile
-        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
-      - name: Build image
-        run: |
-          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
-          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
+#  build-release-image:
+#    runs-on: ubuntu-latest
+#    needs: determine-docker-tag
+#    steps:
+#      - uses: actions/checkout@v3
+#        with:
+#          ref: "${{ env.RELEASE_BRANCH }}"
+#          fetch-depth: 0
+#      - name: Log in to the Container registry
+#        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
+#        with:
+#          registry: ${{ env.REGISTRY }}
+#          username: ${{ github.actor }}
+#          password: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Fetch latest Dockerfile
+#        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
+#      - name: Build image
+#        run: |
+#          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
+#          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
 
   load-test-matrix:
     outputs:
@@ -63,11 +63,11 @@ jobs:
           echo "::set-output name=test-matrix::$test_matrix"
         id: set-test-matrix
 
-  e2e-tests:
+  transfer-e2e-tests:
     runs-on: ubuntu-latest
     needs:
       - load-test-matrix
-      - build-release-image
+#      - build-release-image
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.load-test-matrix.outputs.test-matrix) }}
@@ -83,7 +83,7 @@ jobs:
         env:
           # each test has its own set of variables to specify which images are used.
           CHAIN_IMAGE: "${{ matrix.chain-image }}"
-          CHAIN_A_TAG: "${{ matrix.version-pair.chain-a-tag }}"
-          CHAIN_B_TAG: "${{ matrix.version-pair.chain-b-tag }}"
+          CHAIN_A_TAG: "${{ matrix.chain-a-tag }}"
+          CHAIN_B_TAG: "${{ matrix.chain-b-tag }}"
           CHAIN_BINARY: "${{ matrix.chain-binary }}"
           RLY_TAG: "v2.0.0"

From 65f66e9fe8ce58dc42dfa475878fe84c2a6216ca Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:25:59 +0100
Subject: [PATCH 11/19] chore: adding workflow call for compatibility tests

---
 .../{ => transfer}/release-v5.0.x.json        |  0
 .../e2e-compatibility-workflow-call.yaml      | 52 +++++++++++++++++++
 .github/workflows/e2e-compatibility.yaml      | 50 ++++--------------
 3 files changed, 62 insertions(+), 40 deletions(-)
 rename .github/compatibility-test-matrices/{ => transfer}/release-v5.0.x.json (100%)
 create mode 100644 .github/workflows/e2e-compatibility-workflow-call.yaml

diff --git a/.github/compatibility-test-matrices/release-v5.0.x.json b/.github/compatibility-test-matrices/transfer/release-v5.0.x.json
similarity index 100%
rename from .github/compatibility-test-matrices/release-v5.0.x.json
rename to .github/compatibility-test-matrices/transfer/release-v5.0.x.json
diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
new file mode 100644
index 00000000000..b4bfa5a7df4
--- /dev/null
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -0,0 +1,52 @@
+on:
+  workflow_call:
+    inputs:
+      docker-tag:
+        description: 'Docker tag being used'
+        required: true
+        type: string
+      test-suite:
+        description: 'Test suite to run'
+        required: true
+        type: string
+
+
+jobs:
+  load-test-matrix:
+    outputs:
+      test-matrix: ${{ steps.set-test-matrix.outputs.test-matrix }}
+    needs: determine-docker-tag
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          # use jq -c to put the full json contents on a single line. This is required when using the json body
+          # to create the matrix in the following job.
+          test_matrix="$(cat .github/compatibility-test-matrices/${{ inputs.test-suite }}/${{ inputs.docker-tag }}.json | jq -c)"
+          echo $test_matrix
+          echo "::set-output name=test-matrix::$test_matrix"
+        id: set-test-matrix
+
+  e2e:
+    runs-on: ubuntu-latest
+    needs:
+      - load-test-matrix
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.load-test-matrix.outputs.test-matrix) }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18
+      - name: Run e2e Test
+        run: |
+          cd e2e
+          make e2e-test entrypoint=${{ matrix.entrypoint }} test=${{ matrix.test }}
+        env:
+          # each test has its own set of variables to specify which images are used.
+          CHAIN_IMAGE: "${{ matrix.chain-image }}"
+          CHAIN_A_TAG: "${{ matrix.chain-a-tag }}"
+          CHAIN_B_TAG: "${{ matrix.chain-b-tag }}"
+          CHAIN_BINARY: "${{ matrix.chain-binary }}"
+          RLY_TAG: "v2.0.0"
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 5492bfbc2d3..f25436c73a1 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -27,6 +27,16 @@ jobs:
           echo "::set-output name=docker-tag::$docker_tag"
         id: set-docker-tag
 
+  transfer-e2e:
+    needs:
+      - determine-image-tag
+#      - build-release-image
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    secrets: inherit
+    with:
+      docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
+      test-suite: "transfer"
+
 #  build-release-image:
 #    runs-on: ubuntu-latest
 #    needs: determine-docker-tag
@@ -47,43 +57,3 @@ jobs:
 #        run: |
 #          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
 #          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
-
-  load-test-matrix:
-    outputs:
-      test-matrix: ${{ steps.set-test-matrix.outputs.test-matrix }}
-    needs: determine-docker-tag
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: |
-          # use jq -c to put the full json contents on a single line. This is required when using the json body
-          # to create the matrix in the following job.
-          test_matrix="$(cat .github/compatibility-test-matrices/${{ needs.determine-docker-tag.outputs.docker-tag }}.json | jq -c)"
-          echo $test_matrix
-          echo "::set-output name=test-matrix::$test_matrix"
-        id: set-test-matrix
-
-  transfer-e2e-tests:
-    runs-on: ubuntu-latest
-    needs:
-      - load-test-matrix
-#      - build-release-image
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJSON(needs.load-test-matrix.outputs.test-matrix) }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-      - name: Run e2e Test
-        run: |
-          cd e2e
-          make e2e-test entrypoint=${{ matrix.entrypoint }} test=${{ matrix.test }}
-        env:
-          # each test has its own set of variables to specify which images are used.
-          CHAIN_IMAGE: "${{ matrix.chain-image }}"
-          CHAIN_A_TAG: "${{ matrix.chain-a-tag }}"
-          CHAIN_B_TAG: "${{ matrix.chain-b-tag }}"
-          CHAIN_BINARY: "${{ matrix.chain-binary }}"
-          RLY_TAG: "v2.0.0"

From 8774891d760756aa15b7d6d145912274771e0744 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:27:44 +0100
Subject: [PATCH 12/19] chore: corrected needs array

---
 .github/workflows/e2e-compatibility.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index f25436c73a1..e05f2f7e7ca 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -29,7 +29,7 @@ jobs:
 
   transfer-e2e:
     needs:
-      - determine-image-tag
+      - determine-docker-tag
 #      - build-release-image
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     secrets: inherit

From f6fba047f8ce65fc406afd58cebaa8a00d087ad7 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:29:11 +0100
Subject: [PATCH 13/19] chore: fixed workflow call

---
 .github/workflows/e2e-compatibility-workflow-call.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
index b4bfa5a7df4..22863a66a38 100644
--- a/.github/workflows/e2e-compatibility-workflow-call.yaml
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -15,7 +15,6 @@ jobs:
   load-test-matrix:
     outputs:
       test-matrix: ${{ steps.set-test-matrix.outputs.test-matrix }}
-    needs: determine-docker-tag
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -29,8 +28,7 @@ jobs:
 
   e2e:
     runs-on: ubuntu-latest
-    needs:
-      - load-test-matrix
+    needs: load-test-matrix
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.load-test-matrix.outputs.test-matrix) }}

From 0ca1496283fe3d96569fc2c24563d317ebcfbe17 Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:37:08 +0100
Subject: [PATCH 14/19] chore: refactor directory structure

---
 .../transfer.json}                            |  0
 .../e2e-compatibility-workflow-call.yaml      |  2 +-
 .github/workflows/e2e-compatibility.yaml      | 46 +++++++++----------
 3 files changed, 23 insertions(+), 25 deletions(-)
 rename .github/compatibility-test-matrices/{transfer/release-v5.0.x.json => release-v5.0.x/transfer.json} (100%)

diff --git a/.github/compatibility-test-matrices/transfer/release-v5.0.x.json b/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
similarity index 100%
rename from .github/compatibility-test-matrices/transfer/release-v5.0.x.json
rename to .github/compatibility-test-matrices/release-v5.0.x/transfer.json
diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
index 22863a66a38..8e51a7ea942 100644
--- a/.github/workflows/e2e-compatibility-workflow-call.yaml
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -21,7 +21,7 @@ jobs:
       - run: |
           # use jq -c to put the full json contents on a single line. This is required when using the json body
           # to create the matrix in the following job.
-          test_matrix="$(cat .github/compatibility-test-matrices/${{ inputs.test-suite }}/${{ inputs.docker-tag }}.json | jq -c)"
+          test_matrix="$(cat .github/compatibility-test-matrices/${{ inputs.docker-tag }}/${{ inputs.test-suite }}.json | jq -c)"
           echo $test_matrix
           echo "::set-output name=test-matrix::$test_matrix"
         id: set-test-matrix
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index e05f2f7e7ca..d36696f39fe 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -27,33 +27,31 @@ jobs:
           echo "::set-output name=docker-tag::$docker_tag"
         id: set-docker-tag
 
+  build-release-image:
+    runs-on: ubuntu-latest
+    needs: determine-docker-tag
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: "${{ env.RELEASE_BRANCH }}"
+          fetch-depth: 0
+      - name: Log in to the Container registry
+        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Fetch latest Dockerfile
+        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
+      - name: Build image
+        run: |
+          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
+          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
+
   transfer-e2e:
-    needs:
-      - determine-docker-tag
-#      - build-release-image
+    needs: build-release-image
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     secrets: inherit
     with:
       docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
       test-suite: "transfer"
-
-#  build-release-image:
-#    runs-on: ubuntu-latest
-#    needs: determine-docker-tag
-#    steps:
-#      - uses: actions/checkout@v3
-#        with:
-#          ref: "${{ env.RELEASE_BRANCH }}"
-#          fetch-depth: 0
-#      - name: Log in to the Container registry
-#        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ github.actor }}
-#          password: ${{ secrets.GITHUB_TOKEN }}
-#      - name: Fetch latest Dockerfile
-#        run: curl https://raw.githubusercontent.com/cosmos/ibc-go/main/Dockerfile -o Dockerfile
-#      - name: Build image
-#        run: |
-#          docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
-#          docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"

From c385f3bd0d3c969f8347b2f8260c96895248928b Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:45:37 +0100
Subject: [PATCH 15/19] chore: added job for client and incentivized transfer

---
 .../release-v5.0.x/client.json                  |  9 +++++++++
 .../release-v5.0.x/incentivized-transfer.json   | 14 ++++++++++++++
 .github/workflows/e2e-compatibility.yaml        | 17 +++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 .github/compatibility-test-matrices/release-v5.0.x/client.json
 create mode 100644 .github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json

diff --git a/.github/compatibility-test-matrices/release-v5.0.x/client.json b/.github/compatibility-test-matrices/release-v5.0.x/client.json
new file mode 100644
index 00000000000..02efdca2b31
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.0.x/client.json
@@ -0,0 +1,9 @@
+{
+  "chain-a": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.4.0"],
+  "chain-b": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.4.0"],
+  "entrypoint": ["TestClientTestSuite"],
+  "test": [
+    "TestClientUpdateProposal_Succeeds"
+  ],
+  "chain-binary": ["simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
new file mode 100644
index 00000000000..5c31b1ac432
--- /dev/null
+++ b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
@@ -0,0 +1,14 @@
+{
+  "chain-a": ["release-v5.0.x", "v4.0.0"],
+  "chain-b": ["release-v5.0.x", "v4.0.0"],
+  "entrypoint": ["TestIncentivizedTransferTestSuite"],
+  "test": [
+    "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
+    "TestMsgPayPacketFee_InvalidReceiverAccount",
+    "TestMultiMsg_MsgPayPacketFeeSingleSender",
+    "TestMsgPayPacketFee_SingleSender_TimesOut",
+    "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds",
+  ],
+  "chain-binary": ["simd"]
+}
diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index d36696f39fe..184178307f9 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -48,10 +48,23 @@ jobs:
           docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
           docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
 
-  transfer-e2e:
+  transfer:
     needs: build-release-image
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
-    secrets: inherit
     with:
       docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
       test-suite: "transfer"
+
+  client:
+    needs: build-release-image
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
+      test-suite: "client"
+
+  incentivized-transfer:
+    needs: build-release-image
+    uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
+    with:
+      docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
+      test-suite: "incentivized-transfer"

From 63f4b05217d92076b851a4edfced78564b52da5b Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:47:29 +0100
Subject: [PATCH 16/19] chore: add determine docker tag to needs array

---
 .github/workflows/e2e-compatibility.yaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml
index 184178307f9..31a6c05319c 100644
--- a/.github/workflows/e2e-compatibility.yaml
+++ b/.github/workflows/e2e-compatibility.yaml
@@ -49,21 +49,27 @@ jobs:
           docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${{ needs.determine-docker-tag.outputs.docker-tag }}"
 
   transfer:
-    needs: build-release-image
+    needs:
+      - build-release-image
+      - determine-docker-tag
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
       test-suite: "transfer"
 
   client:
-    needs: build-release-image
+    needs:
+      - build-release-image
+      - determine-docker-tag
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"
       test-suite: "client"
 
   incentivized-transfer:
-    needs: build-release-image
+    needs:
+      - build-release-image
+      - determine-docker-tag
     uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml
     with:
       docker-tag: "${{ needs.determine-docker-tag.outputs.docker-tag }}"

From 3bb23c8789fd9b5eb05174dae0bc877a537480ac Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:56:35 +0100
Subject: [PATCH 17/19] chore: updated versions

---
 .../compatibility-test-matrices/release-v5.0.x/client.json  | 4 ++--
 .../release-v5.0.x/incentivized-transfer.json               | 6 +++---
 .../release-v5.0.x/transfer.json                            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x/client.json b/.github/compatibility-test-matrices/release-v5.0.x/client.json
index 02efdca2b31..01f6263e90a 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/client.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/client.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.4.0"],
-  "chain-b": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.4.0"],
+  "chain-a": ["release-v5.0.x", "v4.1.0", "v3.3.0", "v2.4.0"],
+  "chain-b": ["release-v5.0.x", "v4.1.0", "v3.3.0", "v2.4.0"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
     "TestClientUpdateProposal_Succeeds"
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
index 5c31b1ac432..de1ff382b61 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v5.0.x", "v4.0.0"],
-  "chain-b": ["release-v5.0.x", "v4.0.0"],
+  "chain-a": ["release-v5.0.x", "v4.1.0"],
+  "chain-b": ["release-v5.0.x", "v4.1.0"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
     "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",
@@ -8,7 +8,7 @@
     "TestMultiMsg_MsgPayPacketFeeSingleSender",
     "TestMsgPayPacketFee_SingleSender_TimesOut",
     "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
-    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds",
+    "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
   ],
   "chain-binary": ["simd"]
 }
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
index f00589f6f82..9aa06a41f88 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.1.0"],
-  "chain-b": ["release-v5.0.x", "v4.0.0", "v3.3.0", "v2.1.0"],
+  "chain-a": ["release-v5.0.x", "v4.1.0", "v3.3.0", "v2.4.0"],
+  "chain-b": ["release-v5.0.x", "v4.1.0", "v3.3.0", "v2.4.0"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

From 69eeeb8425836ae2709645faf7eb5c03a5f66d7a Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 16:58:08 +0100
Subject: [PATCH 18/19] chore: change from chain-a-tag to chain-a

---
 .github/workflows/e2e-compatibility-workflow-call.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml
index 8e51a7ea942..9aa82416c69 100644
--- a/.github/workflows/e2e-compatibility-workflow-call.yaml
+++ b/.github/workflows/e2e-compatibility-workflow-call.yaml
@@ -44,7 +44,7 @@ jobs:
         env:
           # each test has its own set of variables to specify which images are used.
           CHAIN_IMAGE: "${{ matrix.chain-image }}"
-          CHAIN_A_TAG: "${{ matrix.chain-a-tag }}"
-          CHAIN_B_TAG: "${{ matrix.chain-b-tag }}"
+          CHAIN_A_TAG: "${{ matrix.chain-a }}"
+          CHAIN_B_TAG: "${{ matrix.chain-b }}"
           CHAIN_BINARY: "${{ matrix.chain-binary }}"
           RLY_TAG: "v2.0.0"

From 1dc3c08cab02f171e70efc131e8fde9ee2155b5e Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Mon, 26 Sep 2022 17:09:16 +0100
Subject: [PATCH 19/19] chore: specify chain image in matrix

---
 .github/compatibility-test-matrices/release-v5.0.x/client.json | 3 ++-
 .../release-v5.0.x/incentivized-transfer.json                  | 3 ++-
 .../compatibility-test-matrices/release-v5.0.x/transfer.json   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/compatibility-test-matrices/release-v5.0.x/client.json b/.github/compatibility-test-matrices/release-v5.0.x/client.json
index 01f6263e90a..ee237c25cff 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/client.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/client.json
@@ -5,5 +5,6 @@
   "test": [
     "TestClientUpdateProposal_Succeeds"
   ],
-  "chain-binary": ["simd"]
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
 }
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
index de1ff382b61..f179a1683b2 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/incentivized-transfer.json
@@ -10,5 +10,6 @@
     "TestPayPacketFeeAsync_SingleSender_NoCounterPartyAddress",
     "TestMsgPayPacketFee_AsyncMultipleSenders_Succeeds"
   ],
-  "chain-binary": ["simd"]
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
 }
diff --git a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json b/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
index 9aa06a41f88..7779f9f29b0 100644
--- a/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
+++ b/.github/compatibility-test-matrices/release-v5.0.x/transfer.json
@@ -9,5 +9,6 @@
     "TestSendEnabledParam",
     "TestReceiveEnabledParam"
   ],
-  "chain-binary": ["simd"]
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
 }