Merge branch 'main' into damian/1207-prune-consensus-state-on-dup-upd…

…ates
cosmos · Dec 22, 2022 · d076867 · d076867
2 parents 3ae3d47 + a89d5a7
commit d076867
Show file tree

Hide file tree

Showing 39 changed files with 54 additions and 52 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-tracker.md b/.github/ISSUE_TEMPLATE/release-tracker.md
@@ -42,7 +42,7 @@ versions of ibc-go to guarantee that no regression is introduced -->
 
 - [ ] Bump [go package version](https://github.com/cosmos/ibc-go/blob/main/go.mod#L3).
 - [ ] Change all imports starting with `github.com/cosmos/ibc-go/v{x}` to `github.com/cosmos/ibc-go/v{x+1}`.
-- [ ] Branch off main to create release branch in the form  of `release/vx.y.z`.
+- [ ] Branch off main to create release branch in the form  of `release/vx.y.z` and add branch protection rules.
 - [ ] Add branch protection rules to new release branch.
 - [ ] Add backport task to [`mergify.yml`](https://github.com/cosmos/ibc-go/blob/main/.github/mergify.yml)
 - [ ] Upgrade ibc-go version in [ibctest](https://github.com/strangelove-ventures/ibctest).

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
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v2.5.x"],
-  "chain-b": ["release-v2.5.x", "v6.0.0", "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": ["release-v2.5.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"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [
     "TestMsgTransfer_Succeeds_Nonincentivized",

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
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v2.5.x", "v6.0.0", "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": ["release-v2.5.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-v2.5.x"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

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

diff --git a/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.2.x/incentivized-transfer-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v4.2.x", "v6.0.0", "v5.1.0", "v5.0.1", "v4.1.1"],
+  "chain-a": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1"],
   "chain-b": ["release-v4.2.x"],
   "entrypoint": ["TestIncentivizedTransferTestSuite"],
   "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.0.0", "v5.1.0", "v5.0.1", "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", "v2.5.0", "v2.4.2"],
   "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.0.0", "v5.1.0", "v5.0.1", "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", "v2.5.0", "v2.4.2"],
   "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.0.0", "v5.1.0", "v5.0.1", "4.2.0", "v4.1.1"],
+  "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.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.0.0", "v5.1.0", "v5.0.1", "4.2.0", "v4.1.1"],
+  "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.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.0.0", "v5.1.0", "v5.0.1", "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", "4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "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.0.0", "v5.1.0", "v5.0.1", "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", "4.2.0", "v4.1.1", "v3.4.0", "v3.3.1", "v2.5.0", "v2.4.2"],
   "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.0.0", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.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.0.0", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "entrypoint": ["TestConnectionTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.0.0"],
+  "chain-b": ["release-v6.1.x", "v6.1.0"],
   "entrypoint": ["TestInterchainAccountsTestSuite"],
   "test": [
     "TestMsgSendTx_SuccessfulTransfer",

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.0.0"],
+  "chain-a": ["release-v6.1.x", "v6.1.0"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestInterchainAccountsTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-gov-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-gov-chain-a.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.0.0"],
+  "chain-a": ["release-v6.1.x", "v6.1.0"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestInterchainAccountsGovTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-gov-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-gov-chain-b.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.0.0"],
+  "chain-b": ["release-v6.1.x", "v6.1.0"],
   "entrypoint": ["TestInterchainAccountsGovTestSuite"],
   "test": [
     "TestInterchainAccountsGovIntegration"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-groups-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-groups-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.0.0"],
+  "chain-b": ["release-v6.1.x", "v6.1.0"],
   "entrypoint": ["TestInterchainAccountsGroupsTestSuite"],
   "test": [
     "TestInterchainAccountsGroupsIntegration"

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/ica-groups-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/ica-groups-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.0.0"],
+  "chain-a": ["release-v6.1.x", "v6.1.0"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestInterchainAccountsGroupsTestSuite"],
   "test": [

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/incentivized-ica-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/incentivized-ica-chain-a.json
@@ -1,6 +1,6 @@
 {
   "chain-a": ["release-v6.1.x"],
-  "chain-b": ["release-v6.1.x", "v6.0.0"],
+  "chain-b": ["release-v6.1.x", "v6.1.0"],
   "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"],
   "test": [
     "TestMsgSendTx_SuccessfulBankSend_Incentivized",

diff --git a/.github/compatibility-test-matrices/release-v6.1.x/incentivized-ica-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/incentivized-ica-chain-b.json
@@ -1,5 +1,5 @@
 {
-  "chain-a": ["release-v6.1.x", "v6.0.0"],
+  "chain-a": ["release-v6.1.x", "v6.1.0"],
   "chain-b": ["release-v6.1.x"],
   "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"],
   "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.0.0", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.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.0.0", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"],
+  "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.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.0.0", "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": ["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"],
   "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.0.0", "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": ["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"],
   "entrypoint": ["TestTransferTestSuite"],
   "test": [

diff --git a/.github/workflows/e2e-manual-icad.yaml b/.github/workflows/e2e-manual-icad.yaml
@@ -25,8 +25,8 @@ on:
         default: master
         options:
           - master
-          - v0.4.2
-          - v0.3.5
+          - v0.4.3
+          - v0.3.6
           - v0.2.5
           - v0.1.7
       chain-b-tag:
@@ -36,8 +36,8 @@ on:
         type: choice
         options:
           - master
-          - v0.4.2
-          - v0.3.5
+          - v0.4.3
+          - v0.3.6
           - v0.2.5
           - v0.1.7
       relayer-tag:

diff --git a/.github/workflows/e2e-manual-simd.yaml b/.github/workflows/e2e-manual-simd.yaml
@@ -29,9 +29,8 @@ on:
         default: main
         options:
           - main
-          - v6.0.0
-          - v5.1.0
-          - v5.0.1
+          - v6.1.0
+          - v5.2.0
           - v4.2.0
           - v4.1.1
           - v3.4.0
@@ -45,9 +44,8 @@ on:
         type: choice
         options:
           - main
-          - v6.0.0
-          - v5.1.0
-          - v5.0.1
+          - v6.1.0
+          - v5.2.0
           - v4.2.0
           - v4.1.1
           - v3.4.0

diff --git a/RELEASES.md b/RELEASES.md
@@ -71,9 +71,8 @@ Only the following major release series have a stable release status:
 |`v3.4.x`|March 15, 2023|
 |`v4.1.x`|August 12, 2023|
 |`v4.2.x`|August 12, 2023|
-|`v5.0.x`|September 28, 2023|
-|`v5.1.x`|September 28, 2023|
-|`v6.0.x`|December 09, 2023|
+|`v5.2.x`|September 28, 2023|
+|`v6.1.x`|December 09, 2023|
 
 All missing minor release versions have been discontinued.
 
@@ -110,9 +109,8 @@ Versions of Golang, Cosmos SDK and Tendermint used by ibc-go in the currently ac
 | 1.18 | v3.4.0 | v0.45.10 | v0.34.22 |
 | 1.18 | v4.1.1 | v0.45.10 | v0.34.22 |
 | 1.18 | v4.2.0 | v0.45.10 | v0.34.22 |
-| 1.18 | v5.0.1 | v0.46.3 | v0.34.22 |
-| 1.18 | v5.1.0 | v0.46.4 | v0.34.22 |
-| 1.18 | v6.0.0 | v0.46.6 | v0.34.23 |
+| 1.18 | v5.2.0 | v0.46.7 | v0.34.24 |
+| 1.18 | v6.1.0 | v0.46.7 | v0.34.24 |
 
 ## Graphics
 

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -149,8 +149,12 @@ module.exports = {
         key: "v5.1.0",
       },
       {
-        label: "v6.0.0",
-        key: "v6.0.0",
+        label: "v5.2.0",
+        key: "v5.2.0",
+      },
+      {
+        label: "v6.1.0",
+        key: "v6.1.0",
       },
     ],
     topbar: {

diff --git a/docs/roadmap/roadmap.md b/docs/roadmap/roadmap.md
@@ -22,7 +22,7 @@ Follow the progress with the [beta](https://github.com/cosmos/ibc-go/milestone/2
 
 Follow the progress with the [milestone](https://github.com/cosmos/ibc-go/milestone/36).
 
-### `authz` support to 20-transfer
+### Add `authz` support to 20-transfer
 
 See [this issue](https://github.com/cosmos/ibc-go/issues/2431) for more details.
 

diff --git a/docs/versions b/docs/versions
@@ -1,4 +1,6 @@
+release/v6.1.x v6.1.0
 release/v6.0.x v6.0.0
+release/v5.2.x v5.2.0
 release/v5.1.x v5.1.0
 release/v5.0.x v5.0.0
 release/v4.2.x v4.2.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,9 +29,8 @@ on: @@
             default: main
             options:
               - main
-              - v6.0.0
-              - v5.1.0
-              - v5.0.1
+              - v6.1.0
+              - v5.2.0
               - v4.2.0
               - v4.1.1
               - v3.4.0
@@ Expand All / @@ -45,9 +44,8 @@ on: @@
             type: choice
             options:
               - main
-              - v6.0.0
-              - v5.1.0
-              - v5.0.1
+              - v6.1.0
+              - v5.2.0
               - v4.2.0
               - v4.1.1
               - v3.4.0
@@ Expand Down @@