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

deps: update to SDK v0.50 #4535

Merged
merged 47 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
72bf690
deps: sdk v0.50-beta (#3883)
faddat Jul 25, 2023
45c2fd0
Merge commit '49cdfc5ffadff9b8eef09d6a962201f0a4574e52' into fully-re…
faddat Aug 3, 2023
87cc749
Merge commit '38d31225c1859e01292ef93fec6370100590054a' into refresh-…
faddat Aug 3, 2023
6942115
Merge commit '2ac55069ad479838f93d9f4000f526a944196236' into refresh-…
faddat Aug 3, 2023
2d29e8b
Merge commit '9e970031b4d29ef31235329bad54e96654c65ba1' into refresh-…
faddat Aug 3, 2023
96fb3ca
Merge commit 'a4ca39c59f770a0b6948947d5178d5f0914c3a17' into refresh-…
faddat Aug 3, 2023
9cc55d4
Merge remote-tracking branch 'origin/main' into refresh-sdk-50
faddat Aug 3, 2023
9acb10a
tidy
faddat Aug 3, 2023
8fe8c50
update cosmos-sdk
faddat Aug 3, 2023
a707638
fix changes
faddat Aug 3, 2023
f69b7ac
lint the v50 branch and update linter version used
faddat Aug 3, 2023
1f0e922
Merge branch 'faddat/bump-sdk' into refresh-sdk-50
faddat Aug 3, 2023
4e1d13e
Merge pull request #4273 from notional-labs/refresh-sdk-50
colin-axner Aug 7, 2023
ab0675d
chore: update sdk 50 branch from main (#4316)
faddat Aug 17, 2023
b95aadb
Implement appmodule.AppModule interface for ibc-go packages' modules …
pysel Aug 21, 2023
0be8050
update cosmos-sdk in v50 feature branch (#4392)
faddat Aug 24, 2023
c7302c1
deps: update the sdk 50 branch to main (#4391)
faddat Aug 24, 2023
342054b
Merge commit 'dd85040eb180b941d01ffdf974ad1ba1dceb2d49' of github.com…
colin-axner Aug 24, 2023
52d2926
Merge branch 'main' of github.com:cosmos/ibc-go into feat/upgrade-sdk…
colin-axner Aug 24, 2023
7de4705
fix: callbacks types test for events
colin-axner Aug 24, 2023
d0ab828
Merge pull request #4452 from cosmos/colin/bump-sdkv0.50-feature-branch
colin-axner Aug 24, 2023
108f683
Merge remote-tracking branch 'origin/main' into feat/upgrade-sdk-v0.50
faddat Aug 26, 2023
1e2f4d8
Merge remote-tracking branch 'origin/main' into faddat/update-v50-to-…
faddat Aug 29, 2023
0ce4d69
testing: e2e support for sdkv50 (#4485)
charleenfei Aug 31, 2023
144e13c
Merge branch 'feat/upgrade-sdk-v0.50' of github.com:cosmos/ibc-go int…
colin-axner Aug 31, 2023
29a556e
Merge branch 'main' of github.com:cosmos/ibc-go into HEAD
colin-axner Aug 31, 2023
6c9c1a2
Merge pull request #4469 from notional-labs/faddat/update-v50-to-main-3
colin-axner Aug 31, 2023
419d7b6
Merge branch 'main' of github.com:cosmos/ibc-go into feat/upgrade-sdk…
colin-axner Sep 4, 2023
1643ce9
Apply suggestions from code review
colin-axner Sep 4, 2023
e67d7db
nits: self review
colin-axner Sep 4, 2023
292456a
Merge branch 'main' of github.com:cosmos/ibc-go into feat/upgrade-sdk…
colin-axner Sep 4, 2023
71fa030
chore: make relayer selection work correctly when determining from en…
chatton Sep 4, 2023
a55cf84
Merge branch 'feat/upgrade-sdk-v0.50' of https://github.com/cosmos/ib…
chatton Sep 4, 2023
9b397cd
chore: correcting string checks
chatton Sep 4, 2023
8d88561
nit: switch golang lint timeout to 10m
colin-axner Sep 4, 2023
0f68615
refactor: ccmtservice -> consensusService
colin-axner Sep 4, 2023
51a46af
refactor: remove upgrade logic from callbacks simapp
colin-axner Sep 4, 2023
60b5c31
apply mega nits
colin-axner Sep 4, 2023
7821dc3
refactor: remove usage of extended commits in testing pkg
colin-axner Sep 4, 2023
4d9aa38
review: add pointer receiver to registerUpgradeHandlers
colin-axner Sep 4, 2023
0fd5185
e2e-fixes: add back intertx types and set hermes as default relayer
colin-axner Sep 4, 2023
2da7aa9
run linter
colin-axner Sep 4, 2023
f58f4ac
move intertx to it's orignal registration location
colin-axner Sep 4, 2023
4dc1543
fix: use type not tag in e2e testconfig
colin-axner Sep 4, 2023
723cb13
chore: updating sample file to use custom hermes image
chatton Sep 4, 2023
1abf028
e2e: call unsafe reset all in genesis test
colin-axner Sep 4, 2023
2f91974
Merge branch 'feat/upgrade-sdk-v0.50' of github.com:cosmos/ibc-go int…
colin-axner Sep 4, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test-workflow-call.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ on:
relayer-type:
description: 'The type of relayer to use'
required: false
default: 'rly'
default: 'hermes'
type: string
relayer-tag:
description: 'The tag to use for the relayer'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ jobs:
run: |
if [ "${{ github.event_name }}" == "schedule" ]
then
echo "relayer=hermes" >> $GITHUB_OUTPUT
echo "relayer-tag=1.4.0" >> $GITHUB_OUTPUT
else
echo "relayer=rly" >> $GITHUB_OUTPUT
echo "relayer-tag=latest" >> $GITHUB_OUTPUT
echo "relayer-tag=colin-event-fix" >> $GITHUB_OUTPUT
else
echo "relayer=hermes" >> $GITHUB_OUTPUT
echo "relayer-tag=v1.6.0" >> $GITHUB_OUTPUT
Comment on lines +59 to +62
Copy link
Contributor

Choose a reason for hiding this comment

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

I like how these 4 lines are the result of ~2 or 3 full days investigation :D

fi
# build-e2e ensures that all test code compiles.
build-e2e:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
uses: golangci/[email protected]
with:
version: v1.54.2
args: --timeout 5m
args: --timeout 10m
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
buf_token: ${{ secrets.BUF_TOKEN }}
buf_token: ${{ secrets.BUF_TOKEN }}
3 changes: 1 addition & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
run:
tests: true
# # timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 5m
timeout: 10m

linters:
disable-all: true
Expand Down
76 changes: 47 additions & 29 deletions e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ go 1.21
require (
cosmossdk.io/errors v1.0.0
cosmossdk.io/math v1.1.2
github.com/cometbft/cometbft v0.37.2
github.com/cosmos/cosmos-sdk v0.47.5
github.com/cosmos/gogoproto v1.4.10
cosmossdk.io/x/upgrade v0.0.0-20230818115413-c402c51a1508
github.com/cometbft/cometbft v0.38.0-rc3
github.com/cosmos/cosmos-sdk v0.50.0-rc.0.0.20230819070346-e8164be94954
github.com/cosmos/gogoproto v1.4.11
github.com/cosmos/ibc-go/v7 v7.3.0
github.com/cosmos/interchain-accounts v0.5.1
github.com/docker/docker v24.0.5+incompatible
Expand All @@ -20,17 +21,13 @@ require (
)

require (
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go v0.110.6 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.0 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cosmossdk.io/tools/rosetta v0.2.1 // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
github.com/aws/aws-sdk-go v1.44.224 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
github.com/confio/ics23/go v0.9.0 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
Expand All @@ -40,7 +37,6 @@ require (
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
Expand All @@ -50,26 +46,34 @@ require (
)

require (
cosmossdk.io/api v0.3.1 // indirect
cosmossdk.io/core v0.5.1 // indirect
cosmossdk.io/api v0.7.0 // indirect
cosmossdk.io/client/v2 v2.0.0-20230818115413-c402c51a1508 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core v0.10.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/log v1.2.1 // indirect
cosmossdk.io/log v1.2.0 // indirect
cosmossdk.io/store v1.0.0-alpha.1.0.20230728080422-54ed7dab3982 // indirect
cosmossdk.io/x/circuit v0.0.0-20230818115413-c402c51a1508 // indirect
cosmossdk.io/x/evidence v0.0.0-20230818115413-c402c51a1508 // indirect
cosmossdk.io/x/feegrant v0.0.0-20230818115413-c402c51a1508 // indirect
cosmossdk.io/x/tx v0.9.1 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.2 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect
github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/avast/retry-go/v4 v4.5.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
github.com/bits-and-blooms/bitset v1.8.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
Expand All @@ -78,17 +82,19 @@ require (
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
github.com/cockroachdb/errors v1.10.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230817233644-564b068800e0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft-db v0.8.0 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
github.com/cosmos/cosmos-db v1.0.0 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v0.20.0 // indirect
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 // indirect
github.com/cosmos/iavl v1.0.0-beta.2 // indirect
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc3 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect
github.com/creachadair/taskgroup v0.4.2 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.8.0 // indirect
Expand All @@ -105,15 +111,18 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/emicklei/dot v1.5.0 // indirect
github.com/ethereum/go-ethereum v1.11.2 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.23.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gobwas/ws v1.1.0 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.3 // indirect
Expand All @@ -133,13 +142,17 @@ require (
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/gtank/ristretto255 v0.1.2 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/go-metrics v0.5.1 // indirect
github.com/hashicorp/go-plugin v1.4.10 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
github.com/huandu/skiplist v1.2.0 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 // indirect
github.com/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -174,6 +187,8 @@ require (
github.com/multiformats/go-multicodec v0.8.1 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand All @@ -185,7 +200,7 @@ require (
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
Expand All @@ -211,20 +226,21 @@ require (
go.etcd.io/bbolt v1.3.7 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.12.0 // indirect
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/cc/v3 v3.40.0 // indirect
Expand All @@ -237,7 +253,7 @@ require (
modernc.org/strutil v1.1.3 // indirect
modernc.org/token v1.1.0 // indirect
nhooyr.io/websocket v1.8.7 // indirect
pgregory.net/rapid v1.0.0 // indirect
pgregory.net/rapid v1.1.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

Expand All @@ -254,3 +270,5 @@ replace github.com/cosmos/ibc-go/v7 => ../
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

replace github.com/strangelove-ventures/interchaintest/v7 => github.com/notional-labs/interchaintest/v7 v7.0.0-20230831143727-c9539fd05629
Loading