Merge branch 'main' into aleem/2894-fee-queries-pagination

cosmos · Feb 8, 2023 · 0e0d32c · 0e0d32c
2 parents 2752d52 + cb41315
commit 0e0d32c
Show file tree

Hide file tree

Showing 127 changed files with 2,321 additions and 568 deletions.
diff --git a/.github/compatibility-test-matrices/main/client-chain-a.json b/.github/compatibility-test-matrices/main/client-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["main"],
-  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
     "TestClientUpdateProposal_Succeeds"

diff --git a/.github/compatibility-test-matrices/main/client-chain-b.json b/.github/compatibility-test-matrices/main/client-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["main"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/main/connection-chain-a.json b/.github/compatibility-test-matrices/main/connection-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["main"],
-  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
     "TestMaxExpectedTimePerBlockParam"

diff --git a/.github/compatibility-test-matrices/main/connection-chain-b.json b/.github/compatibility-test-matrices/main/connection-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["main"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/main/transfer-chain-a.json b/.github/compatibility-test-matrices/main/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["main"],
-  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/main/transfer-chain-b.json b/.github/compatibility-test-matrices/main/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["main"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-a.json
diff --git a/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v2.5.x/transfer-chain-b.json
diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v3.4.x"],
-  "chain-b": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v3.4.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v4.2.x"],
-  "chain-b": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v4.2.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v4.3.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v4.3.x/incentivized-transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v4.3.x"],
-  "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "4.2.0", "v4.1.1"],
+  "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
     "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",

diff --git a/.github/compatibility-test-matrices/release-v4.3.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.3.x/incentivized-transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "4.2.0", "v4.1.1"],
+  "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "4.2.0", "v4.1.1"],
   "chain-b": ["release-v4.3.x"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v4.3.x"],
-  "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v4.3.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v5.2.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v5.2.x/incentivized-transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v5.2.x"],
-  "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
     "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",

diff --git a/.github/compatibility-test-matrices/release-v5.2.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.2.x/incentivized-transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "chain-b": ["release-v5.2.x"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v5.2.x"],
-  "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v5.2.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
     "TestClientUpdateProposal_Succeeds"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
     "TestMaxExpectedTimePerBlockParam"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/incentivized-transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
     "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/incentivized-transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v7.0.x"],
-  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
     "TestClientUpdateProposal_Succeeds"

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v7.0.x"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v7.0.x"],
-  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
     "TestMaxExpectedTimePerBlockParam"

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v7.0.x"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v7.0.x"],
-  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [
     "TestMsgPayPacketFee_AsyncSingleSender_Succeeds",

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"],
   "chain-b": ["release-v7.0.x"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json
@@ -0,0 +1,11 @@
+{
+  "chain-a": ["release-v7.0.x"],
+  "chain-b": ["release-v7.0.x"],
+  "entrypoint": ["TestAuthzTransferTestSuite"],
+  "test": [
+    "TestAuthz_MsgTransfer_Succeeds",
+    "TestAuthz_InvalidTransferAuthorizations"
+  ],
+  "chain-binary": ["simd"],
+  "chain-image": ["ghcr.io/cosmos/ibc-go-simd"]
+}
diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v7.0.x"],
-  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
+  "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"],
   "chain-b": ["release-v7.0.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/unreleased/client.json b/.github/compatibility-test-matrices/unreleased/client.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
-  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
+  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"],
+  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"],
   "entrypoint": ["TestClientTestSuite"],
   "test": [
     "TestClientUpdateProposal_Succeeds"

diff --git a/.github/compatibility-test-matrices/unreleased/connection.json b/.github/compatibility-test-matrices/unreleased/connection.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
-  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
+  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"],
+  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [
     "TestMaxExpectedTimePerBlockParam"

diff --git a/.github/compatibility-test-matrices/unreleased/transfer.json b/.github/compatibility-test-matrices/unreleased/transfer.json
@@ -1,6 +1,6 @@
 {
-  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
-  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x", "release-v2.5.x"],
+  "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x"],
+  "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -18,22 +18,6 @@ pull_request_rules:
         commit_message_template: |
            {{ title }} (#{{ number }})
            {{ body }}
-  - name: backport patches to v2.4.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v2.4.x
-    actions:
-      backport:
-        branches:
-          - release/v2.4.x
-  - name: backport patches to v2.5.x branch
-    conditions:
-      - base=main
-      - label=backport-to-v2.5.x
-    actions:
-      backport:
-        branches:
-          - release/v2.5.x
   - name: backport patches to v3.3.x branch
     conditions:
       - base=main

diff --git a/.github/workflows/build-simd-image-from-tag.yml b/.github/workflows/build-simd-image-from-tag.yml
@@ -6,6 +6,10 @@ on:
         description: 'The tag of the image to build'
         required: true
         type: string
+      ibc-go-version:
+        description: 'The ibc-go version to be added as a label'
+        required: true
+        type: string
 
 env:
    REGISTRY: ghcr.io
@@ -27,11 +31,9 @@ jobs:
               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: |
             # remove any `/` characters from the docker tag and replace them with a -
             docker_tag="$(echo $GIT_TAG | sed 's/\//-/')"
-            docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${docker_tag}"
+            docker build . -t "${REGISTRY}/${ORG}/${IMAGE_NAME}:${docker_tag}" --build-arg IBC_GO_VERSION=${{ inputs.ibc-go-version }}
             docker push "${REGISTRY}/${ORG}/${IMAGE_NAME}:${docker_tag}"