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: sdk v0.50-alpha #3883

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
317 commits
Select commit Hold shift + click to select a range
3d58b82
update SetupWithGenesisValSet func
sontrinh16 Jun 17, 2023
f88b937
sdk 50 first go
faddat Jun 9, 2023
ae7db80
add go workspace
faddat Jun 9, 2023
34502cf
make proto-gen, cleanup
faddat Jun 9, 2023
a932e98
additiona cleanup of imports
faddat Jun 9, 2023
58cd6e1
updates...
faddat Jun 9, 2023
2b2f14a
handle expedited proposal bools
faddat Jun 10, 2023
34d6e90
restructure modules
faddat Jun 10, 2023
954d67c
pre revert commit
faddat Jun 10, 2023
6c2d940
Revert "restructure modules"
faddat Jun 10, 2023
64907eb
correctly migrate modules
faddat Jun 10, 2023
6c59874
migrate parameter store
faddat Jun 10, 2023
84b2cbe
fix calls to NewContext
faddat Jun 10, 2023
2863fb3
tidy and enable thelper
faddat Jun 10, 2023
beb4895
use thelper and disable depguard
faddat Jun 10, 2023
5398ebc
use latest golangci-lint in ci
faddat Jun 10, 2023
ed91aa1
upgrade to go 1.20 and newer protobuf builder to reduce v50 changeset
faddat Jun 10, 2023
1f5c002
more cleanup, 5% of tests pass
faddat Jun 10, 2023
ff610bc
add go work
faddat Jun 10, 2023
97b2f1d
bumps
faddat Jun 10, 2023
7808b79
set up rootmultistore in the new way and address WrongArgCount lints
faddat Jun 10, 2023
9018b67
fixing
sontrinh16 Jun 14, 2023
117e0b9
Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into…
sontrinh16 Jun 14, 2023
a8f1dbc
register modulebasicmanager in app.go
faddat Jun 15, 2023
4b28b56
add module register in app.go
sontrinh16 Jun 15, 2023
ae5fc78
Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into…
sontrinh16 Jun 15, 2023
961e24f
fix the upgrade module's return
faddat Jun 15, 2023
450a66a
all errors now checked
faddat Jun 15, 2023
28fd9ee
update FinalizeBlock height input
sontrinh16 Jun 15, 2023
4c67968
update FinalizeBlock height input
sontrinh16 Jun 15, 2023
74f16f7
revert changes to the capability module path
faddat Jun 16, 2023
9eee032
add circuit breaker
faddat Jun 16, 2023
43a9eec
Begin to use modulebasicmanager
faddat Jun 16, 2023
7bac9a0
rename Marshaler to Codec
faddat Jun 16, 2023
6a70698
account for modulebasicmanager
faddat Jun 16, 2023
bba05f8
fix setup()
faddat Jun 16, 2023
d9480f2
fix import cycle
faddat Jun 16, 2023
488f452
use appcodec for setuptestingapp
faddat Jun 16, 2023
2d96e89
add missing IBCKeeper initialize and remove unused module from module…
sontrinh16 Jun 17, 2023
46e4099
update SetupWithGenesisValSet func
sontrinh16 Jun 17, 2023
02638d0
fixups
faddat Jun 18, 2023
3565e22
remove argument from NewContext
pysel Jun 18, 2023
578cfbb
remove unused code
pysel Jun 18, 2023
c88afa6
refactor FundAccount usage
pysel Jun 18, 2023
ff6b19a
fix test
pysel Jun 18, 2023
fa322aa
coins.IsEqual -> coins.Equal
pysel Jun 18, 2023
5ce68c1
replace errorsmod path
pysel Jun 18, 2023
60c4b75
fix SetupTest
pysel Jun 18, 2023
3df95d9
remove unused variable
pysel Jun 18, 2023
bac4355
change function origin
pysel Jun 18, 2023
1004c0d
sdk -> storetypes
pysel Jun 18, 2023
3ff8d7d
replace name
pysel Jun 18, 2023
cad89ad
cleanup app.go like goland diff ~/ibc-go/testing/simapp ~/cosmos-sdk/…
faddat Jun 18, 2023
fa20458
ModuleManager
faddat Jun 18, 2023
279b10b
add makeCommit func
sontrinh16 Jun 18, 2023
a3e9f8b
fix conflict
sontrinh16 Jun 18, 2023
ab85343
fixing
sontrinh16 Jun 18, 2023
b26ccfa
minor
sontrinh16 Jun 18, 2023
099f888
remove double imports
pysel Jun 19, 2023
835e48f
linting
pysel Jun 19, 2023
715f28d
add interface registry for ibc light client
sontrinh16 Jun 19, 2023
7ce40ef
Merge branch 'ibc-go-sdk-50-mark-2' of https://github.com/notional-la…
sontrinh16 Jun 19, 2023
93a5466
register client state
pysel Jun 19, 2023
e857029
bump cometbft to the latest commit from the v0.38.x branch
faddat Jun 19, 2023
69933c3
parallel tests
faddat Jun 19, 2023
6cd0353
parallelize one more test
faddat Jun 19, 2023
a7f9021
undeprecate stuff
pysel Jun 20, 2023
08a79a3
unwrap sdk context: deprecated
pysel Jun 20, 2023
1d53ae1
big ctx unwrapping
pysel Jun 20, 2023
421dc61
accountI
pysel Jun 20, 2023
9243ac4
undeprecate events
pysel Jun 20, 2023
c4d51de
amino
pysel Jun 20, 2023
323d84d
29-fee amino
pysel Jun 20, 2023
01adf7c
add interface registry solomachine
GNaD13 Jun 20, 2023
9cceed2
change to legacy context
GNaD13 Jun 20, 2023
b53e4f3
add dockerfile
pysel Jun 21, 2023
a276031
try debugging
sontrinh16 Jun 22, 2023
24cc3ae
eliminate changes to .github
faddat Jun 23, 2023
a13f1f8
Revert "parallel tests"
faddat Jun 23, 2023
a831c9e
make some of the changes suggested by @alpe / review wasmd's implemen…
faddat Jun 23, 2023
c0ab808
push changes to chain.go w/ attribution
faddat Jun 23, 2023
a391be0
correctly eliminate changes from .github
faddat Jun 23, 2023
16396a1
remove the compatiblity test matrices
faddat Jun 23, 2023
b04fd09
remove all of .github
faddat Jun 23, 2023
01d3ec7
re-add .github checked out from the feature branch
faddat Jun 23, 2023
33e2ef2
revert gitignore changes
faddat Jun 23, 2023
3687486
remove .dockerignore
faddat Jun 23, 2023
7ff3d4c
ensure no changes to docs and ci config
faddat Jun 23, 2023
9d66be0
fix conflict with main
sontrinh16 Jun 26, 2023
b1b74a3
fix setup
sontrinh16 Jun 26, 2023
8d42349
revert the addition of go.work
faddat Jun 27, 2023
3702bb6
lint
faddat Jun 27, 2023
76ca90b
fix .github
faddat Jun 27, 2023
bb0e79c
Merge remote-tracking branch 'origin/feat/upgrade-sdk-v0.50' into ibc…
faddat Jun 27, 2023
8f8d327
uncomment
faddat Jun 27, 2023
7ea1421
sync
faddat Jun 27, 2023
b2e7c5f
remove go.work.sum
faddat Jun 27, 2023
b366fb4
tidy
faddat Jun 27, 2023
36dec7f
fix issue in GetSimApp
faddat Jun 27, 2023
d7fcbba
correct number of variables in export.go
faddat Jun 27, 2023
5e61394
sdk.Context -> context.Context
faddat Jun 27, 2023
2ebfd10
begin to fix queries for ica
faddat Jun 27, 2023
f5f1008
this commit will allow us to separate capability
faddat Jun 27, 2023
444db19
break out capability
faddat Jun 27, 2023
4ab2772
fix
sontrinh16 Jun 27, 2023
53d9ab7
fix conflict
sontrinh16 Jun 27, 2023
ed6637e
Merge branch 'ibc-go-sdk-50-mark-2' of https://github.com/notional-la…
faddat Jun 28, 2023
447e4f4
fix accountkeeper
faddat Jun 28, 2023
3c8435d
fix call to clear validator historical rewards in export.go
faddat Jun 28, 2023
72e5ee0
fix transfer_authorization.go
faddat Jun 28, 2023
b406682
fix authz types in transfer_authorization_test.go
faddat Jun 28, 2023
5dbed73
lint
faddat Jun 28, 2023
d3a3b6d
fix: apply SDK app hash fix
colin-axner Jun 29, 2023
21b78b1
go mod tidy in capability
colin-axner Jun 29, 2023
e8321e1
Merge pull request #213 from cosmos/colin/sdk-eden-fix
sontrinh16 Jun 30, 2023
b09bcc4
tidy
faddat Jun 30, 2023
f27027f
Merge branches 'ibc-go-sdk-50-mark-2' and 'ibc-go-sdk-50-mark-2' of h…
faddat Jun 30, 2023
568409c
handle errors in export
faddat Jun 30, 2023
941f9da
fix lint in root.go
faddat Jul 2, 2023
1980fcf
refactor: change sdk.Events usage to []abci.Event
colin-axner Jun 28, 2023
b4a638f
fix: e2e build
colin-axner Jun 29, 2023
7089d33
bumps and fix the proposal test
faddat Jul 2, 2023
6e40b8b
bumps for capability
faddat Jul 2, 2023
39e5f3a
use 0.13.3 proto-gen
faddat Jul 2, 2023
1c890e0
bring in new changes to app.go and follow @alpe's advice on versionin…
faddat Jul 3, 2023
fadad9c
add an abci.go file
faddat Jul 3, 2023
50470ce
various bumps to resolve the go-metrics issue
faddat Jul 3, 2023
c6b9b14
tidy capability module
faddat Jul 3, 2023
c2ff361
actually tidy capability module
faddat Jul 3, 2023
c3fca2f
various updates, linting
faddat Jul 3, 2023
3f796bf
add attributeKeyData to emitted events
faddat Jul 3, 2023
17302ef
begin with the acknowledgement
faddat Jul 3, 2023
f0e61f0
Update modules/apps/27-interchain-accounts/module.go
faddat Jul 3, 2023
ba95a58
Update modules/capability/module.go
faddat Jul 3, 2023
553c2a9
Update modules/apps/27-interchain-accounts/module.go
faddat Jul 3, 2023
5e7f837
return nil error in the capability module's beginblock
faddat Jul 3, 2023
88bb6f0
use sdk's mustsortjson
faddat Jul 5, 2023
7231a45
use the sdk's MustSortJSON
faddat Jul 5, 2023
f8a97ce
lint
faddat Jul 5, 2023
1a3f9d2
fix: test fixes in 02-client
colin-axner Jul 5, 2023
6c196f1
fix: update mock priv val to match cometbft
colin-axner Jul 5, 2023
b0c11c1
update storetypes from the sdk types library
faddat Jul 5, 2023
dbb500b
lint
faddat Jul 5, 2023
e1a622d
improvement(api)!: remove unused `EventTypeTimeoutPacketOnClose` (#3806)
crodriguezvega Jul 3, 2023
1c07a6b
testing: add function `RelayPacketWithResults` (#3986)
crodriguezvega Jul 3, 2023
571f558
build(deps): Bump bufbuild/buf-setup-action from 1.23.0 to 1.23.1 (#3…
dependabot[bot] Jul 3, 2023
bc1d1d6
abcitxresult
faddat Jul 5, 2023
fe098b9
feat(ica)!: support json tx encoding for interchain accounts (#3796)
srdtrk Jul 3, 2023
96efd65
cleanup after merging json support
faddat Jul 5, 2023
c2bc0bc
lint
faddat Jul 5, 2023
9c86c9d
imp: refactor simapp to more closely resemble the style used in cosmo…
faddat Jul 3, 2023
e8556bb
fix testpb
faddat Jul 5, 2023
360bac5
Merge remote-tracking branch 'origin/feat/upgrade-sdk-v0.50' into ibc…
faddat Jul 5, 2023
a6f3e97
post-merge cleanup
faddat Jul 5, 2023
0bebbc1
Merge remote-tracking branch 'origin/main' into ibc-go-sdk-50-mark-2
faddat Jul 6, 2023
6a8c595
Revert "Merge remote-tracking branch 'origin/main' into ibc-go-sdk-50…
faddat Jul 6, 2023
7359d82
remove testing/simapp/abci.go
faddat Jul 10, 2023
c82e899
remove dummy vote extension handler
faddat Jul 10, 2023
2ca5ef6
remove copylocks
faddat Jul 10, 2023
0a860d0
revert unneeded changes
faddat Jul 10, 2023
40034a6
add GetMemKey again
faddat Jul 10, 2023
26a56ce
restore all use of getmemkey
faddat Jul 10, 2023
0dcf5cc
bump sdk's libraries, cleanup (#214)
faddat Jul 10, 2023
a8b55ee
Update genesis_test.go
faddat Jul 10, 2023
8abb293
revert a memkey change
faddat Jul 10, 2023
2cbd5fb
memstorekey change
faddat Jul 10, 2023
b411802
Update modules/apps/27-interchain-accounts/host/client/cli/cli.go
faddat Jul 10, 2023
a45dcd7
Update keeper_test.go
faddat Jul 10, 2023
ed259fd
don't add tests (reduce diff) (#215)
faddat Jul 11, 2023
96cddcc
use the separated capability module
faddat Jul 11, 2023
65937f6
sync
faddat Jul 11, 2023
d8261b9
tidy
faddat Jul 11, 2023
8acc656
remove an unneeded import
faddat Jul 11, 2023
15efbf7
fix ics27 tests
colin-axner Jul 13, 2023
838c3b1
fix: add back signer and validate basic checks
colin-axner Jul 13, 2023
5dc176a
fix: coordinator no longer updates time before committing a block
colin-axner Jul 13, 2023
5777723
fix: handle querying validator set for current block
colin-axner Jul 13, 2023
74401f9
fix: correctly parse channelID from solomachine
colin-axner Jul 13, 2023
6cc004f
remove print statement
crodriguezvega Jul 14, 2023
29e0bdd
Merge feature branch
crodriguezvega Jul 14, 2023
36ee8ec
bump capability module to v1.0.0-rc2
crodriguezvega Jul 14, 2023
72796c4
fix fee event test
crodriguezvega Jul 14, 2023
ad127ce
linter fixes
crodriguezvega Jul 14, 2023
20f6740
comment about replace directive
crodriguezvega Jul 14, 2023
4fe7168
Merge feature branch (again)
crodriguezvega Jul 14, 2023
c317763
merge fix for client test
crodriguezvega Jul 14, 2023
292f007
remove unused import
crodriguezvega Jul 14, 2023
28eaf9b
fix capability imports
crodriguezvega Jul 14, 2023
c094320
adjust timeout
faddat Jul 16, 2023
7264e9b
potentially a better way to test for the event
crodriguezvega Jul 17, 2023
ebf66a9
Update modules/core/04-channel/keeper/events.go
faddat Jul 18, 2023
4c84db6
build(deps): Bump bufbuild/buf-setup-action from 1.23.1 to 1.24.0 (#4…
dependabot[bot] Jul 14, 2023
6778020
Use alpine as base image for building simd. (#4067)
DimitrisJim Jul 16, 2023
f42c01b
fix: undo unnecessary capability changes
colin-axner Jul 17, 2023
f4b2cad
testing: simplify ica codec setup
colin-axner Jul 17, 2023
3fa9b91
refactor: remove unnecessary begin blocka and end block functions
colin-axner Jul 17, 2023
d57c393
fix: add back removed events
colin-axner Jul 17, 2023
35a4951
test: add back commented test with fixed logic
colin-axner Jul 18, 2023
20359ea
nit: move context unwrapping to callsite
colin-axner Jul 18, 2023
c2fc3c4
nit: rename found to err
colin-axner Jul 18, 2023
e856c8e
nit: remove unnecessary client state registration in solo machine
colin-axner Jul 18, 2023
41772a4
Merge branch 'feat/upgrade-sdk-v0.50' of github.com:cosmos/ibc-go int…
colin-axner Jul 20, 2023
edf7548
nit: formatting
colin-axner Jul 20, 2023
dee01fe
nit: undo merge conflict change
colin-axner Jul 20, 2023
2587a7d
fix: grpc err check
colin-axner Jul 20, 2023
9601322
nit: error formatting
colin-axner Jul 20, 2023
62a496c
nit: add back linter check to reduce review diffs
colin-axner Jul 20, 2023
2912976
test: fixup channel tests
colin-axner Jul 20, 2023
5a5196f
test: add back missing tests
colin-axner Jul 20, 2023
924a887
simapp: match sdk structure
colin-axner Jul 20, 2023
e048f38
refactor: remove unnecessary code
colin-axner Jul 20, 2023
56b77b5
remove: unnecessary file
colin-axner Jul 20, 2023
7a34223
fix: add back simapp upgrades
colin-axner Jul 20, 2023
7d61919
fix: remove added changes from merge conflict
colin-axner Jul 20, 2023
ba89e89
update sdk
faddat Jul 22, 2023
f318f08
tidy
faddat Jul 22, 2023
168b572
cleanup and add to capbability
faddat Jul 22, 2023
b0263ea
cleanup staking keeper, account keeper, and gov router
faddat Jul 22, 2023
8a485c2
remove height from keeper test
faddat Jul 22, 2023
4cf0ed3
update proto builder version
faddat Jul 22, 2023
94b8071
revert changes to the misbehaviour test
faddat Jul 22, 2023
06f36bb
eliminate unnecessary aliases
faddat Jul 22, 2023
d2649cc
tidy capabilities
faddat Jul 22, 2023
4eef9f7
bump deps again (to be sure)
faddat Jul 22, 2023
6ca86ce
cleanup with changes from sdk upstream
faddat Jul 22, 2023
7a18e0a
fix minor delegation address setup in SetupWithGenesisValSet
sontrinh16 Jul 22, 2023
e7feb6d
minor
sontrinh16 Jul 22, 2023
2952fdf
switch to ext vote set
sontrinh16 Jul 22, 2023
a98af7f
resolve transfer timeout-height flag redefined on cmd test err
sontrinh16 Jul 22, 2023
7566557
bump sdk
faddat Jul 24, 2023
c09778c
tidy
faddat Jul 24, 2023
c70bc92
fix a linting issue in app.go
faddat Jul 24, 2023
54df149
use abci instead of abcitypes
faddat Jul 24, 2023
1d7283b
remove named returns
faddat Jul 24, 2023
e8c560b
use latest capability module
faddat Jul 24, 2023
db795b9
rm unnecessary import alias: pkg context
damiannolan Jul 24, 2023
f24ee35
updating to latest buf tag for cosmos-sdk
damiannolan Jul 24, 2023
f92bdd2
imp: add in-code docs to ica message authentication
colin-axner Jul 25, 2023
0d13b5b
test: simplify test logic
colin-axner Jul 25, 2023
ce4df1a
nit: testing fixes
colin-axner Jul 25, 2023
50174ad
refactor: slim down necessary changes in testing pkg
colin-axner Jul 25, 2023
c7fbb20
Merge branch 'feat/upgrade-sdk-v0.50' of github.com:cosmos/ibc-go int…
colin-axner Jul 25, 2023
ed60bbb
refactor: format upgrade handlers properly
colin-axner Jul 25, 2023
f13b2bd
refactor: simapp app.go cleanup
colin-axner Jul 25, 2023
643444b
fix: fix build issue and simplify test code
colin-axner Jul 25, 2023
c81c5d0
rm: root_v2.go
colin-axner Jul 25, 2023
dade39b
refactor: remove unnecessary functions in test_helpers.go
colin-axner Jul 25, 2023
ac0a2da
fix: simd cmd registration
colin-axner Jul 25, 2023
7c96786
fix: use AND concatentation for event queries
colin-axner Jul 25, 2023
75c780a
go mod tidy
colin-axner Jul 25, 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/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: 15m

linters:
disable-all: true
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ docs-lint-changed:
### Protobuf ###
###############################################################################

protoVer=0.13.2
protoVer=0.13.5
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand Down
4 changes: 2 additions & 2 deletions e2e/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1131,8 +1131,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/core/02-client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version"
tmtypes "github.com/cometbft/cometbft/types"
tmversion "github.com/cometbft/cometbft/version"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
test "github.com/strangelove-ventures/interchaintest/v7/testutil"
"github.com/stretchr/testify/suite"

"github.com/cosmos/cosmos-sdk/client/grpc/ccmtservice"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"

govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
Expand Down Expand Up @@ -204,7 +204,7 @@ func (s *ClientTestSuite) TestClient_Update_Misbehaviour() {
})

t.Run("create validator set", func(t *testing.T) {
var validators []*tmservice.Validator
var validators []*ccmtservice.Validator

t.Run("fetch block header at latest client state height", func(t *testing.T) {
header, err = s.GetBlockHeaderByHeight(ctx, chainB, latestHeight.GetRevisionHeight())
Expand Down Expand Up @@ -367,7 +367,7 @@ func createMaliciousTMHeader(chainID string, blockHeight int64, trustedHeight cl
blockID := ibctesting.MakeBlockID(hhash, 3, tmhash.Sum([]byte(invalidHashValue)))
voteSet := tmtypes.NewVoteSet(chainID, blockHeight, 1, tmproto.PrecommitType, tmValSet)

commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
commit, err := test.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/upgrades/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"time"

sdkmath "cosmossdk.io/math"
upgradetypes "cosmossdk.io/x/upgrade/types"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/cosmos/gogoproto/proto"
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
interchaintest "github.com/strangelove-ventures/interchaintest/v7"
Expand Down
2 changes: 1 addition & 1 deletion e2e/testsuite/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/hex"
"fmt"

upgradetypes "cosmossdk.io/x/upgrade/types"
"github.com/cosmos/cosmos-sdk/codec"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand All @@ -15,7 +16,6 @@ import (
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"

icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
Expand Down
18 changes: 9 additions & 9 deletions e2e/testsuite/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"time"

"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/cosmos/cosmos-sdk/x/authz"
Expand Down Expand Up @@ -51,7 +51,7 @@ type GRPCClients struct {
AuthQueryClient authtypes.QueryClient
AuthZQueryClient authz.QueryClient

ConsensusServiceClient tmservice.ServiceClient
ConsensusServiceClient cmtservice.ServiceClient
}

// InitGRPCClients establishes GRPC clients with the given chain.
Expand Down Expand Up @@ -88,7 +88,7 @@ func (s *E2ETestSuite) InitGRPCClients(chain *cosmos.CosmosChain) {
ParamsQueryClient: paramsproposaltypes.NewQueryClient(grpcConn),
AuthQueryClient: authtypes.NewQueryClient(grpcConn),
AuthZQueryClient: authz.NewQueryClient(grpcConn),
ConsensusServiceClient: tmservice.NewServiceClient(grpcConn),
ConsensusServiceClient: cmtservice.NewServiceClient(grpcConn),
}
}

Expand Down Expand Up @@ -270,8 +270,8 @@ func (s *E2ETestSuite) QueryProposalV1(ctx context.Context, chain ibc.Chain, pro

// GetBlockHeaderByHeight fetches the block header at a given height.
func (s *E2ETestSuite) GetBlockHeaderByHeight(ctx context.Context, chain ibc.Chain, height uint64) (Header, error) {
tmService := s.GetChainGRCPClients(chain).ConsensusServiceClient
res, err := tmService.GetBlockByHeight(ctx, &tmservice.GetBlockByHeightRequest{
cmtservice := s.GetChainGRCPClients(chain).ConsensusServiceClient
res, err := cmtservice.GetBlockByHeight(ctx, &ccmtservice.GetBlockByHeightRequest{
Height: int64(height),
})
if err != nil {
Expand All @@ -289,9 +289,9 @@ func (s *E2ETestSuite) GetBlockHeaderByHeight(ctx context.Context, chain ibc.Cha

// GetValidatorSetByHeight returns the validators of the given chain at the specified height. The returned validators
// are sorted by address.
func (s *E2ETestSuite) GetValidatorSetByHeight(ctx context.Context, chain ibc.Chain, height uint64) ([]*tmservice.Validator, error) {
tmService := s.GetChainGRCPClients(chain).ConsensusServiceClient
res, err := tmService.GetValidatorSetByHeight(ctx, &tmservice.GetValidatorSetByHeightRequest{
func (s *E2ETestSuite) GetValidatorSetByHeight(ctx context.Context, chain ibc.Chain, height uint64) ([]*ccmtservice.Validator, error) {
cmtservice := s.GetChainGRCPClients(chain).ConsensusServiceClient
res, err := cmtservice.GetValidatorSetByHeight(ctx, &ccmtservice.GetValidatorSetByHeightRequest{
Height: int64(height),
})
if err != nil {
Expand All @@ -318,7 +318,7 @@ func (s *E2ETestSuite) QueryModuleAccountAddress(ctx context.Context, moduleName

cfg := EncodingConfig()

var account authtypes.AccountI
var account sdk.AccountI
if err := cfg.InterfaceRegistry.UnpackAny(resp.Account, &account); err != nil {
return nil, err
}
Expand Down
113 changes: 75 additions & 38 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,29 @@ go 1.20
module github.com/cosmos/ibc-go/v7

require (
cosmossdk.io/api v0.3.1
cosmossdk.io/api v0.7.0
cosmossdk.io/client/v2 v2.0.0-20230722073756-0fa85b7a424d
cosmossdk.io/core v0.9.0
cosmossdk.io/errors v1.0.0
cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca
cosmossdk.io/math v1.0.1
github.com/armon/go-metrics v0.4.1
github.com/cometbft/cometbft v0.37.2
github.com/cometbft/cometbft-db v0.8.0
github.com/cosmos/cosmos-proto v1.0.0-beta.2
github.com/cosmos/cosmos-sdk v0.47.4
cosmossdk.io/store v1.0.0-alpha.1
cosmossdk.io/tools/confix v0.0.0-20230722073756-0fa85b7a424d
cosmossdk.io/x/circuit v0.0.0-20230722073756-0fa85b7a424d
cosmossdk.io/x/evidence v0.0.0-20230722073756-0fa85b7a424d
cosmossdk.io/x/feegrant v0.0.0-20230722073756-0fa85b7a424d
cosmossdk.io/x/tx v0.9.1
cosmossdk.io/x/upgrade v0.0.0-20230722073756-0fa85b7a424d
github.com/cometbft/cometbft v0.38.0-rc3
github.com/cosmos/cosmos-db v1.0.0
github.com/cosmos/cosmos-proto v1.0.0-beta.3
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230723220119-d68a1231a44b
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc3
github.com/cosmos/ics23/go v0.10.0
github.com/golang/protobuf v1.5.3
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/hashicorp/go-metrics v0.5.1
github.com/spf13/cast v1.5.1
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
Expand All @@ -32,48 +42,54 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.0 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cosmossdk.io/core v0.5.1 // indirect
cosmossdk.io/collections v0.3.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect
cosmossdk.io/tools/rosetta v0.2.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.1 // indirect
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
github.com/aws/aws-sdk-go v1.44.203 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/aws/aws-sdk-go v1.44.224 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // 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.1.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
github.com/confio/ics23/go v0.9.0 // 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-20230711190327-88bbab59ff4f // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 // indirect
github.com/cometbft/cometbft-db v0.8.0 // indirect
github.com/cosmos/btcutil v1.0.5 // 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/ledger-cosmos-go v0.12.1 // indirect
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
github.com/creachadair/taskgroup v0.4.2 // indirect
github.com/cosmos/iavl v1.0.0-beta.2 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect
github.com/creachadair/atomicfile v0.3.1 // indirect
github.com/creachadair/tomledit v0.0.24 // indirect
github.com/danieljoos/wincred v1.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // 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/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/getsentry/sentry-go v0.22.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-playground/universal-translator v0.18.0 // indirect
github.com/gobwas/ws v1.1.0 // 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.2 // indirect
Expand All @@ -91,49 +107,55 @@ require (
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
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-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.1 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-plugin v1.4.10 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-uuid v1.0.2 // 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/improbable-eng/grpc-web v0.15.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lib/pq v1.10.7 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/linxGnu/grocksdb v1.7.16 // indirect
github.com/linxGnu/grocksdb v1.8.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rakyll/statik v0.1.7 // indirect
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/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/zerolog v1.29.1 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
Expand All @@ -144,29 +166,44 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/tidwall/btree v1.6.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/zondax/hid v0.9.1 // indirect
github.com/zondax/ledger-go v0.14.1 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.0 // indirect
nhooyr.io/websocket v1.8.6 // indirect
pgregory.net/rapid v0.5.5 // indirect
pgregory.net/rapid v1.0.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
replace (
// force using this version, since some transient dependency is still using v0.2.1 and complains about using sdk.NewIntFromUint64
cosmossdk.io/tools/rosetta => cosmossdk.io/tools/rosetta v0.2.1-0.20230614114324-f368ed5c62bc
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1
// replace broken goleveldb
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
)
Loading