-
Notifications
You must be signed in to change notification settings - Fork 609
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
feat: sdk v0.50.x upgrade #8274
Changes from 1 commit
6d70096
8536841
fdab2ba
9dddc1b
b986140
9fcbd6b
b28e6ff
114125c
1595fd8
768f2b1
7995b58
8bfa7f1
53f94a6
e9d96ce
a3d52ff
38cda38
da8bd95
ec9e0aa
29bea81
c719bd3
2b0d471
cd3d9e2
5f20366
2fabe91
0569420
9175a70
3bebd10
7214f3e
1bcb8be
196b215
87163a1
c966351
5e8738a
a3906bb
c4a3e6a
f771538
7fb5255
4ac614e
508c492
85b4654
94a0751
0fd1931
648b0a6
7ca412f
6b34525
ca43597
3307a65
4502cfb
04ceb34
686c686
bfdd189
67a4a86
aec57c6
e02a2a6
e8954e3
02adf4c
dd2ab3e
621f1b9
1dd2f84
b4e9992
c4478d7
bed4fd9
199ce5f
346d610
1625703
48c91cd
f74c501
ff83307
0114945
a9170ef
8b701ca
a4aa2d7
f34e749
3e5c46c
59f4e69
705ffcc
f9aaae6
506f7de
5bc1e4e
aef8942
b2347f0
1226a75
62141e5
7c213f8
c780c73
b68ea8a
04447de
665c586
117194a
b1c4f68
24964a4
5c8698b
9b287c5
eb3121f
15895cd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,10 +15,10 @@ require ( | |
cosmossdk.io/x/evidence v0.1.1 | ||
cosmossdk.io/x/tx v0.13.3 | ||
cosmossdk.io/x/upgrade v0.1.1 | ||
github.com/CosmWasm/wasmd v0.45.1-0.20231128163306-4b9b61faeaa3 | ||
github.com/CosmWasm/wasmd v0.50.0 | ||
github.com/CosmWasm/wasmvm v1.5.2 | ||
github.com/cometbft/cometbft v0.38.7 | ||
github.com/cometbft/cometbft-db v0.11.0 | ||
github.com/cometbft/cometbft-db v0.12.0 | ||
github.com/cosmos/cosmos-db v1.0.2 | ||
github.com/cosmos/cosmos-proto v1.0.0-beta.5 | ||
github.com/cosmos/cosmos-sdk v0.50.6 | ||
|
@@ -43,7 +43,7 @@ require ( | |
github.com/osmosis-labs/osmosis/osmoutils v0.0.13 | ||
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240517165907-1625703bc16d | ||
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240517165907-1625703bc16d | ||
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-00010101000000-000000000000 | ||
github.com/osmosis-labs/sqs/sqsdomain v0.18.1 | ||
github.com/pkg/errors v0.9.1 | ||
github.com/rakyll/statik v0.1.7 | ||
github.com/skip-mev/block-sdk/v2 v2.1.2 | ||
|
@@ -95,8 +95,7 @@ require ( | |
github.com/creachadair/atomicfile v0.3.1 // indirect | ||
github.com/creachadair/tomledit v0.0.24 // indirect | ||
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect | ||
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect | ||
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect | ||
github.com/dgraph-io/badger/v4 v4.2.0 // indirect | ||
github.com/distribution/reference v0.5.0 // indirect | ||
github.com/emicklei/dot v1.6.1 // indirect | ||
github.com/felixge/httpsnoop v1.0.4 // indirect | ||
|
@@ -106,6 +105,7 @@ require ( | |
github.com/go-sql-driver/mysql v1.7.1 // indirect | ||
github.com/gogo/googleapis v1.4.1 // indirect | ||
github.com/google/btree v1.1.2 // indirect | ||
github.com/google/flatbuffers v1.12.1 // indirect | ||
github.com/google/s2a-go v0.1.7 // indirect | ||
github.com/google/uuid v1.6.0 // indirect | ||
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect | ||
|
@@ -161,7 +161,6 @@ require ( | |
github.com/beorn7/perks v1.0.1 // indirect | ||
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect | ||
github.com/cenkalti/backoff/v4 v4.2.1 // indirect | ||
github.com/cespare/xxhash v1.1.0 // indirect | ||
github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
github.com/containerd/continuity v0.3.0 // indirect | ||
github.com/cosmos/btcutil v1.0.5 | ||
|
@@ -182,7 +181,7 @@ require ( | |
github.com/go-kit/log v0.2.1 // indirect | ||
github.com/go-logfmt/logfmt v0.6.0 // indirect | ||
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect | ||
github.com/gogo/protobuf v1.3.2 | ||
github.com/gogo/protobuf v1.3.2 // indirect | ||
github.com/golang/glog v1.2.0 // indirect | ||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect | ||
github.com/golang/snappy v0.0.4 // indirect | ||
|
@@ -241,7 +240,7 @@ require ( | |
github.com/zimmski/go-tool v0.0.0-20150119110811-2dfdc9ac8439 // indirect | ||
github.com/zimmski/osutil v0.0.0-20190128123334-0d0b3ca231ac // indirect | ||
github.com/zondax/hid v0.9.2 // indirect | ||
go.etcd.io/bbolt v1.3.8 // indirect | ||
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect | ||
go.opencensus.io v0.24.0 // indirect | ||
golang.org/x/crypto v0.23.0 // indirect | ||
golang.org/x/mod v0.17.0 // indirect | ||
|
@@ -259,34 +258,25 @@ replace ( | |
// TODO(https://github.com/cosmos/rosetta/issues/76): Rosetta requires cosmossdk.io/core v0.12.0 erroneously but | ||
// should use v0.11.0. The Cosmos build fails with types/context.go:65:29: undefined: comet.BlockInfo otherwise. | ||
cosmossdk.io/core => cosmossdk.io/core v0.11.0 | ||
|
||
// Needs to be replaced due to iavlFastNodeModuleWhitelist feature | ||
cosmossdk.io/store => github.com/osmosis-labs/cosmos-sdk/store v0.1.0-alpha.1.0.20240509221435-b8feb2ffb728 | ||
// adds expedited proposal support and 1000MB cache default | ||
// https://github.com/osmosis-labs/wasmd/releases/tag/v0.45.0-osmo | ||
// TODO: Use the github.com/osmosis-labs/wasmd version | ||
github.com/CosmWasm/wasmd => github.com/CosmWasm/wasmd v0.50.0 | ||
|
||
// Using branch osmo/v0.37.4 | ||
// UNFORKING v2 TODO: No longer use wasmd fork, added logic to app.toml override to use 1000 instead of default 100 cache size, which was the reason for having the fork in the first place. | ||
|
||
// Using branch osmo/v0.38.x | ||
// https://github.com/osmosis-labs/cometbft/releases/tag/v0.37.4-v25-osmo-2 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit is this tag relevant? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It is not, will replace tags when getting closer to release time. I suppose I could also just make an rc0 |
||
github.com/cometbft/cometbft => github.com/osmosis-labs/cometbft v0.0.0-20240510005818-6ce422c6f3d3 | ||
|
||
// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2 | ||
// github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2 | ||
|
||
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/4b9533e710b2b1e37aae86ad0fc29ec2ce009c07 | ||
// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.50.x, current branch: osmo/v0.50.x. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/1a5662f2a4586735a64388386eaf23a62dfddad9 | ||
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v25-osmo-1 | ||
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.50.0-rc.0.0.20240510201416-1a5662f2a458 | ||
// github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10 | ||
|
||
github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2-0.20240405172238-7f92c6b356ac | ||
|
||
github.com/cosmos/ibc-go/modules/light-clients/08-wasm => github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092650-57fcdb9a9a9d | ||
|
||
// // Local replaces commented for development | ||
// github.com/osmosis-labs/osmosis/osmomath => ./osmomath | ||
// github.com/osmosis-labs/osmosis/osmoutils => ./osmoutils | ||
// github.com/osmosis-labs/osmosis/x/epochs => ./x/epochs | ||
// github.com/osmosis-labs/osmosis/x/ibc-hooks => ./x/ibc-hooks | ||
// UNFORKING v2 TOOD: Need to manually define these until we tag, it keeps trying to "upgrade" which actually downgrades us to the old sdk sub module logic | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. . |
||
github.com/osmosis-labs/osmosis/osmomath => github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240517165907-1625703bc16d | ||
github.com/osmosis-labs/osmosis/osmoutils => github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240517165907-1625703bc16d | ||
github.com/osmosis-labs/osmosis/x/epochs => github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240517165907-1625703bc16d | ||
|
@@ -296,13 +286,17 @@ replace ( | |
|
||
// replace as directed by sdk upgrading.md https://github.com/cosmos/cosmos-sdk/blob/393de266c8675dc16cc037c1a15011b1e990975f/UPGRADING.md?plain=1#L713 | ||
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 | ||
|
||
// // Local replaces commented for development | ||
// github.com/osmosis-labs/osmosis/osmomath => ./osmomath | ||
// github.com/osmosis-labs/osmosis/osmoutils => ./osmoutils | ||
// github.com/osmosis-labs/osmosis/x/epochs => ./x/epochs | ||
// github.com/osmosis-labs/osmosis/x/ibc-hooks => ./x/ibc-hooks | ||
) | ||
|
||
// exclusion so we use v1.0.0 | ||
exclude github.com/coinbase/rosetta-sdk-go v0.7.9 | ||
|
||
exclude github.com/cosmos/cosmos-sdk v0.50.1 | ||
|
||
exclude github.com/gogo/protobuf v1.3.3 | ||
|
||
//exclude github.com/cometbft/cometbft v0.38.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.