From 7263e80b6bf1ce3ce4ed0e5a45072b865e9c5b14 Mon Sep 17 00:00:00 2001 From: faddat Date: Mon, 1 Aug 2022 14:25:56 +0000 Subject: [PATCH 1/3] remove now-unnecessary replace statement in go.mod --- go.mod | 12 ++++-------- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 7c2700cb237..941564ef0c6 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,12 @@ module github.com/cosmos/gaia/v8 go 1.18 require ( + cosmossdk.io/math v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.46.0 github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/golangci/golangci-lint v1.47.2 github.com/gorilla/mux v1.8.0 + github.com/gravity-devs/liquidity/v2 v2.0.0-rc3 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.5.0 @@ -17,12 +19,6 @@ require ( github.com/tendermint/tm-db v0.6.7 ) -require ( - cosmossdk.io/math v1.0.0-beta.2 - github.com/cosmos/ibc-go/v5 v5.0.0-00010101000000-000000000000 - github.com/gravity-devs/liquidity/v2 v2.0.0-rc3 -) - require ( 4d63.com/gochecknoglobals v0.1.0 // indirect cloud.google.com/go v0.100.2 // indirect @@ -70,6 +66,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.0 // indirect + github.com/cosmos/ibc-go/v5 v5.0.0-20220801112651-041096304a27 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/daixiang0/gci v0.4.3 // indirect @@ -266,7 +263,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect google.golang.org/grpc v1.48.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -280,7 +277,6 @@ require ( ) replace ( - github.com/cosmos/ibc-go/v5 => github.com/notional-labs/ibc-go/v5 v5.0.0-20220728082452-6f2e6df135b4 github.com/cosmos/ledger-go => github.com/empowerchain/ledger-go v0.9.3-0.20220531092147-dab46ea76974 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/zondax/hid => github.com/zondax/hid v0.9.0 diff --git a/go.sum b/go.sum index 7c2530be66b..7bcf1b601be 100644 --- a/go.sum +++ b/go.sum @@ -331,6 +331,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.0 h1:sgyrjqOkycXiN7Tuupuo4QAldKFg7Sipyfeg/IL7cps= github.com/cosmos/iavl v0.19.0/go.mod h1:l5h9pAB3m5fihB3pXVgwYqdY8aBsMagqz7T0MUjxZeA= +github.com/cosmos/ibc-go/v5 v5.0.0-20220801112651-041096304a27 h1:2UYvzXtSrjHGDwGQv+SZc1XmElOcMsM7pwQFzIc5HbA= +github.com/cosmos/ibc-go/v5 v5.0.0-20220801112651-041096304a27/go.mod h1:9mmcbzuidgX7nhafIKng/XhXAHDEnRqDjGy/60W1cvg= 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/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -2270,6 +2272,8 @@ google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 6d8c5ddc65fe873426de5287fee2ec8171996b80 Mon Sep 17 00:00:00 2001 From: faddat Date: Tue, 2 Aug 2022 07:27:58 +0000 Subject: [PATCH 2/3] name the decorator --- ante/ante.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ante/ante.go b/ante/ante.go index ac542ffbf75..65154a8992f 100644 --- a/ante/ante.go +++ b/ante/ante.go @@ -52,7 +52,7 @@ func NewAnteHandler(opts HandlerOptions) (sdk.AnteHandler, error) { ante.NewSigGasConsumeDecorator(opts.AccountKeeper, sigGasConsumer), ante.NewSigVerificationDecorator(opts.AccountKeeper, opts.SignModeHandler), ante.NewIncrementSequenceDecorator(opts.AccountKeeper), - ibcante.NewAnteDecorator(opts.IBCkeeper), + ibcante.NewRedundantRelayDecorator(opts.IBCkeeper), } return sdk.ChainAnteDecorators(anteDecorators...), nil From 46533e2928fbff994b6e443bf1d359a9adb3162d Mon Sep 17 00:00:00 2001 From: faddat Date: Tue, 2 Aug 2022 07:40:13 +0000 Subject: [PATCH 3/3] fixup --- go.mod | 3 ++- go.sum | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 941564ef0c6..59c2bf7e74b 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,8 @@ require ( github.com/tendermint/tm-db v0.6.7 ) +require github.com/cosmos/ibc-go/v5 v5.0.0-20220801112651-041096304a27 + require ( 4d63.com/gochecknoglobals v0.1.0 // indirect cloud.google.com/go v0.100.2 // indirect @@ -66,7 +68,6 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.0 // indirect - github.com/cosmos/ibc-go/v5 v5.0.0-20220801112651-041096304a27 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/daixiang0/gci v0.4.3 // indirect diff --git a/go.sum b/go.sum index 7bcf1b601be..3074ce551c8 100644 --- a/go.sum +++ b/go.sum @@ -1116,8 +1116,6 @@ github.com/nishanths/exhaustive v0.8.1/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/ github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/notional-labs/ibc-go/v5 v5.0.0-20220728082452-6f2e6df135b4 h1:eaO6hRk0VUpbdVsiczq5r3EFqqgqDGTfsalQvJmskDs= -github.com/notional-labs/ibc-go/v5 v5.0.0-20220728082452-6f2e6df135b4/go.mod h1:KxDAWaeoibbXS0remZwoFz4nil+6+Bi4X3XQh0+23Io= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -2270,7 +2268,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=