Skip to content

Commit c175baf

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> (cherry picked from commit d4e5206) # Conflicts: # api/go.mod # api/go.sum # client/v2/go.mod # client/v2/go.sum # collections/go.mod # collections/go.sum # core/go.mod # core/go.sum # depinject/go.mod # depinject/go.sum # errors/go.mod # errors/go.sum # go.mod # go.sum # orm/go.mod # orm/go.sum # simapp/go.mod # simapp/go.sum # simapp/gomod2nix.toml # store/go.mod # store/go.sum # tests/go.mod # tests/go.sum # tests/starship/tests/go.mod # tests/starship/tests/go.sum # tools/confix/go.mod # tools/confix/go.sum # tools/cosmovisor/go.mod # tools/cosmovisor/go.sum # tools/hubl/go.mod # tools/hubl/go.sum # x/accounts/go.mod # x/accounts/go.sum # x/auth/go.mod # x/auth/go.sum # x/authz/go.mod # x/authz/go.sum # x/bank/go.mod # x/bank/go.sum # x/circuit/go.mod # x/circuit/go.sum # x/distribution/go.mod # x/distribution/go.sum # x/evidence/go.mod # x/evidence/go.sum # x/feegrant/go.mod # x/feegrant/go.sum # x/gov/client/cli/tx_test.go # x/gov/go.mod # x/gov/go.sum # x/group/go.mod # x/group/go.sum # x/mint/go.mod # x/mint/go.sum # x/nft/go.mod # x/nft/go.sum # x/params/go.mod # x/params/go.sum # x/protocolpool/go.mod # x/protocolpool/go.sum # x/slashing/go.mod # x/slashing/go.sum # x/staking/go.mod # x/staking/go.sum # x/tx/go.mod # x/tx/go.sum # x/upgrade/go.mod # x/upgrade/go.sum
1 parent d1b5b0c commit c175baf

File tree

70 files changed

+27772
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+27772
-23
lines changed

api/go.mod

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.19
44

