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

feat: sdk v0.50.x upgrade #8274

Merged
merged 95 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
6d70096
initial push
czarcas7ic May 7, 2024
8536841
delete
czarcas7ic May 7, 2024
fdab2ba
tidy
czarcas7ic May 7, 2024
9dddc1b
add replace
czarcas7ic May 7, 2024
b986140
proto
czarcas7ic May 7, 2024
9fcbd6b
excludes
czarcas7ic May 7, 2024
b28e6ff
update go mods
czarcas7ic May 7, 2024
114125c
fix
czarcas7ic May 7, 2024
1595fd8
initial pass through modules
czarcas7ic May 8, 2024
768f2b1
checkpoint
czarcas7ic May 8, 2024
7995b58
checkpoint
czarcas7ic May 8, 2024
8bfa7f1
another round
czarcas7ic May 8, 2024
53f94a6
fork update with fixes
czarcas7ic May 9, 2024
e9d96ce
fork bumps
czarcas7ic May 10, 2024
a3d52ff
more fixes
czarcas7ic May 10, 2024
38cda38
move to cosmosdb
czarcas7ic May 10, 2024
da8bd95
signModeHandler fix
czarcas7ic May 10, 2024
ec9e0aa
more fixes
czarcas7ic May 10, 2024
29bea81
store fixes
czarcas7ic May 10, 2024
c719bd3
checkpoint
czarcas7ic May 10, 2024
2b0d471
checkpoint
czarcas7ic May 11, 2024
cd3d9e2
more event fixes
czarcas7ic May 11, 2024
5f20366
GetSigners fix for tests
czarcas7ic May 11, 2024
2fabe91
get signers fixes
czarcas7ic May 11, 2024
0569420
smart account fixes
czarcas7ic May 11, 2024
9175a70
fixes
czarcas7ic May 12, 2024
3bebd10
checkpoint
czarcas7ic May 12, 2024
7214f3e
txfees completion
czarcas7ic May 12, 2024
1bcb8be
more errors
czarcas7ic May 12, 2024
196b215
rosetta import
czarcas7ic May 12, 2024
87163a1
address simulation
czarcas7ic May 12, 2024
c966351
smart account get sign bytes
czarcas7ic May 12, 2024
5e8738a
disable streaming service
czarcas7ic May 12, 2024
a3906bb
some test fixes
czarcas7ic May 12, 2024
c4a3e6a
as signer proto
czarcas7ic May 13, 2024
f771538
fix some tests
czarcas7ic May 13, 2024
7fb5255
fix superfluid test
czarcas7ic May 14, 2024
4ac614e
more fixes
czarcas7ic May 14, 2024
508c492
fix gamm keeper test with note
czarcas7ic May 14, 2024
85b4654
fix authz serialization
czarcas7ic May 14, 2024
94a0751
fix validate basic test
czarcas7ic May 14, 2024
0fd1931
incentives test fix
czarcas7ic May 14, 2024
648b0a6
fix lockup test
czarcas7ic May 14, 2024
7ca412f
begin and end block fixes
czarcas7ic May 14, 2024
6b34525
fix epochs tests
czarcas7ic May 15, 2024
ca43597
fix all upgrade tests
czarcas7ic May 15, 2024
3307a65
fix txfees test
czarcas7ic May 15, 2024
4502cfb
fix e2e init test
czarcas7ic May 15, 2024
04ceb34
more fixes
czarcas7ic May 15, 2024
686c686
updated ibctesting overrides. Removed unnecessary receiver length che…
nicolaslara May 15, 2024
bfdd189
smart account integration test fixes
nicolaslara May 15, 2024
67a4a86
SetAccount no longer needed. Done internally.
nicolaslara May 15, 2024
aec57c6
more set account issues
nicolaslara May 15, 2024
e02a2a6
gas checks are not needed when using selected authenticators. That wa…
nicolaslara May 15, 2024
e8954e3
fix accounts and codec
nicolaslara May 15, 2024
02adf4c
using codec with proper "osmo" prefix. The default test codec uses "c…
nicolaslara May 15, 2024
dd2ab3e
fix ibc-hooks tests
nicolaslara May 15, 2024
621f1b9
streaming fixes
czarcas7ic May 17, 2024
1dd2f84
upgrade handler
czarcas7ic May 17, 2024
b4e9992
tidy
czarcas7ic May 17, 2024
c4478d7
Merge branch 'main' into adam/v0.50.x-upgrade
czarcas7ic May 17, 2024
bed4fd9
golang bump 1.22
czarcas7ic May 17, 2024
199ce5f
prevent circular dep
czarcas7ic May 17, 2024
346d610
update osmoutils
czarcas7ic May 17, 2024
1625703
tidy
czarcas7ic May 17, 2024
48c91cd
remove local replaces for testing
czarcas7ic May 17, 2024
f74c501
set up module.go
czarcas7ic May 18, 2024
ff83307
fix dockerfile for local work
czarcas7ic May 18, 2024
0114945
module changes
czarcas7ic May 19, 2024
a9170ef
fix e2e
czarcas7ic May 20, 2024
8b701ca
more ci fixes
czarcas7ic May 20, 2024
a4aa2d7
fix simulator
czarcas7ic May 20, 2024
f34e749
lints
czarcas7ic May 20, 2024
3e5c46c
remove wrap
czarcas7ic May 20, 2024
59f4e69
lints
czarcas7ic May 20, 2024
705ffcc
lints
czarcas7ic May 20, 2024
f9aaae6
clean up the TODOs
czarcas7ic May 20, 2024
506f7de
more todo clean ups
czarcas7ic May 20, 2024
5bc1e4e
comments
czarcas7ic May 20, 2024
aef8942
comments
czarcas7ic May 20, 2024
b2347f0
move test outside of osmoutils
czarcas7ic May 20, 2024
1226a75
clean up go mods
czarcas7ic May 21, 2024
62141e5
Merge branch 'main' into adam/v0.50.x-upgrade
czarcas7ic May 21, 2024
7c213f8
Merge branch 'main' into adam/v0.50.x-upgrade
czarcas7ic May 21, 2024
c780c73
fix errors for GetDelegation
czarcas7ic May 21, 2024
b68ea8a
return error instead of panic
czarcas7ic May 22, 2024
04447de
chore: fix build
PaddyMc May 22, 2024
665c586
Merge branch 'main' into adam/v0.50.x-upgrade
czarcas7ic May 22, 2024
117194a
fix weird error check
czarcas7ic May 24, 2024
b1c4f68
Merge branch 'main' into adam/v0.50.x-upgrade
czarcas7ic May 24, 2024
24964a4
ignore words
czarcas7ic May 24, 2024
5c8698b
more spelling fixes
czarcas7ic May 24, 2024
9b287c5
final spelling errors
czarcas7ic May 24, 2024
eb3121f
Revert "more spelling fixes"
czarcas7ic May 24, 2024
15895cd
redo spelling check
czarcas7ic May 24, 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
5 changes: 5 additions & 0 deletions cmd/osmosisd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ var (
Key: "max-gas-wanted-per-tx",
Value: "60000000",
},
{
Section: "wasm",
Key: "memory_cache_size",
Value: 1000,
},
}

recommendedConfigTomlValues = []SectionKeyValue{
Expand Down
44 changes: 19 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.


// Using branch osmo/v0.38.x
// https://github.com/osmosis-labs/cometbft/releases/tag/v0.37.4-v25-osmo-2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit is this tag relevant?

Copy link
Member Author

Choose a reason for hiding this comment

The 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
Copy link
Member Author

Choose a reason for hiding this comment

The 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
Expand All @@ -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
Loading