From 41c8529ff94909d0fef97a5503fe3fdaaef69359 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 1 Mar 2023 16:30:41 +0100 Subject: [PATCH] chore: bump cometbft to v0.37.0-rc3 (#15220) --- .github/workflows/lint.yml | 2 +- Makefile | 5 +- api/go.mod | 2 +- client/v2/go.mod | 4 +- client/v2/go.sum | 4 +- collections/go.mod | 2 +- core/go.mod | 2 +- depinject/go.mod | 2 +- errors/go.mod | 2 +- go.mod | 2 +- go.sum | 4 +- log/go.mod | 2 +- math/go.mod | 2 +- orm/go.mod | 2 +- simapp/go.mod | 2 +- simapp/go.sum | 4 +- store/go.mod | 4 +- store/go.sum | 4 +- tests/go.mod | 4 +- tests/go.sum | 4 +- tools/confix/go.mod | 4 +- tools/confix/go.sum | 4 +- tools/cosmovisor/go.mod | 2 +- tools/cosmovisor/go.sum | 4 +- tools/hubl/go.mod | 2 +- tools/hubl/go.sum | 4 +- tools/rosetta/go.mod | 4 +- tools/rosetta/go.sum | 4 +- x/auth/tx/query.go | 6 +- x/circuit/go.mod | 4 +- x/circuit/go.sum | 4 +- x/evidence/go.mod | 4 +- x/evidence/go.sum | 4 +- x/feegrant/go.mod | 4 +- x/feegrant/go.sum | 4 +- x/gov/client/utils/query.go | 343 +------------------------------ x/gov/client/utils/query_test.go | 26 +-- x/nft/go.mod | 4 +- x/nft/go.sum | 4 +- x/tx/go.mod | 2 +- x/upgrade/go.mod | 4 +- x/upgrade/go.sum | 4 +- 42 files changed, 77 insertions(+), 427 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 19e49e3045..62508c1875 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,4 +22,4 @@ jobs: uses: golangci/golangci-lint-action@v3 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.51.1 + version: v1.51.2 diff --git a/Makefile b/Makefile index 8a1999f2d4..7859fdf9e2 100644 --- a/Makefile +++ b/Makefile @@ -340,7 +340,7 @@ benchmark: ############################################################################### golangci_lint_cmd=golangci-lint -golangci_version=v1.51.1 +golangci_version=v1.51.2 lint: @echo "--> Running linter" @@ -386,8 +386,7 @@ proto-lint: proto-check-breaking: @$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main -# TODO update/remove after v0.37.x tag of CometBFT -CMT_URL = https://raw.githubusercontent.com/cometbft/cometbft/v0.37.0-alpha.3/proto/tendermint +CMT_URL = https://raw.githubusercontent.com/cometbft/cometbft/v0.37.0-rc3/proto/tendermint CMT_CRYPTO_TYPES = proto/tendermint/crypto CMT_ABCI_TYPES = proto/tendermint/abci diff --git a/api/go.mod b/api/go.mod index 5e02d6d623..47883f10bf 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/api -go 1.19 +go 1.20 require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 diff --git a/client/v2/go.mod b/client/v2/go.mod index c46a4e8f1c..3a3641d8c5 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/client/v2 -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 @@ -35,7 +35,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/cometbft/cometbft v0.37.0-alpha.3 // indirect + github.com/cometbft/cometbft v0.37.0-rc3 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect diff --git a/client/v2/go.sum b/client/v2/go.sum index 1d313b4085..9f689ae8d2 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -122,8 +122,8 @@ github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46/go.mod h1:9lRMC github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= diff --git a/collections/go.mod b/collections/go.mod index 279609529f..aedb911436 100644 --- a/collections/go.mod +++ b/collections/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/collections -go 1.19 +go 1.20 require ( cosmossdk.io/core v0.5.1 diff --git a/core/go.mod b/core/go.mod index 68a8045d97..05b6df0a65 100644 --- a/core/go.mod +++ b/core/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/core -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 diff --git a/depinject/go.mod b/depinject/go.mod index 68a868d7ea..de79d6a416 100644 --- a/depinject/go.mod +++ b/depinject/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/depinject -go 1.19 +go 1.20 require ( github.com/cockroachdb/errors v1.9.1 diff --git a/errors/go.mod b/errors/go.mod index cbe2bdb963..c0855ffa78 100644 --- a/errors/go.mod +++ b/errors/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/errors -go 1.19 +go 1.20 require ( github.com/pkg/errors v0.9.1 diff --git a/go.mod b/go.mod index db6bfd6589..d3c7b16dd6 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/chzyer/readline v1.5.1 github.com/cockroachdb/apd/v2 v2.0.2 github.com/cockroachdb/errors v1.9.1 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/btcutil v1.0.5 github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 diff --git a/go.sum b/go.sum index 31fb75adcf..00780554bf 100644 --- a/go.sum +++ b/go.sum @@ -166,8 +166,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/log/go.mod b/log/go.mod index e98e6470b1..af348c1ea4 100644 --- a/log/go.mod +++ b/log/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/log -go 1.19 +go 1.20 require github.com/rs/zerolog v1.29.0 diff --git a/math/go.mod b/math/go.mod index 04905c3dd5..170b4311eb 100644 --- a/math/go.mod +++ b/math/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/math -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.2 diff --git a/orm/go.mod b/orm/go.mod index c224bd9d9a..77003e851a 100644 --- a/orm/go.mod +++ b/orm/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/cosmos-sdk/orm -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 diff --git a/simapp/go.mod b/simapp/go.mod index 1f97fe7cef..06a9744ef3 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -16,7 +16,7 @@ require ( cosmossdk.io/x/feegrant v0.0.0-20230117113717-50e7c4a4ceff cosmossdk.io/x/nft v0.0.0-20230113085233-fae3332d62fc cosmossdk.io/x/upgrade v0.0.0-20230127052425-54c8e1568335 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-db v1.0.0-rc.1 // this version is not used as it is always replaced by the latest Cosmos SDK version github.com/cosmos/cosmos-sdk v0.48.0 diff --git a/simapp/go.sum b/simapp/go.sum index f02c6e5929..af7e411bf3 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -329,8 +329,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/store/go.mod b/store/go.mod index b22ba082e3..0f2d18e176 100644 --- a/store/go.mod +++ b/store/go.mod @@ -1,13 +1,13 @@ module cosmossdk.io/store -go 1.19 +go 1.20 require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/log v0.0.0-20230227204852-3535ee51c728 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 github.com/armon/go-metrics v0.4.1 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/confio/ics23/go v0.9.0 github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/gogoproto v1.4.6 diff --git a/store/go.sum b/store/go.sum index a718307545..0b80b2d4a6 100644 --- a/store/go.sum +++ b/store/go.sum @@ -54,8 +54,8 @@ github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46/go.mod h1:9lRMC github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/tests/go.mod b/tests/go.mod index efa7f6899f..15db53c786 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -15,7 +15,7 @@ require ( cosmossdk.io/x/nft v0.0.0-20230113085233-fae3332d62fc cosmossdk.io/x/tx v0.2.0 cosmossdk.io/x/upgrade v0.0.0-20230127052425-54c8e1568335 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 // this version is not used as it is always replaced by the latest Cosmos SDK version @@ -197,8 +197,6 @@ replace ( cosmossdk.io/x/nft => ../x/nft cosmossdk.io/x/tx => ../x/tx cosmossdk.io/x/upgrade => ../x/upgrade - // TODO: This can be deleted after the CometBFT PR is merged. - github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d ) // Below are the long-lived replace for tests. diff --git a/tests/go.sum b/tests/go.sum index 765e51099b..1b12f91a23 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -323,8 +323,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d h1:akhMrKe9V6+f+K8Brq3Cx+I2kRIizVsnU6+frARVTzo= -github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d/go.mod h1:EZUXFIzOBV/rscOektBL3X4FI5zHpu7tQMNNMwzv4ac= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/tools/confix/go.mod b/tools/confix/go.mod index 5cd0a85b0e..0b6aaae423 100644 --- a/tools/confix/go.mod +++ b/tools/confix/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/tools/confix -go 1.19 +go 1.20 require ( github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227121936-5b10d949dc55 @@ -38,7 +38,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/cometbft/cometbft v0.37.0-alpha.3 // indirect + github.com/cometbft/cometbft v0.37.0-rc3 // indirect github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect diff --git a/tools/confix/go.sum b/tools/confix/go.sum index ffc39eb61e..ac67e68e8f 100644 --- a/tools/confix/go.sum +++ b/tools/confix/go.sum @@ -160,8 +160,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 5c5eb3e2bb..a70d1bf5e6 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -41,7 +41,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/cometbft/cometbft v0.37.0-alpha.3 // indirect + github.com/cometbft/cometbft v0.37.0-rc3 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index a02371d45b..1bbe9bb924 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -314,8 +314,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= diff --git a/tools/hubl/go.mod b/tools/hubl/go.mod index 075d8df9b6..0ccfe02d8a 100644 --- a/tools/hubl/go.mod +++ b/tools/hubl/go.mod @@ -36,7 +36,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/cometbft/cometbft v0.37.0-alpha.3 // indirect + github.com/cometbft/cometbft v0.37.0-rc3 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect diff --git a/tools/hubl/go.sum b/tools/hubl/go.sum index 826d4a6f71..c1732fe951 100644 --- a/tools/hubl/go.sum +++ b/tools/hubl/go.sum @@ -130,8 +130,8 @@ github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46/go.mod h1:9lRMC github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 87203ffc1e..52a77a9ac7 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -1,12 +1,12 @@ module cosmossdk.io/tools/rosetta -go 1.19 +go 1.20 require ( cosmossdk.io/log v0.0.0-20230227204852-3535ee51c728 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 github.com/coinbase/rosetta-sdk-go/types v1.0.0 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227115928-12b8dd75e45f github.com/cosmos/rosetta-sdk-go v0.10.0 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index 74316636cb..667c307f29 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -153,8 +153,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= diff --git a/x/auth/tx/query.go b/x/auth/tx/query.go index 62a1bb7e13..9733f7f8c1 100644 --- a/x/auth/tx/query.go +++ b/x/auth/tx/query.go @@ -15,9 +15,9 @@ import ( querytypes "github.com/cosmos/cosmos-sdk/types/query" ) -// QueryTxsByEvents retrieves a list of paginated transactions from Tendermint's +// QueryTxsByEvents retrieves a list of paginated transactions from CometBFT's // TxSearch RPC method given a set of pagination criteria and an events query. -// Note, the events query must be valid based on Tendermint's query semantics. +// Note, the events query must be valid based on CometBFT's query semantics. // An error is returned if the query or parsing fails or if the query is empty. // // Note, if an empty orderBy is provided, the default behavior is ascending. If @@ -27,7 +27,7 @@ func QueryTxsByEvents(clientCtx client.Context, page, limit int, query, orderBy return nil, errors.New("query cannot be empty") } - // Tendermint node.TxSearch that is used for querying txs defines pages + // CometBFT node.TxSearch that is used for querying txs defines pages // starting from 1, so we default to 1 if not provided in the request. if page <= 0 { page = 1 diff --git a/x/circuit/go.mod b/x/circuit/go.mod index b1b101d941..a31034cc5e 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/cosmos-sdk/x/circuit -go 1.19 +go 1.20 require ( cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 @@ -30,7 +30,7 @@ require ( github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46 // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/cometbft/cometbft v0.37.0-alpha.3 // indirect + github.com/cometbft/cometbft v0.37.0-rc3 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect diff --git a/x/circuit/go.sum b/x/circuit/go.sum index 96bd0f4043..6db3226a4d 100644 --- a/x/circuit/go.sum +++ b/x/circuit/go.sum @@ -120,8 +120,8 @@ github.com/cockroachdb/pebble v0.0.0-20230226194802-02d779ffbc46/go.mod h1:9lRMC github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/x/evidence/go.mod b/x/evidence/go.mod index 3ab14b5801..6854848aab 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/evidence -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 @@ -10,7 +10,7 @@ require ( cosmossdk.io/log v0.0.0-20230227204852-3535ee51c728 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227103508-bbe7f8a11b44 github.com/cosmos/gogoproto v1.4.6 diff --git a/x/evidence/go.sum b/x/evidence/go.sum index c2434a9e28..09a1c12b37 100644 --- a/x/evidence/go.sum +++ b/x/evidence/go.sum @@ -160,8 +160,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 7e33de021c..4f251a32fa 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/feegrant -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 @@ -10,7 +10,7 @@ require ( cosmossdk.io/log v0.0.0-20230227204852-3535ee51c728 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227103508-bbe7f8a11b44 github.com/cosmos/gogoproto v1.4.6 diff --git a/x/feegrant/go.sum b/x/feegrant/go.sum index 47f7c776a4..9f22b5af08 100644 --- a/x/feegrant/go.sum +++ b/x/feegrant/go.sum @@ -165,8 +165,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/x/gov/client/utils/query.go b/x/gov/client/utils/query.go index cc386696f6..8bbd30220e 100644 --- a/x/gov/client/utils/query.go +++ b/x/gov/client/utils/query.go @@ -2,11 +2,9 @@ package utils import ( "fmt" - "strings" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" @@ -35,75 +33,6 @@ func (p Proposer) String() string { return fmt.Sprintf("Proposal with ID %d was proposed by %s", p.ProposalID, p.Proposer) } -// QueryDepositsByTxQuery will query for deposits via a direct txs tags query. It -// will fetch and build deposits directly from the returned txs and returns a -// JSON marshalled result or any error that occurred. -// -// NOTE: SearchTxs is used to facilitate the txs query which does not currently -// support configurable pagination. -func QueryDepositsByTxQuery(clientCtx client.Context, params v1.QueryProposalParams) ([]byte, error) { - var deposits []v1.Deposit - - // initial deposit was submitted with proposal, so must be queried separately - initialDeposit, err := queryInitialDepositByTxQuery(clientCtx, params.ProposalID) - if err != nil { - return nil, err - } - - if !sdk.Coins(initialDeposit.Amount).IsZero() { - deposits = append(deposits, initialDeposit) - } - - searchResult, err := combineEvents( - clientCtx, defaultPage, - // Query legacy Msgs event action - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgDeposit), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query proto Msgs event action v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgDeposit{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query proto Msgs event action v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgDeposit{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - }, - ) - if err != nil { - return nil, err - } - - for _, info := range searchResult.Txs { - for _, msg := range info.GetTx().GetMsgs() { - if depMsg, ok := msg.(*v1beta1.MsgDeposit); ok { - deposits = append(deposits, v1.Deposit{ - Depositor: depMsg.Depositor, - ProposalId: params.ProposalID, - Amount: depMsg.Amount, - }) - } - - if depMsg, ok := msg.(*v1.MsgDeposit); ok { - deposits = append(deposits, v1.Deposit{ - Depositor: depMsg.Depositor, - ProposalId: params.ProposalID, - Amount: depMsg.Amount, - }) - } - } - } - - bz, err := clientCtx.LegacyAmino.MarshalJSON(deposits) - if err != nil { - return nil, err - } - - return bz, nil -} - // QueryVotesByTxQuery will query for votes via a direct txs tags query. It // will fetch and build votes directly from the returned txs and returns a JSON // marshalled result or any error that occurred. @@ -117,39 +46,8 @@ func QueryVotesByTxQuery(clientCtx client.Context, params v1.QueryProposalVotesP // query interrupted either if we collected enough votes or tx indexer run out of relevant txs for len(votes) < totalLimit { // Search for both (legacy) votes and weighted votes. - searchResult, err := combineEvents( - clientCtx, nextTxPage, - // Query legacy Vote Msgs - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgVote), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query Vote proto Msgs v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgVote{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query Vote proto Msgs v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgVote{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query legacy VoteWeighted Msgs - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgVoteWeighted), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query VoteWeighted proto Msgs v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgVoteWeighted{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - // Query VoteWeighted proto Msgs v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgVoteWeighted{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - }, - ) + q := fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID) + searchResult, err := authtx.QueryTxsByEvents(clientCtx, nextTxPage, defaultLimit, q, "") if err != nil { return nil, err } @@ -208,45 +106,10 @@ func QueryVotesByTxQuery(clientCtx client.Context, params v1.QueryProposalVotesP // QueryVoteByTxQuery will query for a single vote via a direct txs tags query. func QueryVoteByTxQuery(clientCtx client.Context, params v1.QueryVoteParams) ([]byte, error) { - searchResult, err := combineEvents( - clientCtx, defaultPage, - // Query legacy Vote Msgs - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgVote), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter), - }, - // Query Vote proto Msgs v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgVote{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter.String()), - }, - // Query Vote proto Msgs v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgVote{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter.String()), - }, - // Query legacy VoteWeighted Msgs - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgVoteWeighted), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter.String()), - }, - // Query VoteWeighted proto Msgs v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgVoteWeighted{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter), - }, - // Query VoteWeighted proto Msgs v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgVoteWeighted{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter), - }, - ) + q1 := fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalVote, types.AttributeKeyProposalID, params.ProposalID) + q2 := fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter.String()) + q3 := fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Voter) + searchResult, err := authtx.QueryTxsByEvents(clientCtx, defaultPage, defaultLimit, fmt.Sprintf("%s AND (%s OR %s)", q1, q2, q3), "") if err != nil { return nil, err } @@ -297,109 +160,10 @@ func QueryVoteByTxQuery(clientCtx client.Context, params v1.QueryVoteParams) ([] return nil, fmt.Errorf("address '%s' did not vote on proposalID %d", params.Voter, params.ProposalID) } -// QueryDepositByTxQuery will query for a single deposit via a direct txs tags -// query. -func QueryDepositByTxQuery(clientCtx client.Context, params v1.QueryDepositParams) ([]byte, error) { - // initial deposit was submitted with proposal, so must be queried separately - initialDeposit, err := queryInitialDepositByTxQuery(clientCtx, params.ProposalID) - if err != nil { - return nil, err - } - - if !sdk.Coins(initialDeposit.Amount).IsZero() { - bz, err := clientCtx.Codec.MarshalJSON(&initialDeposit) - if err != nil { - return nil, err - } - - return bz, nil - } - - searchResult, err := combineEvents( - clientCtx, defaultPage, - // Query legacy Msgs event action - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgDeposit), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Depositor.String()), - }, - // Query proto Msgs event action v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgDeposit{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Depositor.String()), - }, - // Query proto Msgs event action v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgDeposit{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeProposalDeposit, types.AttributeKeyProposalID, params.ProposalID), - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeySender, params.Depositor.String()), - }, - ) - if err != nil { - return nil, err - } - - for _, info := range searchResult.Txs { - for _, msg := range info.GetTx().GetMsgs() { - // there should only be a single deposit under the given conditions - if depMsg, ok := msg.(*v1beta1.MsgDeposit); ok { - deposit := v1.Deposit{ - Depositor: depMsg.Depositor, - ProposalId: params.ProposalID, - Amount: depMsg.Amount, - } - - bz, err := clientCtx.Codec.MarshalJSON(&deposit) - if err != nil { - return nil, err - } - - return bz, nil - } - - if depMsg, ok := msg.(*v1.MsgDeposit); ok { - deposit := v1.Deposit{ - Depositor: depMsg.Depositor, - ProposalId: params.ProposalID, - Amount: depMsg.Amount, - } - - bz, err := clientCtx.Codec.MarshalJSON(&deposit) - if err != nil { - return nil, err - } - - return bz, nil - } - } - } - - return nil, fmt.Errorf("address '%s' did not deposit to proposalID %d", params.Depositor, params.ProposalID) -} - -// QueryProposerByTxQuery will query for a proposer of a governance proposal by -// ID. +// QueryProposerByTxQuery will query for a proposer of a governance proposal by ID. func QueryProposerByTxQuery(clientCtx client.Context, proposalID uint64) (Proposer, error) { - searchResult, err := combineEvents( - clientCtx, - defaultPage, - // Query legacy Msgs event action - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgSubmitProposal), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - // Query proto Msgs event action v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgSubmitProposal{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - // Query proto Msgs event action v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgSubmitProposal{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - ) + q := fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID) + searchResult, err := authtx.QueryTxsByEvents(clientCtx, defaultPage, defaultLimit, q, "") if err != nil { return Proposer{}, err } @@ -419,95 +183,6 @@ func QueryProposerByTxQuery(clientCtx client.Context, proposalID uint64) (Propos return Proposer{}, fmt.Errorf("failed to find the proposer for proposalID %d", proposalID) } -// QueryProposalByID takes a proposalID and returns a proposal -func QueryProposalByID(proposalID uint64, clientCtx client.Context, queryRoute string) ([]byte, error) { - params := v1.NewQueryProposalParams(proposalID) - bz, err := clientCtx.LegacyAmino.MarshalJSON(params) - if err != nil { - return nil, err - } - - res, _, err := clientCtx.QueryWithData(fmt.Sprintf("custom/%s/proposal", queryRoute), bz) - if err != nil { - return nil, err - } - - return res, err -} - -// combineEvents queries txs by events with all events from each event group, -// and combines all those events together. -// -// Tx are indexed in CometBFT via their Msgs `Type()`, which can be: -// - via legacy Msgs (amino or proto), their `Type()` is a custom string, -// - via ADR-031 proto msgs, their `Type()` is the protobuf FQ method name. -// In searching for events, we search for both `Type()`s, and we use the -// `combineEvents` function here to merge events. -func combineEvents(clientCtx client.Context, page int, eventGroups ...[]string) (*sdk.SearchTxsResult, error) { - // only the Txs field will be populated in the final SearchTxsResult - allTxs := []*sdk.TxResponse{} - for _, events := range eventGroups { - q := strings.Join(events, " AND ") - res, err := authtx.QueryTxsByEvents(clientCtx, page, defaultLimit, q, "") - if err != nil { - return nil, err - } - - allTxs = append(allTxs, res.Txs...) - } - - return &sdk.SearchTxsResult{Txs: allTxs}, nil -} - -// queryInitialDepositByTxQuery will query for a initial deposit of a governance proposal by -// ID. -func queryInitialDepositByTxQuery(clientCtx client.Context, proposalID uint64) (v1.Deposit, error) { - searchResult, err := combineEvents( - clientCtx, defaultPage, - // Query legacy Msgs event action - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, v1beta1.TypeMsgSubmitProposal), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - // Query proto Msgs event action v1beta1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1beta1.MsgSubmitProposal{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - // Query proto Msgs event action v1 - []string{ - fmt.Sprintf("%s.%s='%s'", sdk.EventTypeMessage, sdk.AttributeKeyAction, sdk.MsgTypeURL(&v1.MsgSubmitProposal{})), - fmt.Sprintf("%s.%s='%d'", types.EventTypeSubmitProposal, types.AttributeKeyProposalID, proposalID), - }, - ) - if err != nil { - return v1.Deposit{}, err - } - - for _, info := range searchResult.Txs { - for _, msg := range info.GetTx().GetMsgs() { - // there should only be a single proposal under the given conditions - if subMsg, ok := msg.(*v1beta1.MsgSubmitProposal); ok { - return v1.Deposit{ - ProposalId: proposalID, - Depositor: subMsg.Proposer, - Amount: subMsg.InitialDeposit, - }, nil - } - - if subMsg, ok := msg.(*v1.MsgSubmitProposal); ok { - return v1.Deposit{ - ProposalId: proposalID, - Depositor: subMsg.Proposer, - Amount: subMsg.InitialDeposit, - }, nil - } - } - } - - return v1.Deposit{}, sdkerrors.ErrNotFound.Wrapf("failed to find the initial deposit for proposalID %d", proposalID) -} - // convertVote converts a MsgVoteWeighted into a *v1.Vote. func convertVote(v *v1beta1.MsgVoteWeighted) *v1.Vote { opts := make([]*v1.WeightedVoteOption, len(v.Options)) diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 66dc7b2539..458836cd8b 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -2,7 +2,6 @@ package utils_test import ( "context" - "regexp" "testing" "github.com/cometbft/cometbft/rpc/client/mock" @@ -33,35 +32,13 @@ func (mock TxSearchMock) TxSearch(ctx context.Context, query string, prove bool, *perPage = 0 } - // Get the `message.action` value from the query. - messageAction := regexp.MustCompile(`message\.action='(.*)' .*$`) - msgType := messageAction.FindStringSubmatch(query)[1] - - // Filter only the txs that match the query - matchingTxs := make([]cmttypes.Tx, 0) - for _, tx := range mock.txs { - sdkTx, err := mock.txConfig.TxDecoder()(tx) - if err != nil { - return nil, err - } - for _, msg := range sdkTx.GetMsgs() { - if sdk.MsgTypeURL(msg) == msgType { - matchingTxs = append(matchingTxs, tx) - break - } - } - } - start, end := client.Paginate(len(mock.txs), *page, *perPage, 100) if start < 0 || end < 0 { // nil result with nil error crashes utils.QueryTxsByEvents return &coretypes.ResultTxSearch{}, nil } - if len(matchingTxs) < end { - return &coretypes.ResultTxSearch{}, nil - } - txs := matchingTxs[start:end] + txs := mock.txs[start:end] rst := &coretypes.ResultTxSearch{Txs: make([]*coretypes.ResultTx, len(txs)), TotalCount: len(txs)} for i := range txs { rst.Txs[i] = &coretypes.ResultTx{Tx: txs[i]} @@ -90,6 +67,7 @@ func TestGetPaginatedVotes(t *testing.T) { acc1Msgs := []sdk.Msg{ v1.NewMsgVote(acc1, 0, v1.OptionYes, ""), v1.NewMsgVote(acc1, 0, v1.OptionYes, ""), + v1.NewMsgDeposit(acc1, 0, sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))), // should be ignored } acc2Msgs := []sdk.Msg{ v1.NewMsgVote(acc2, 0, v1.OptionYes, ""), diff --git a/x/nft/go.mod b/x/nft/go.mod index 3166c70e19..3007d8146b 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/nft -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 @@ -9,7 +9,7 @@ require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227103508-bbe7f8a11b44 github.com/cosmos/gogoproto v1.4.6 diff --git a/x/nft/go.sum b/x/nft/go.sum index c2434a9e28..09a1c12b37 100644 --- a/x/nft/go.sum +++ b/x/nft/go.sum @@ -160,8 +160,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= diff --git a/x/tx/go.mod b/x/tx/go.mod index 8882b41d74..e836430b9d 100644 --- a/x/tx/go.mod +++ b/x/tx/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/tx -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index 5d1b8ed35a..53bbb9ee43 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/upgrade -go 1.19 +go 1.20 require ( cosmossdk.io/api v0.3.1 @@ -9,7 +9,7 @@ require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/log v0.0.0-20230227204852-3535ee51c728 cosmossdk.io/store v0.0.0-20230227103508-bbe7f8a11b44 - github.com/cometbft/cometbft v0.37.0-alpha.3 + github.com/cometbft/cometbft v0.37.0-rc3 github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20230227103508-bbe7f8a11b44 diff --git a/x/upgrade/go.sum b/x/upgrade/go.sum index c819043b92..bd665dfe47 100644 --- a/x/upgrade/go.sum +++ b/x/upgrade/go.sum @@ -325,8 +325,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/cometbft/cometbft v0.37.0-alpha.3 h1:74F+cMr4pd1a2lFn/h4TxXmO8VWi3A2dxyoMcjlMWuQ= -github.com/cometbft/cometbft v0.37.0-alpha.3/go.mod h1:dUGbIGYoLM11xUruTTJY4Xp9FHh6Nfu3Nots8/+UNSo= +github.com/cometbft/cometbft v0.37.0-rc3 h1:A1SBK+mSyquHJpJ1q0soPl2JJ1iLIU0IbVzCmP14KiM= +github.com/cometbft/cometbft v0.37.0-rc3/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=