From 1cb87182b87312b241dc2b50bb8ea37e344a640f Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Wed, 8 May 2024 10:42:52 -0700 Subject: [PATCH 1/4] deps(go): use cosmos/ibc-go v6.3.0 --- golang/cosmos/go.mod | 5 +---- golang/cosmos/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/golang/cosmos/go.mod b/golang/cosmos/go.mod index 5886cfc01a2..f5acd4f166a 100644 --- a/golang/cosmos/go.mod +++ b/golang/cosmos/go.mod @@ -8,7 +8,7 @@ require ( github.com/armon/go-metrics v0.4.1 github.com/cosmos/cosmos-sdk v0.46.16 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2 - github.com/cosmos/ibc-go/v6 v6.2.1 + github.com/cosmos/ibc-go/v6 v6.3.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 @@ -192,9 +192,6 @@ replace ( // Pick up an IAVL race fix. github.com/cosmos/iavl => github.com/cosmos/iavl v0.19.7 - // Async version negotiation - github.com/cosmos/ibc-go/v6 => github.com/agoric-labs/ibc-go/v6 v6.2.1-alpha.agoric.3 - // use cometbft // Use our fork at least until post-v0.34.14 is released with // https://github.com/tendermint/tendermint/issue/6899 resolved. diff --git a/golang/cosmos/go.sum b/golang/cosmos/go.sum index 51dc4b7c735..7b37370d704 100644 --- a/golang/cosmos/go.sum +++ b/golang/cosmos/go.sum @@ -236,8 +236,6 @@ github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.4 h1:i5IgChQjTyWulV/y5 github.com/agoric-labs/cosmos-sdk v0.46.16-alpha.agoric.2.4/go.mod h1:d7e4h+w7FNBNmE6ysp6duBVuQg67pqMtvsLwpT9ca3E= github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1 h1:2jvHI/2d+psWAZy6FQ0vXJCHUtfU3ZbbW+pQFL04arQ= github.com/agoric-labs/cosmos-sdk/ics23/go v0.8.0-alpha.agoric.1/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= -github.com/agoric-labs/ibc-go/v6 v6.2.1-alpha.agoric.3 h1:YqvVwK+Lg/ZsuwyVm9UbPs8K55fg00R3Y9KnmaTBdgc= -github.com/agoric-labs/ibc-go/v6 v6.2.1-alpha.agoric.3/go.mod h1:V9NOCRS9RPkSJNJQIPRAjZn/lo2mCAAKOSv3/83ISDY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -382,6 +380,8 @@ github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0= github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2 h1:Hz4nkpStoXIHrC77CIEyu2mRiN2qysGEZPFRf0fpv7w= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2/go.mod h1:Jo934o/sW7fNxuOa/TjCalSalz+1Fd649eLyANaJx8g= +github.com/cosmos/ibc-go/v6 v6.3.0 h1:2EkkqDEd9hTQvzB/BsPhYZsu7T/dzAVA8+VD2UuJLSQ= +github.com/cosmos/ibc-go/v6 v6.3.0/go.mod h1:Dm14j9s094bGyCEE8W4fD+2t8IneHv+cz+80Mvwjr1w= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw= From c320bf1df4b91d521335bba91b05956287b02003 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Wed, 8 May 2024 12:29:51 -0700 Subject: [PATCH 2/4] deps(go): remove dependency on ibc-go keeper --- golang/cosmos/x/vibc/types/ibc_module.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/golang/cosmos/x/vibc/types/ibc_module.go b/golang/cosmos/x/vibc/types/ibc_module.go index dd7d1be4b2a..861c4e966f7 100644 --- a/golang/cosmos/x/vibc/types/ibc_module.go +++ b/golang/cosmos/x/vibc/types/ibc_module.go @@ -7,7 +7,6 @@ import ( channeltypes "github.com/cosmos/ibc-go/v6/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types" host "github.com/cosmos/ibc-go/v6/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper" "github.com/cosmos/ibc-go/v6/modules/core/exported" @@ -19,7 +18,7 @@ const ( // asynchronous versions. If it does, then the VM must supply an empty // version string to indicate that the VM explicitly (possibly async) // performs the Write* method. - AsyncVersions = ibckeeper.AsyncVersionNegotiation + AsyncVersions = false ) var ( From 76841c6261f25cf0c46524ab6a0b4c316f3c9884 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Fri, 10 May 2024 10:10:18 -0700 Subject: [PATCH 3/4] chore(vibc): add a comment for more info about `AsyncVersions` --- golang/cosmos/x/vibc/types/ibc_module.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/golang/cosmos/x/vibc/types/ibc_module.go b/golang/cosmos/x/vibc/types/ibc_module.go index 861c4e966f7..b5abb322c0f 100644 --- a/golang/cosmos/x/vibc/types/ibc_module.go +++ b/golang/cosmos/x/vibc/types/ibc_module.go @@ -18,6 +18,8 @@ const ( // asynchronous versions. If it does, then the VM must supply an empty // version string to indicate that the VM explicitly (possibly async) // performs the Write* method. + // This flag is created in anticipation of ibc-go implementing async versions, + // see https://github.com/Agoric/agoric-sdk/issues/9358 for more details. AsyncVersions = false ) From b2a90ddef385201ae71b8d0201e5d01d6ac09e60 Mon Sep 17 00:00:00 2001 From: Luqi Pan Date: Tue, 14 May 2024 14:23:05 -0700 Subject: [PATCH 4/4] deps(go): bump cosmos/ibc-go to v6.3.1 --- golang/cosmos/go.mod | 2 +- golang/cosmos/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/golang/cosmos/go.mod b/golang/cosmos/go.mod index f5acd4f166a..b16f1dc3c13 100644 --- a/golang/cosmos/go.mod +++ b/golang/cosmos/go.mod @@ -8,7 +8,7 @@ require ( github.com/armon/go-metrics v0.4.1 github.com/cosmos/cosmos-sdk v0.46.16 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2 - github.com/cosmos/ibc-go/v6 v6.3.0 + github.com/cosmos/ibc-go/v6 v6.3.1 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 diff --git a/golang/cosmos/go.sum b/golang/cosmos/go.sum index 7b37370d704..149dced91a1 100644 --- a/golang/cosmos/go.sum +++ b/golang/cosmos/go.sum @@ -380,8 +380,8 @@ github.com/cosmos/iavl v0.19.7 h1:ij32FaEnwxfEurtK0QKDNhTWFnz6NUmrI5gky/WnoY0= github.com/cosmos/iavl v0.19.7/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2 h1:Hz4nkpStoXIHrC77CIEyu2mRiN2qysGEZPFRf0fpv7w= github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v6 v6.1.2/go.mod h1:Jo934o/sW7fNxuOa/TjCalSalz+1Fd649eLyANaJx8g= -github.com/cosmos/ibc-go/v6 v6.3.0 h1:2EkkqDEd9hTQvzB/BsPhYZsu7T/dzAVA8+VD2UuJLSQ= -github.com/cosmos/ibc-go/v6 v6.3.0/go.mod h1:Dm14j9s094bGyCEE8W4fD+2t8IneHv+cz+80Mvwjr1w= +github.com/cosmos/ibc-go/v6 v6.3.1 h1:/5ur3AsmNW8WuOevfODHlaY5Ze236PBNE3vVo9o3fQA= +github.com/cosmos/ibc-go/v6 v6.3.1/go.mod h1:Dm14j9s094bGyCEE8W4fD+2t8IneHv+cz+80Mvwjr1w= github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= github.com/cosmos/keyring v1.2.0/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw=