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
fix import
  • Loading branch information
tac0turtle committed May 3, 2024
commit 9151648b010cd9636233ff39270b52bcdb2c70be
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
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
4 changes: 2 additions & 2 deletions simapp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/simapp

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down Expand Up @@ -241,6 +241,7 @@ replace (
cosmossdk.io/collections => ../collections
cosmossdk.io/core => ../core
cosmossdk.io/depinject => ../depinject
cosmossdk.io/store => ../store
cosmossdk.io/tools/confix => ../tools/confix
cosmossdk.io/x/accounts => ../x/accounts
cosmossdk.io/x/accounts/defaults/lockup => ../x/accounts/defaults/lockup
Expand All @@ -261,7 +262,6 @@ replace (
cosmossdk.io/x/slashing => ../x/slashing
cosmossdk.io/x/staking => ../x/staking
cosmossdk.io/x/upgrade => ../x/upgrade
cosmossdk.io/store => ../store
)

// Below are the long-lived replace of the SimApp
Expand Down
2 changes: 0 additions & 2 deletions simapp/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc h1:R9O9d75e0qZYUsVV0zzi+D7cNLnX2JrUOQNoIPaF0Bg=
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc/go.mod h1:amTTatOUV3u1PsKmNb87z6/galCxrRbz9kRdJkL0DyU=
cosmossdk.io/x/tx v0.13.3 h1:Ha4mNaHmxBc6RMun9aKuqul8yHiL78EKJQ8g23Zf73g=
cosmossdk.io/x/tx v0.13.3/go.mod h1:I8xaHv0rhUdIvIdptKIqzYy27+n2+zBVaxO6fscFhys=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
Expand Down
4 changes: 1 addition & 3 deletions store/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/store

go 1.22
go 1.22.2

require (
cosmossdk.io/errors v1.0.0
Expand All @@ -27,7 +27,6 @@ require (
)

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
Expand All @@ -41,7 +40,6 @@ require (
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // 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 Down
4 changes: 0 additions & 4 deletions store/go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cosmossdk.io/api v0.7.4 h1:sPo8wKwCty1lht8kgL3J7YL1voJywP3YWuA5JKkBz30=
cosmossdk.io/api v0.7.4/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04=
cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0=
cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
Expand Down Expand Up @@ -49,8 +47,6 @@ github.com/cometbft/cometbft/api v1.0.0-alpha.2/go.mod h1:H52lgJKkSPeVpTcKr9a4nr
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cosmos/cosmos-db v1.0.2 h1:hwMjozuY1OlJs/uh6vddqnk9j7VamLv+0DBlbEXbAKs=
github.com/cosmos/cosmos-db v1.0.2/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA=
github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o=
github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I=
github.com/cosmos/crypto v0.0.0-20240309083813-82ed2537802e h1:Zk4OsfLBN+0WOfH15Hg/aAYsSP7IuZQC6RZjewPuITw=
github.com/cosmos/crypto v0.0.0-20240309083813-82ed2537802e/go.mod h1:0KOK/XVzL5lj9x+NyJ7lWuJYl6F0Wd7JMVYM06bVQsc=
github.com/cosmos/gogoproto v1.4.12 h1:vB6Lbe/rtnYGjQuFxkPiPYiCybqFT8QvLipDZP8JpFE=
Expand Down
2 changes: 1 addition & 1 deletion store/types/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

dbm "github.com/cosmos/cosmos-db"

"cosmossdk.io/api/tendermint/crypto"
"cosmossdk.io/store/metrics"
pruningtypes "cosmossdk.io/store/pruning/types"
snapshottypes "cosmossdk.io/store/snapshots/types"
crypto "github.com/cometbft/cometbft/api/cometbft/crypto/v1"
)

type Store interface {
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cosmos/cosmos-sdk/tests

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/accounts/defaults/lockup/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/accounts/defaults/lockup

go 1.22
go 1.22.2

require (
cosmossdk.io/collections v0.4.0
Expand Down
2 changes: 1 addition & 1 deletion x/accounts/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/accounts

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/auth/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/auth

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/authz/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/authz

go 1.22
go 1.22.2

require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.33.0-20240130113600-88ef6483f90f.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion x/bank/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/bank

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/circuit/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/circuit

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/distribution/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/distribution

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/epochs/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/epochs

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/evidence/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/evidence

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/feegrant/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/feegrant

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/gov/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/gov

go 1.22
go 1.22.2

require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.33.0-20240130113600-88ef6483f90f.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion x/group/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/group

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/mint/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/mint

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/nft/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/nft

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/params/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/params

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/protocolpool/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/protocolpool

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/slashing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/slashing

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/staking/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/staking

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
2 changes: 1 addition & 1 deletion x/upgrade/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module cosmossdk.io/x/upgrade

go 1.22
go 1.22.2

require (
cosmossdk.io/api v0.7.4
Expand Down
Loading