55
require (
66
github.com/cosmos/cosmos-proto v1.0.0-beta.4
7+
<<<<<<< HEAD
78
github.com/cosmos/gogoproto v1.4.10
89
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
910
google.golang.org/grpc v1.55.0
@@ -12,6 +13,17 @@ require (
1213

1314
require (
1415
github.com/golang/protobuf v1.5.3 // indirect
16+
=======
17+
github.com/cosmos/gogoproto v1.4.11
18+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014
19+
google.golang.org/grpc v1.62.1
20+
google.golang.org/protobuf v1.33.0
21+
)
22+
23+
require (
24+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20230509103710-5e5b9fdd0180.1 // indirect
25+
github.com/golang/protobuf v1.5.4 // indirect
26+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
1527
github.com/google/go-cmp v0.6.0 // indirect
1628
golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect
1729
golang.org/x/net v0.9.0 // indirect

api/go.sum

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vl
33
github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI=
44
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
55
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
7-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
6+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
7+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
88
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
99
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1010
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -17,11 +17,22 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1717
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
1818
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
1919
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
20+
<<<<<<< HEAD
2021
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
2122
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
2223
google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
2324
google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
25+
=======
26+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y=
27+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s=
28+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A=
29+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I=
30+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c h1:NUsgEN92SQQqzfA+YtqYNqYmB3DMMYLlIwUZAQFVFbo=
31+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
32+
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
33+
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
34+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
2435
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
25-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
26-
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
2736
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
37+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
38+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

client/v2/go.mod

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,30 @@ module cosmossdk.io/client/v2
33
go 1.19
44

55
require (
6+
<<<<<<< HEAD
67
cosmossdk.io/api v0.3.1
78
cosmossdk.io/core v0.3.2
9+
=======
10+
cosmossdk.io/api v0.7.3
11+
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
12+
cosmossdk.io/depinject v1.0.0-alpha.4
13+
cosmossdk.io/x/bank v0.0.0-00010101000000-000000000000
14+
cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a
15+
cosmossdk.io/x/tx v0.13.1
16+
github.com/chzyer/readline v1.5.1 // indirect
17+
github.com/cockroachdb/errors v1.11.1
18+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
819
github.com/cosmos/cosmos-proto v1.0.0-beta.4
920
github.com/iancoleman/strcase v0.2.0
1021
github.com/spf13/cobra v1.6.1
1122
github.com/spf13/pflag v1.0.5
23+
<<<<<<< HEAD
1224
google.golang.org/grpc v1.55.0
1325
google.golang.org/protobuf v1.32.0
26+
=======
27+
google.golang.org/grpc v1.62.1
28+
google.golang.org/protobuf v1.33.0
29+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
1430
gotest.tools/v3 v3.5.1
1531
)
1632

@@ -22,16 +38,92 @@ require (
2238
github.com/cosmos/gogoproto v1.4.10 // indirect
2339
github.com/getsentry/sentry-go v0.23.0 // indirect
2440
github.com/gogo/protobuf v1.3.2 // indirect
41+
<<<<<<< HEAD
2542
github.com/golang/protobuf v1.5.3 // indirect
43+
=======
44+
github.com/golang/glog v1.2.0 // indirect
45+
github.com/golang/mock v1.6.0 // indirect
46+
github.com/golang/protobuf v1.5.4 // indirect
47+
github.com/golang/snappy v0.0.4 // indirect
48+
github.com/google/btree v1.1.2 // indirect
49+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
2650
github.com/google/go-cmp v0.6.0 // indirect
2751
github.com/inconshreveable/mousetrap v1.0.1 // indirect
2852
github.com/kr/pretty v0.3.1 // indirect
2953
github.com/kr/text v0.2.0 // indirect
3054
github.com/pkg/errors v0.9.1 // indirect
55+
<<<<<<< HEAD
3156
github.com/rogpeppe/go-internal v1.11.0 // indirect
3257
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
3358
golang.org/x/net v0.9.0 // indirect
3459
golang.org/x/sys v0.11.0 // indirect
3560
golang.org/x/text v0.12.0 // indirect
3661
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
62+
=======
63+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
64+
github.com/prometheus/client_golang v1.19.0 // indirect
65+
github.com/prometheus/client_model v0.6.0 // indirect
66+
github.com/prometheus/common v0.50.0 // indirect
67+
github.com/prometheus/procfs v0.12.0 // indirect
68+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
69+
github.com/rogpeppe/go-internal v1.12.0 // indirect
70+
github.com/rs/cors v1.8.3 // indirect
71+
github.com/rs/zerolog v1.32.0 // indirect
72+
github.com/sagikazarmark/locafero v0.4.0 // indirect
73+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
74+
github.com/sasha-s/go-deadlock v0.3.1 // indirect
75+
github.com/sourcegraph/conc v0.3.0 // indirect
76+
github.com/spf13/afero v1.11.0 // indirect
77+
github.com/spf13/cast v1.6.0 // indirect
78+
github.com/spf13/viper v1.18.2 // indirect
79+
github.com/stretchr/testify v1.9.0
80+
github.com/subosito/gotenv v1.6.0 // indirect
81+
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
82+
github.com/tendermint/go-amino v0.16.0 // indirect
83+
github.com/tidwall/btree v1.7.0 // indirect
84+
github.com/zondax/hid v0.9.2 // indirect
85+
github.com/zondax/ledger-go v0.14.3 // indirect
86+
gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect
87+
gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect
88+
go.etcd.io/bbolt v1.3.7 // indirect
89+
go.uber.org/multierr v1.11.0 // indirect
90+
golang.org/x/crypto v0.21.0 // indirect
91+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
92+
golang.org/x/mod v0.15.0 // indirect
93+
golang.org/x/net v0.22.0 // indirect
94+
golang.org/x/sync v0.6.0 // indirect
95+
golang.org/x/sys v0.18.0 // indirect
96+
golang.org/x/term v0.18.0 // indirect
97+
golang.org/x/text v0.14.0 // indirect
98+
golang.org/x/tools v0.18.0 // indirect
99+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
100+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
101+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
102+
gopkg.in/ini.v1 v1.67.0 // indirect
103+
gopkg.in/yaml.v3 v3.0.1 // indirect
104+
nhooyr.io/websocket v1.8.6 // indirect
105+
pgregory.net/rapid v1.1.0 // indirect
106+
)
107+
108+
require (
109+
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.32.0-20230509103710-5e5b9fdd0180.1 // indirect
110+
buf.build/gen/go/tendermint/tendermint/protocolbuffers/go v1.32.0-20231117195010-33ed361a9051.1 // indirect
111+
)
112+
113+
replace github.com/cosmos/cosmos-sdk => ./../../
114+
115+
replace (
116+
cosmossdk.io/api => ./../../api
117+
cosmossdk.io/core => ./../../core
118+
cosmossdk.io/depinject => ./../../depinject
119+
cosmossdk.io/x/accounts => ./../../x/accounts
120+
cosmossdk.io/x/auth => ./../../x/auth
121+
cosmossdk.io/x/bank => ./../../x/bank
122+
cosmossdk.io/x/distribution => ./../../x/distribution
123+
cosmossdk.io/x/gov => ./../../x/gov
124+
cosmossdk.io/x/mint => ./../../x/mint
125+
cosmossdk.io/x/protocolpool => ./../../x/protocolpool
126+
cosmossdk.io/x/slashing => ./../../x/slashing
127+
cosmossdk.io/x/staking => ./../../x/staking
128+
>>>>>>> d4e52069f (build(deps): Bump protobuf to 1.33.0, x/tx to 0.13.1, grpc to 1.62.1 and prometheus 0.50.0 (#19655))
37129
)

0 commit comments

Comments
 (0)