Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor! : bump comet to v1 #19726

Merged
merged 56 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
107a940
start the chaos
tac0turtle Mar 12, 2024
cff8134
proto
tac0turtle Mar 12, 2024
55ac8e5
more changes
tac0turtle Mar 12, 2024
50d0784
something
tac0turtle Mar 12, 2024
f21cde6
attempt
tac0turtle Mar 12, 2024
6630131
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 9, 2024
9e09ec9
update
tac0turtle Apr 9, 2024
1bee088
more changes
tac0turtle Apr 9, 2024
5df1afa
push
tac0turtle Apr 9, 2024
74c7696
fix proto
tac0turtle Apr 9, 2024
7d60e29
push changes
tac0turtle Apr 9, 2024
e58094a
fixes
tac0turtle Apr 9, 2024
2a0a638
fixes
tac0turtle Apr 9, 2024
7b7a72a
more changes
tac0turtle Apr 10, 2024
5426341
more changes
tac0turtle Apr 11, 2024
5d8d8ec
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 17, 2024
a61a494
more changes
tac0turtle Apr 17, 2024
3590ae4
further changes
tac0turtle Apr 17, 2024
ae3a98c
bump
tac0turtle Apr 18, 2024
aef320b
building
tac0turtle Apr 18, 2024
1c11514
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 18, 2024
b54af91
fix some tests and runners
tac0turtle Apr 18, 2024
1f73fd5
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 23, 2024
4de8bf3
fix apis
tac0turtle Apr 23, 2024
1c99034
fix mocks
tac0turtle Apr 23, 2024
3891f14
revert 1.21.0
tac0turtle Apr 23, 2024
b0cef04
generate proto changes
tac0turtle Apr 23, 2024
d977c25
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 29, 2024
65f8249
generate mocks
tac0turtle Apr 29, 2024
c17da7f
fix some tests
tac0turtle Apr 29, 2024
c894b1f
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 29, 2024
908d707
return non epmty string
tac0turtle Apr 29, 2024
15aa804
update to later comet
tac0turtle Apr 29, 2024
773216a
linting
tac0turtle Apr 30, 2024
55711d6
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 30, 2024
e56fa5c
linting
tac0turtle Apr 30, 2024
da3344e
Merge branch 'main' into marko/comet/v1
tac0turtle Apr 30, 2024
452572f
remove helper
tac0turtle Apr 30, 2024
ae20616
Merge branch 'main' into marko/comet/v1
tac0turtle May 2, 2024
9b8bcbc
Merge branch 'main' into marko/comet/v1
tac0turtle May 3, 2024
70b9fb1
go mod changes
tac0turtle May 3, 2024
9151648
fix import
tac0turtle May 3, 2024
e316656
generate types
tac0turtle May 3, 2024
1d93815
go 1.22
tac0turtle May 3, 2024
a427150
break it
tac0turtle May 3, 2024
399cf8b
Merge branch 'main' into marko/comet/v1
tac0turtle May 3, 2024
5ba7815
nix update
tac0turtle May 3, 2024
2a5e51c
testing
tac0turtle May 3, 2024
9aa6152
fix gomod2nix
yihuang May 4, 2024
1f781ab
Merge branch 'main' into marko/comet/v1
tac0turtle May 6, 2024
4e16311
generate mocks
tac0turtle May 6, 2024
7066e02
changelog
tac0turtle May 6, 2024
23e543a
linting
tac0turtle May 6, 2024
aefdebd
fixes
tac0turtle May 6, 2024
06bf802
Merge branch 'main' into marko/comet/v1
tac0turtle May 6, 2024
17861be
Merge branch 'main' into marko/comet/v1
tac0turtle May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into marko/comet/v1
  • Loading branch information
tac0turtle committed May 3, 2024
commit 9b8bcbc967653f81f6e88b792f943f58e2ca5108
3 changes: 2 additions & 1 deletion api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
2 changes: 1 addition & 1 deletion client/v2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/client/v2

go 1.22.2
go 1.22

require (
cosmossdk.io/api v0.7.4
Expand Down
3 changes: 2 additions & 1 deletion client/v2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,9 @@ 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.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
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=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.2
go 1.22

module github.com/cosmos/cosmos-sdk

Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,9 @@ 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.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
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=
Expand Down
2 changes: 1 addition & 1 deletion simapp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/simapp

go 1.22.2
go 1.22

require (
cosmossdk.io/api v0.7.4
Expand Down
3 changes: 2 additions & 1 deletion simapp/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,9 @@ google.golang.org/protobuf v1.26.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/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
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=
Expand Down
25 changes: 16 additions & 9 deletions store/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module cosmossdk.io/store

go 1.22.2
go 1.22

require (
cosmossdk.io/errors v1.0.0
cosmossdk.io/log v1.3.1
github.com/cockroachdb/errors v1.11.1
github.com/cockroachdb/pebble v1.1.0
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cometbft/cometbft v1.0.0-alpha.2.0.20240417065730-32803329c3e5
github.com/cosmos/gogoproto v1.4.12
github.com/cosmos/iavl v1.1.2
Expand All @@ -21,22 +21,27 @@ require (
github.com/stretchr/testify v1.9.0
github.com/tidwall/btree v1.7.0
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0
google.golang.org/grpc v1.61.1
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
gotest.tools/v3 v3.5.1
)

require (
cosmossdk.io/api v0.7.4
cosmossdk.io/math v1.3.0
github.com/cometbft/cometbft/api v1.0.0-alpha.2
github.com/cosmos/cosmos-db v1.0.2
)

require (
github.com/DataDog/zstd v1.5.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft/api v1.0.0-alpha.2 // indirect
github.com/cosmos/cosmos-db v1.0.2 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/crypto v0.0.0-20240309083813-82ed2537802e // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
Expand All @@ -59,6 +64,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d // indirect
Expand All @@ -72,10 +78,11 @@ require (
github.com/rs/zerolog v1.32.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.