From 53542f6615e8c30b1dc289e2c4cf68d9a57dd891 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Tue, 4 Apr 2023 20:06:30 +0700 Subject: [PATCH 1/3] use ibc v4.3.0 --- go.mod | 17 +++++++---------- go.sum | 4 ++-- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9cf6f6c8db..56d500440e 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,18 @@ module github.com/cosmos/interchain-security go 1.18 require ( - github.com/cosmos/cosmos-sdk v0.45.11 + github.com/confio/ics23/go v0.9.0 + github.com/cosmos/cosmos-sdk v0.45.12 + github.com/cosmos/ibc-go/v4 v4.3.0 github.com/gogo/protobuf v1.3.3 + github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/kylelemons/godebug v1.1.0 + github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 github.com/rakyll/statik v0.1.7 + github.com/regen-network/cosmos-proto v0.3.1 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 @@ -18,6 +23,7 @@ require ( github.com/tendermint/tm-db v0.6.7 github.com/tidwall/gjson v1.14.4 golang.org/x/crypto v0.5.0 // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.5.0 // indirect google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e @@ -26,15 +32,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -require ( - github.com/confio/ics23/go v0.9.0 - github.com/cosmos/ibc-go/v4 v4.2.0 - github.com/golang/mock v1.6.0 - github.com/oxyno-zeta/gomock-extra-matcher v1.1.0 - github.com/regen-network/cosmos-proto v0.3.1 - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e -) - require ( filippo.io/edwards25519 v1.0.0-rc.1 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect diff --git a/go.sum b/go.sum index 1743a87dcf..57678e7572 100644 --- a/go.sum +++ b/go.sum @@ -731,8 +731,8 @@ github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= -github.com/cosmos/ibc-go/v4 v4.2.0 h1:Fx/kKq/uvawrAxk6ZrQ6sEIgffLRU5Cs/AUnvpPBrHI= -github.com/cosmos/ibc-go/v4 v4.2.0/go.mod h1:57qWScDtfCx3FOMLYmBIKPbOLE6xiVhrgxHAQmbWYXM= +github.com/cosmos/ibc-go/v4 v4.3.0 h1:yOzVsyZzsv4XPBux8gq+D0LhZn45yGWKjvT+6Vyo5no= +github.com/cosmos/ibc-go/v4 v4.3.0/go.mod h1:CcLvIoi9NNtIbNsxs4KjBGjYhlwqtsmXy1AKARKiMzQ= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= From 3682971d7688fe5945e13733c52b2bcdfe86948c Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 5 Apr 2023 07:04:33 +0700 Subject: [PATCH 2/3] ensure we always cite the correct version of ics --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 56d500440e..de5398ea61 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/confio/ics23/go v0.9.0 - github.com/cosmos/cosmos-sdk v0.45.12 + github.com/cosmos/cosmos-sdk v0.45.13 github.com/cosmos/ibc-go/v4 v4.3.0 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 From 353db3c7236553c23ec23e5283948c6a4636add6 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 5 Apr 2023 15:49:27 +0700 Subject: [PATCH 3/3] go mod tidy --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 7c2b8bd2a1..1c29d38fc5 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,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.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v4 v4.2.0 h1:Fx/kKq/uvawrAxk6ZrQ6sEIgffLRU5Cs/AUnvpPBrHI= -github.com/cosmos/ibc-go/v4 v4.2.0/go.mod h1:57qWScDtfCx3FOMLYmBIKPbOLE6xiVhrgxHAQmbWYXM= +github.com/cosmos/ibc-go/v4 v4.3.0 h1:yOzVsyZzsv4XPBux8gq+D0LhZn45yGWKjvT+6Vyo5no= +github.com/cosmos/ibc-go/v4 v4.3.0/go.mod h1:CcLvIoi9NNtIbNsxs4KjBGjYhlwqtsmXy1AKARKiMzQ= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=