From 614ea4dd6f6ee05cf4a76f7a6377c2229237e7d1 Mon Sep 17 00:00:00 2001 From: justintieri Date: Mon, 25 Jul 2022 13:06:54 -0500 Subject: [PATCH 1/3] fix `ibctest` bug & bump dependencies to kill namespace contention in ibc-go --- _test/relayer_chain_test.go | 8 +++--- _test/test_queries.go | 4 +-- cmd/query.go | 2 +- cmd/tx.go | 4 +-- go.mod | 26 +++++++++---------- go.sum | 14 +++++----- helpers/query.go | 2 +- ibctest/go.mod | 3 +-- ibctest/go.sum | 6 ++--- ibctest/relayer_factory.go | 4 +-- relayer/chain.go | 2 +- .../chains/cosmos/cosmos_chain_processor.go | 6 ++--- relayer/chains/cosmos/event_parser.go | 6 ++--- relayer/chains/cosmos/event_parser_test.go | 6 ++--- relayer/chains/cosmos/log.go | 4 +-- relayer/chains/cosmos/message_handlers.go | 4 +-- relayer/chains/cosmos/msg.go | 2 +- relayer/chains/cosmos/provider.go | 2 +- relayer/chains/cosmos/query.go | 16 ++++++------ relayer/chains/cosmos/relayer_packets.go | 4 +-- relayer/chains/cosmos/tx.go | 16 ++++++------ relayer/chains/mock/message_handlers.go | 2 +- relayer/chains/mock/mock_chain_processor.go | 2 +- .../chains/mock/mock_chain_processor_test.go | 4 +-- relayer/channel.go | 4 +-- relayer/client.go | 4 +-- relayer/connection.go | 2 +- relayer/events.go | 6 ++--- relayer/ics24.go | 2 +- relayer/log-chain.go | 4 +-- relayer/naive-strategy.go | 4 +-- relayer/packet-tx.go | 6 ++--- relayer/path.go | 4 +-- relayer/pathEnd.go | 4 +-- relayer/pathEnd_test.go | 5 ++-- relayer/processor/path_end_runtime.go | 4 +-- relayer/processor/path_processor_internal.go | 4 +-- relayer/processor/types.go | 2 +- relayer/provider/matcher.go | 6 ++--- relayer/provider/provider.go | 10 +++---- relayer/query.go | 10 +++---- relayer/strategies.go | 2 +- relayer/strategies_test.go | 2 +- 43 files changed, 115 insertions(+), 119 deletions(-) diff --git a/_test/relayer_chain_test.go b/_test/relayer_chain_test.go index 7b2c08b1f..045f18ebe 100644 --- a/_test/relayer_chain_test.go +++ b/_test/relayer_chain_test.go @@ -8,10 +8,10 @@ import ( "github.com/avast/retry-go/v4" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" - ibctesting "github.com/cosmos/ibc-go/v3/testing" - ibctestingmock "github.com/cosmos/ibc-go/v3/testing/mock" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + tmclient "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" + ibctesting "github.com/cosmos/ibc-go/v4/testing" + ibctestingmock "github.com/cosmos/ibc-go/v4/testing/mock" "github.com/cosmos/relayer/v2/cmd" "github.com/cosmos/relayer/v2/relayer" "github.com/stretchr/testify/require" diff --git a/_test/test_queries.go b/_test/test_queries.go index 6cadab995..f5f016ae5 100644 --- a/_test/test_queries.go +++ b/_test/test_queries.go @@ -6,8 +6,8 @@ import ( "time" "github.com/avast/retry-go/v4" - clientypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clientypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer" "github.com/stretchr/testify/require" ) diff --git a/cmd/query.go b/cmd/query.go index f1c766420..cef342da8 100644 --- a/cmd/query.go +++ b/cmd/query.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/helpers" "github.com/cosmos/relayer/v2/relayer" "github.com/spf13/cobra" diff --git a/cmd/tx.go b/cmd/tx.go index 315ce59c9..b74b79e29 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -7,8 +7,8 @@ import ( "github.com/avast/retry-go/v4" sdk "github.com/cosmos/cosmos-sdk/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v3/modules/core/exported" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/relayer" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/go.mod b/go.mod index 8187e57ca..1eaf3dd88 100644 --- a/go.mod +++ b/go.mod @@ -2,30 +2,27 @@ module github.com/cosmos/relayer/v2 go 1.18 -require ( - github.com/cosmos/cosmos-sdk v0.45.5-0.20220523154235-2921a1c3c918 - github.com/gogo/protobuf v1.3.3 - github.com/gorilla/mux v1.8.0 // indirect - github.com/spf13/cobra v1.5.0 - github.com/spf13/viper v1.12.0 - github.com/stretchr/testify v1.8.0 - github.com/tendermint/tendermint v0.34.20-0.20220517115723-e6f071164839 - golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 - gopkg.in/yaml.v3 v3.0.1 -) - require ( github.com/avast/retry-go/v4 v4.1.0 github.com/cespare/permute/v2 v2.0.0-beta2 - github.com/cosmos/ibc-go/v3 v3.0.0 + github.com/cosmos/cosmos-sdk v0.45.6 + github.com/cosmos/ibc-go/v4 v4.0.0-rc0 + github.com/gogo/protobuf v1.3.3 github.com/google/go-cmp v0.5.8 github.com/google/go-github/v43 v43.0.0 + github.com/gorilla/mux v1.8.0 // indirect github.com/jsternberg/zap-logfmt v1.2.0 github.com/ory/dockertest/v3 v3.9.1 - github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c + github.com/spf13/cobra v1.5.0 + github.com/spf13/viper v1.12.0 + github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce + github.com/stretchr/testify v1.8.0 + github.com/tendermint/tendermint v0.34.20-0.20220517115723-e6f071164839 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.21.0 + golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -71,6 +68,7 @@ require ( github.com/ethereum/go-ethereum v1.10.16 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/gin-gonic/gin v1.7.0 // indirect github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect diff --git a/go.sum b/go.sum index b436e7aff..38df2e71f 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.45.5-0.20220523154235-2921a1c3c918 h1:adHQCXXYYLO+VxH9aSifiKofXwOwRUBx0lxny5fKQCg= -github.com/cosmos/cosmos-sdk v0.45.5-0.20220523154235-2921a1c3c918/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc= +github.com/cosmos/cosmos-sdk v0.45.6 h1:bnYLOcDp0cKWMLeUTTJIttq6xxRep52ulPxXC3BCfuQ= +github.com/cosmos/cosmos-sdk v0.45.6/go.mod h1:bPeeVMEtVvH3y3xAGHVbK+/CZlpaazzh77hG8ZrcJpI= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -278,8 +278,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= +github.com/cosmos/ibc-go/v4 v4.0.0-rc0 h1:zeMr6PNE7L300AcGkrMwRvtp62/RpGc7qU1LwhUcPKc= +github.com/cosmos/ibc-go/v4 v4.0.0-rc0/go.mod h1:4LK+uPycPhebJrJ8ebIqvsMEZ0lVRVNTiEyeI9zfB0U= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= @@ -400,6 +400,7 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU= +github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= @@ -431,6 +432,7 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -1087,8 +1089,8 @@ github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiu github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= -github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c h1:ysHIxIZ7B4HpheB+FKCn+zjsiqUx8tBdCTFf8AmTPuE= -github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c/go.mod h1:d0CKf16Z7Us9ZpVSMNZJOIjS3GLowlo6b6EAT8B+0h8= +github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce h1:k038VBr6H7VX2Jr+oOp7smHJtEvmabB2lqxajTDra9A= +github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce/go.mod h1:wYyOIBMBJC2GW5Wl6f/tnQyeicEVsgyLctHKo+/zg4I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= diff --git a/helpers/query.go b/helpers/query.go index abda6fbc8..d4326416d 100644 --- a/helpers/query.go +++ b/helpers/query.go @@ -6,7 +6,7 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/relayer" ) diff --git a/ibctest/go.mod b/ibctest/go.mod index d9f0ca148..a9a16d267 100644 --- a/ibctest/go.mod +++ b/ibctest/go.mod @@ -37,7 +37,6 @@ require ( github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.17.3 // indirect - github.com/cosmos/ibc-go/v3 v3.0.0 // indirect github.com/cosmos/ibc-go/v4 v4.0.0-rc0 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect @@ -118,7 +117,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.12.0 // indirect - github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c // indirect + github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce // indirect github.com/subosito/gotenv v1.3.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tendermint/btcd v0.1.1 // indirect diff --git a/ibctest/go.sum b/ibctest/go.sum index 39e6164c7..b4ea6dacf 100644 --- a/ibctest/go.sum +++ b/ibctest/go.sum @@ -411,8 +411,6 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.0.0 h1:XUNplHVS51Q2gMnTFsFsH9QJ7flsovMamnltKbEgPQ4= -github.com/cosmos/ibc-go/v3 v3.0.0/go.mod h1:Mb+1NXiPOLd+CPFlOC6BKeAUaxXlhuWenMmRiUiSmwY= github.com/cosmos/ibc-go/v4 v4.0.0-rc0 h1:zeMr6PNE7L300AcGkrMwRvtp62/RpGc7qU1LwhUcPKc= github.com/cosmos/ibc-go/v4 v4.0.0-rc0/go.mod h1:4LK+uPycPhebJrJ8ebIqvsMEZ0lVRVNTiEyeI9zfB0U= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= @@ -1303,8 +1301,8 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/strangelove-ventures/ibctest v0.0.0-20220722174333-fef71f837b13 h1:N0yc7mtEkibAnHusTLMH5oCJhYsRwgzxSpqUdxVkC8o= github.com/strangelove-ventures/ibctest v0.0.0-20220722174333-fef71f837b13/go.mod h1:aWBeEKU4lGfvJ9qO543zJbQGtB2fK2ffrJh6jbtowEM= -github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c h1:ysHIxIZ7B4HpheB+FKCn+zjsiqUx8tBdCTFf8AmTPuE= -github.com/strangelove-ventures/lens v0.5.2-0.20220713232429-0763782f847c/go.mod h1:d0CKf16Z7Us9ZpVSMNZJOIjS3GLowlo6b6EAT8B+0h8= +github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce h1:k038VBr6H7VX2Jr+oOp7smHJtEvmabB2lqxajTDra9A= +github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce/go.mod h1:wYyOIBMBJC2GW5Wl6f/tnQyeicEVsgyLctHKo+/zg4I= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= diff --git a/ibctest/relayer_factory.go b/ibctest/relayer_factory.go index 4ec484215..d86e67b30 100644 --- a/ibctest/relayer_factory.go +++ b/ibctest/relayer_factory.go @@ -19,11 +19,9 @@ func (RelayerFactory) Build( t *testing.T, _ *client.Client, networkID string, - home string, ) ibc.Relayer { r := &Relayer{ - t: t, - home: home, + t: t, } res := r.sys().Run(zaptest.NewLogger(t), "config", "init") diff --git a/relayer/chain.go b/relayer/chain.go index 3aa00c730..216fe2c17 100644 --- a/relayer/chain.go +++ b/relayer/chain.go @@ -8,7 +8,7 @@ import ( "time" "github.com/avast/retry-go/v4" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index e4cd3fcd4..62ce58b67 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -7,9 +7,9 @@ import ( "time" "github.com/avast/retry-go/v4" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" ctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/relayer/chains/cosmos/event_parser.go b/relayer/chains/cosmos/event_parser.go index a51cacc83..d96a8061d 100644 --- a/relayer/chains/cosmos/event_parser.go +++ b/relayer/chains/cosmos/event_parser.go @@ -6,9 +6,9 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" abci "github.com/tendermint/tendermint/abci/types" "go.uber.org/zap" diff --git a/relayer/chains/cosmos/event_parser_test.go b/relayer/chains/cosmos/event_parser_test.go index 966d30f96..f7abe39fc 100644 --- a/relayer/chains/cosmos/event_parser_test.go +++ b/relayer/chains/cosmos/event_parser_test.go @@ -5,9 +5,9 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" diff --git a/relayer/chains/cosmos/log.go b/relayer/chains/cosmos/log.go index ae0bbab6c..2407d0fbc 100644 --- a/relayer/chains/cosmos/log.go +++ b/relayer/chains/cosmos/log.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" typestx "github.com/cosmos/cosmos-sdk/types/tx" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/relayer/chains/cosmos/message_handlers.go b/relayer/chains/cosmos/message_handlers.go index 78af99e71..a1db03039 100644 --- a/relayer/chains/cosmos/message_handlers.go +++ b/relayer/chains/cosmos/message_handlers.go @@ -1,8 +1,8 @@ package cosmos import ( - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" diff --git a/relayer/chains/cosmos/msg.go b/relayer/chains/cosmos/msg.go index f5a418da5..b49c84aaa 100644 --- a/relayer/chains/cosmos/msg.go +++ b/relayer/chains/cosmos/msg.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/gogo/protobuf/proto" "go.uber.org/zap/zapcore" diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 466d703f6..c1d455b35 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/types/module" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/gogo/protobuf/proto" lens "github.com/strangelove-ventures/lens/client" diff --git a/relayer/chains/cosmos/query.go b/relayer/chains/cosmos/query.go index e7f62a84b..d6a657c18 100644 --- a/relayer/chains/cosmos/query.go +++ b/relayer/chains/cosmos/query.go @@ -16,14 +16,14 @@ import ( bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" - tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + tmclient "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" "github.com/cosmos/relayer/v2/relayer/provider" abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" diff --git a/relayer/chains/cosmos/relayer_packets.go b/relayer/chains/cosmos/relayer_packets.go index 4e471902e..fd175a709 100644 --- a/relayer/chains/cosmos/relayer_packets.go +++ b/relayer/chains/cosmos/relayer_packets.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" ) diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index 68710716e..b46cf62c9 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -14,14 +14,14 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" - tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + tmclient "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/tendermint/tendermint/light" tmtypes "github.com/tendermint/tendermint/types" diff --git a/relayer/chains/mock/message_handlers.go b/relayer/chains/mock/message_handlers.go index ab0281906..d99b100f7 100644 --- a/relayer/chains/mock/message_handlers.go +++ b/relayer/chains/mock/message_handlers.go @@ -3,7 +3,7 @@ package mock import ( "fmt" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" diff --git a/relayer/chains/mock/mock_chain_processor.go b/relayer/chains/mock/mock_chain_processor.go index 5ed321464..04e8c096b 100644 --- a/relayer/chains/mock/mock_chain_processor.go +++ b/relayer/chains/mock/mock_chain_processor.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "go.uber.org/zap" ) diff --git a/relayer/chains/mock/mock_chain_processor_test.go b/relayer/chains/mock/mock_chain_processor_test.go index 8442662b4..677011807 100644 --- a/relayer/chains/mock/mock_chain_processor_test.go +++ b/relayer/chains/mock/mock_chain_processor_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/chains/mock" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/stretchr/testify/require" diff --git a/relayer/channel.go b/relayer/channel.go index c134e34a5..cad7b8d70 100644 --- a/relayer/channel.go +++ b/relayer/channel.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" diff --git a/relayer/client.go b/relayer/client.go index ed88fe42c..0b1d3f111 100644 --- a/relayer/client.go +++ b/relayer/client.go @@ -6,8 +6,8 @@ import ( "time" "github.com/avast/retry-go/v4" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/relayer/connection.go b/relayer/connection.go index 2934cbdec..ef39e7d59 100644 --- a/relayer/connection.go +++ b/relayer/connection.go @@ -4,7 +4,7 @@ import ( "context" "time" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" diff --git a/relayer/events.go b/relayer/events.go index 8a6be1e39..0d7f655b9 100644 --- a/relayer/events.go +++ b/relayer/events.go @@ -3,9 +3,9 @@ package relayer import ( "fmt" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" ) diff --git a/relayer/ics24.go b/relayer/ics24.go index 898721991..20b6c6280 100644 --- a/relayer/ics24.go +++ b/relayer/ics24.go @@ -3,7 +3,7 @@ package relayer import ( "fmt" - host "github.com/cosmos/ibc-go/v3/modules/core/24-host" + host "github.com/cosmos/ibc-go/v4/modules/core/24-host" ) // Vclient validates the client identifier in the path diff --git a/relayer/log-chain.go b/relayer/log-chain.go index 7994e77db..5b30a0f57 100644 --- a/relayer/log-chain.go +++ b/relayer/log-chain.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" ) func logFailedTx(log *zap.Logger, chainID string, res *provider.RelayerTxResponse, err error, msgs []provider.RelayerMessage) { diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index cccec9f2d..993b710f5 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/avast/retry-go/v4" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/relayer/packet-tx.go b/relayer/packet-tx.go index 589058dfa..825e3e6d2 100644 --- a/relayer/packet-tx.go +++ b/relayer/packet-tx.go @@ -6,9 +6,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/path.go b/relayer/path.go index 0b686329e..90a88c6af 100644 --- a/relayer/path.go +++ b/relayer/path.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3" ) diff --git a/relayer/pathEnd.go b/relayer/pathEnd.go index 90822988e..f6a8064b5 100644 --- a/relayer/pathEnd.go +++ b/relayer/pathEnd.go @@ -3,8 +3,8 @@ package relayer import ( "strings" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + commitmenttypes "github.com/cosmos/ibc-go/v4/modules/core/23-commitment/types" ) // TODO double check that these are okay diff --git a/relayer/pathEnd_test.go b/relayer/pathEnd_test.go index ef514207f..285480232 100644 --- a/relayer/pathEnd_test.go +++ b/relayer/pathEnd_test.go @@ -1,9 +1,10 @@ package relayer import ( - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - "github.com/stretchr/testify/require" "testing" + + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + "github.com/stretchr/testify/require" ) func TestOrderFromString(t *testing.T) { diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go index 453a217bb..e17037c0d 100644 --- a/relayer/processor/path_end_runtime.go +++ b/relayer/processor/path_end_runtime.go @@ -3,8 +3,8 @@ package processor import ( "context" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" ) diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index c247bcd11..4fb8cd22f 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/relayer/processor/types.go b/relayer/processor/types.go index 0f01516eb..bad80b893 100644 --- a/relayer/processor/types.go +++ b/relayer/processor/types.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap/zapcore" ) diff --git a/relayer/provider/matcher.go b/relayer/provider/matcher.go index 2e5888a1b..fba6fbbe4 100644 --- a/relayer/provider/matcher.go +++ b/relayer/provider/matcher.go @@ -6,9 +6,9 @@ import ( "reflect" "time" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" - tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + tmclient "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" ) // ClientsMatch will check the type of an existing light client on the src chain, tracking the dst chain, and run diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index 98380da8a..c868578dc 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -6,11 +6,11 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" + transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" "github.com/gogo/protobuf/proto" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/relayer/query.go b/relayer/query.go index e4a3644f2..3d9eaa1e3 100644 --- a/relayer/query.go +++ b/relayer/query.go @@ -7,11 +7,11 @@ import ( "github.com/avast/retry-go/v4" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" - conntypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" - tmclient "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types" + clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types" + conntypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v4/modules/core/exported" + tmclient "github.com/cosmos/ibc-go/v4/modules/light-clients/07-tendermint/types" "github.com/cosmos/relayer/v2/relayer/provider" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/relayer/strategies.go b/relayer/strategies.go index c10e2fdf9..f418d891c 100644 --- a/relayer/strategies.go +++ b/relayer/strategies.go @@ -9,7 +9,7 @@ import ( "time" "github.com/avast/retry-go/v4" - "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/processor" "github.com/cosmos/relayer/v2/relayer/provider" diff --git a/relayer/strategies_test.go b/relayer/strategies_test.go index 908df84b8..443e38fd7 100644 --- a/relayer/strategies_test.go +++ b/relayer/strategies_test.go @@ -3,7 +3,7 @@ package relayer import ( "testing" - chantypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" + chantypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types" "github.com/stretchr/testify/require" ) From 11d85de9fc4a1f6cd7191ca975f6fb7eed8f9d06 Mon Sep 17 00:00:00 2001 From: justintieri Date: Mon, 25 Jul 2022 13:32:27 -0500 Subject: [PATCH 2/3] bump lens version --- go.mod | 2 +- go.sum | 4 ++-- ibctest/go.mod | 2 +- ibctest/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1eaf3dd88..48d60f0d6 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/ory/dockertest/v3 v3.9.1 github.com/spf13/cobra v1.5.0 github.com/spf13/viper v1.12.0 - github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce + github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6 github.com/stretchr/testify v1.8.0 github.com/tendermint/tendermint v0.34.20-0.20220517115723-e6f071164839 go.uber.org/multierr v1.8.0 diff --git a/go.sum b/go.sum index 38df2e71f..8412c915e 100644 --- a/go.sum +++ b/go.sum @@ -1089,8 +1089,8 @@ github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiu github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU= -github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce h1:k038VBr6H7VX2Jr+oOp7smHJtEvmabB2lqxajTDra9A= -github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce/go.mod h1:wYyOIBMBJC2GW5Wl6f/tnQyeicEVsgyLctHKo+/zg4I= +github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6 h1:zqc+cBHJn1YD/G0MK40jYnQJi6qWzJgNVjVcTeb8WjQ= +github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6/go.mod h1:nJkqTtTKgLUM4nEUJKABNVLzQ+y9u6XhDYMHNn93HjQ= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= diff --git a/ibctest/go.mod b/ibctest/go.mod index a9a16d267..8532cc0ce 100644 --- a/ibctest/go.mod +++ b/ibctest/go.mod @@ -117,7 +117,7 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.12.0 // indirect - github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce // indirect + github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6 // indirect github.com/subosito/gotenv v1.3.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tendermint/btcd v0.1.1 // indirect diff --git a/ibctest/go.sum b/ibctest/go.sum index b4ea6dacf..f85a72c87 100644 --- a/ibctest/go.sum +++ b/ibctest/go.sum @@ -1301,8 +1301,8 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/strangelove-ventures/ibctest v0.0.0-20220722174333-fef71f837b13 h1:N0yc7mtEkibAnHusTLMH5oCJhYsRwgzxSpqUdxVkC8o= github.com/strangelove-ventures/ibctest v0.0.0-20220722174333-fef71f837b13/go.mod h1:aWBeEKU4lGfvJ9qO543zJbQGtB2fK2ffrJh6jbtowEM= -github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce h1:k038VBr6H7VX2Jr+oOp7smHJtEvmabB2lqxajTDra9A= -github.com/strangelove-ventures/lens v0.5.2-0.20220725175804-9dc4e1b811ce/go.mod h1:wYyOIBMBJC2GW5Wl6f/tnQyeicEVsgyLctHKo+/zg4I= +github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6 h1:zqc+cBHJn1YD/G0MK40jYnQJi6qWzJgNVjVcTeb8WjQ= +github.com/strangelove-ventures/lens v0.5.2-0.20220725181212-615bf7a39fe6/go.mod h1:nJkqTtTKgLUM4nEUJKABNVLzQ+y9u6XhDYMHNn93HjQ= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= From bc22bcadb32c5fa88960f37925ca2c69c5139a56 Mon Sep 17 00:00:00 2001 From: justintieri Date: Mon, 25 Jul 2022 14:06:03 -0500 Subject: [PATCH 3/3] fix failing conformance tests --- ibctest/relayer_factory.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ibctest/relayer_factory.go b/ibctest/relayer_factory.go index d86e67b30..a1dbf8ad7 100644 --- a/ibctest/relayer_factory.go +++ b/ibctest/relayer_factory.go @@ -21,7 +21,8 @@ func (RelayerFactory) Build( networkID string, ) ibc.Relayer { r := &Relayer{ - t: t, + t: t, + home: t.TempDir(), } res := r.sys().Run(zaptest.NewLogger(t), "config", "init")