Skip to content

Commit 72bf690

Browse files
faddatsontrinh16pyselGNaD13colin-axner
authored
deps: sdk v0.50-beta (#3883)
* update SetupWithGenesisValSet func * sdk 50 first go * add go workspace * make proto-gen, cleanup * additiona cleanup of imports * updates... * handle expedited proposal bools * restructure modules * pre revert commit * Revert "restructure modules" This reverts commit 4580f76. * correctly migrate modules * migrate parameter store * fix calls to NewContext * tidy and enable thelper * use thelper and disable depguard * use latest golangci-lint in ci * upgrade to go 1.20 and newer protobuf builder to reduce v50 changeset * more cleanup, 5% of tests pass * add go work * bumps * set up rootmultistore in the new way and address WrongArgCount lints * fixing * Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into sdk-50 * register modulebasicmanager in app.go * add module register in app.go * Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into sdk-50 * fix the upgrade module's return * all errors now checked * update FinalizeBlock height input * update FinalizeBlock height input * revert changes to the capability module path * add circuit breaker * Begin to use modulebasicmanager * rename Marshaler to Codec * account for modulebasicmanager * fix setup() * fix import cycle * use appcodec for setuptestingapp * add missing IBCKeeper initialize and remove unused module from module Manager * update SetupWithGenesisValSet func * fixups * remove argument from NewContext * remove unused code * refactor FundAccount usage * fix test * coins.IsEqual -> coins.Equal * replace errorsmod path * fix SetupTest * remove unused variable * change function origin * sdk -> storetypes * replace name * cleanup app.go like goland diff ~/ibc-go/testing/simapp ~/cosmos-sdk/simapp * ModuleManager * add makeCommit func * fixing * minor * remove double imports * linting * add interface registry for ibc light client * register client state * bump cometbft to the latest commit from the v0.38.x branch * parallel tests * parallelize one more test * undeprecate stuff * unwrap sdk context: deprecated * big ctx unwrapping * accountI * undeprecate events * amino * 29-fee amino * add interface registry solomachine * change to legacy context * add dockerfile * try debugging * eliminate changes to .github * Revert "parallel tests" This reverts commit 69933c3. * make some of the changes suggested by @alpe / review wasmd's implementation of code similar to testing/chain.go * push changes to chain.go w/ attribution * correctly eliminate changes from .github * remove the compatiblity test matrices * remove all of .github * re-add .github checked out from the feature branch * revert gitignore changes * remove .dockerignore * ensure no changes to docs and ci config * fix setup * revert the addition of go.work * lint * fix .github * uncomment * sync * remove go.work.sum * tidy * fix issue in GetSimApp * correct number of variables in export.go * sdk.Context -> context.Context * begin to fix queries for ica * this commit will allow us to separate capability * break out capability * fix * fix accountkeeper * fix call to clear validator historical rewards in export.go * fix transfer_authorization.go * fix authz types in transfer_authorization_test.go * lint * fix: apply SDK app hash fix * go mod tidy in capability * tidy * handle errors in export * fix lint in root.go * refactor: change sdk.Events usage to []abci.Event * fix: e2e build * bumps and fix the proposal test * bumps for capability * use 0.13.3 proto-gen * bring in new changes to app.go and follow @alpe's advice on versioning and go-metrics * add an abci.go file * various bumps to resolve the go-metrics issue * tidy capability module * actually tidy capability module * various updates, linting * add attributeKeyData to emitted events * begin with the acknowledgement * Update modules/apps/27-interchain-accounts/module.go Co-authored-by: Marko <marko@baricevic.me> * Update modules/capability/module.go Co-authored-by: Marko <marko@baricevic.me> * Update modules/apps/27-interchain-accounts/module.go Co-authored-by: Marko <marko@baricevic.me> * return nil error in the capability module's beginblock * use sdk's mustsortjson * use the sdk's MustSortJSON * lint * fix: test fixes in 02-client * fix: update mock priv val to match cometbft * update storetypes from the sdk types library * lint * improvement(api)!: remove unused `EventTypeTimeoutPacketOnClose` (#3806) * testing: add function `RelayPacketWithResults` (#3986) * build(deps): Bump bufbuild/buf-setup-action from 1.23.0 to 1.23.1 (#3994) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.23.0 to 1.23.1. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/bufbuild/buf-setup-action/commit/a2450ddf330ebcbbb88645837933e7141568fd09"><code>a2450dd</code></a> Release v1.23.1 (<a href="https://redirect.github.com/bufbuild/buf-setup-action/issues/136">#136</a>)</li> <li>See full diff in <a href="https://github.com/bufbuild/buf-setup-action/compare/v1.23.0...v1.23.1">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=bufbuild/buf-setup-action&package-manager=github_actions&previous-version=1.23.0&new-version=1.23.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> * abcitxresult * feat(ica)!: support json tx encoding for interchain accounts (#3796) * feat(ica): added EncodingJson to supported encodings * imp(ica): changed the type of cdc to Codec in ica/host * imp(ica): changed the type of cdc to Codec in ica/controller * imp(ica.test): added a test cases for EncodingJSON * imp(ica): created invalid encoding err * feat(ica)!: first prototype of json supporting DeserializeCosmosTx * docs(ica): updated godoc of DeserializeCosmosTx * docs(ica): added comments to DeserializeCosmosTx * fix(ica.test): fixed tests for DeserializeCosmosTx * fix(ica): fixed 'OnRecvPacket' in relay.go * fix(ica): fixed unhandled error * style(ica): made DeserializeCosmosTx more compact * fix(ica/host.cli.test): fixed a cli test * style(ica): ran gofumpt * style(ica): changed err message * feat(ica): first prototype of SerializeCosmosTx is implemented * fix(ica): fixed codec tests * fix(ica/host.test): fix test * fix(ica/host.test): fix test * fix(ica/host.cli): cli always uses protobuf * nil(ica/host.test): removed unneeded comment * fix(ica/controller.test): fix test * fix(ica/controller.test): fix test * fix(ica/controller.test): fix test * fix(fee.test): fix test * nit: temporary save commit * fix(ica): fixed json serde tests not passing * fix(ica): fix panic if message does not implement sdk.Msg * imp(ica): improved json serde functions * style(ica): pleased the linter * style(ica): ran gofumpt * fix(e2e): fix compilation errors by adding icatypes.EncodingProtobuf arg to serde functions * feat(ica.test): added important wip test for deserializing directly from cosmwasm * imp(ica.test): added a new test case to cw codec unit test * imp(ica): added another test case * imp(ica.test): added another test case * imp(ica.test): added another test case * style(ica.test): improved test style * style(ica.test): improved test style * style(ica.test): ran gofumpt * imp(ica.test): added json encoding version string for testing * imp(ica.test): added new 'NewJSONICAPath' function * imp(ica.test): added encoding field to ica test setup functions * fix(ica.test): fixed test setups using the new encoding field * feat(ica.test): added json test case * style(ica.test): ran gofumpt * feat(ica.test): got two cases of cosmwasm tests working in relay * style(ica.test): ran gofumpt * feat(ica): started progress on recursive handling of Anys * imp(ica.test): added a new test case for ica json encoding, this fails * feat(ica): achieved total json serialization (excluding any lists) * refactor(ica): made function shorter and removed duplicated code * style(ica): ran gofumpt * imp(ica): added more err handling code * refactor(ica): made deserialize code shorter * style(ica): made linter a bit more happy * fix(ica.test): fixed one codec test case * feat(ica): added []Any handling code * fix(ica): added more safety * nit: deleted testing codec.go * feat(ica): all works * style(ica): ran gofumpt * style(ica): made linter happy * refactor(ica): reduced code duplication * nit(ica): uncommented some test cases * imp(ica.test): added more test cases * feat(ica.test): finished test cases * style(ica.test): reorganized test cases * refactor(ica.test): combined the two test cases into one * style(ica.test): ran gofumpt * style(ica.test): renamed wallet address * fix(ica.test): fixed test case names * imp(ica.test): added more test cases * style(ica.test): ran gofumpt * test(ica): added more codec test cases * style(ica.test): ran gofumpt * feat(ica): removed JSONAny and JSONCosmosTx types * feat(ica): implemented json encoding using module codec * fix(ica.test): tests now match the new codec implementation * fix(ica.test): fixed the tests to the new implementation * style(ica.test): reorgenized the order of tests so that git diff makes sense * imp(ica/controller): controller codec need not be codec.Codec * imp(ica): replaced BinaryCodec with Codec * test(ica): fixed codec test * docs(ica.test): codec comment updated * docs(ica.test): updated comments * style(ica.test): removed 'from cosmwasm' from test case name as it is aparent from test name * style(ica.test): ran gofumpt * fix: fix merge error * deps(ica): replaced sdk.NewInt with sdkmath.NewInt * style(ica): ran 'gofumpt' * imp(ica): removed redundant cosmwasm tests * revert: "imp(ica): removed redundant cosmwasm tests" This reverts commit 5123fba. * imp(ica.test): made codec_test human readable * imp(ica.test): made relay_test human readable * style(ica.test): ran 'golanci-lint run --fix' * imp(ica/host): created 'GetAppMetadata' function * refactor(ica/host): used GetAppMetadata function * imp(ica.test): removed unneeded encoding argument * imp(ica): removed ErrUnsupportedEncoding * imp(ica.test): used suite chainB height instead of clienttypes.NewHeight(1, 100) * imp(ica.test): add nil check for unsupported encoding * imp(ica.test): added a empty/nil checks * style(ica.test): renamed version variable to TestVersionWithJSONEncoding * imp(ica): wrapped some errors * style(ica): ran 'golanci-lint run --fix' * style(ica)!: renamed EncodingJSON to EncodingProto3JSON * docs(ica): improved godocs * imp(ica): passing codec instead of binary codec * style(ica): improved error messages and godocs * docs(ica.test): improved godocs for tests * imp(ica.test): improved unsupported encoding test case slightly * style(ica.test): test style improvements * imp(ica.test): added expError to some codec tests * imp(ica.test): added more error type checks to codec tests * style(ica.test): ran 'golangci-lint run --fix' * imp(ica/host.test): added 'TestMetadataNotFound' * imp(ica/host.test): reduce test size * docs(ica/host.test): updated godocs for test * docs(ica/host): improved godoc * imp(ica/host): made GetAppMetadata private --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * cleanup after merging json support * lint * imp: refactor simapp to more closely resemble the style used in cosmos-sdk (#3874) * fix testpb * post-merge cleanup * Revert "Merge remote-tracking branch 'origin/main' into ibc-go-sdk-50-mark-2" This reverts commit 0bebbc1, reversing changes made to a6f3e97. * remove testing/simapp/abci.go * remove dummy vote extension handler * remove copylocks * revert unneeded changes * add GetMemKey again * restore all use of getmemkey * bump sdk's libraries, cleanup (#214) * sync * tidy root and capability * update sdk's dependencies to ensure we are using the latest revision before debugging * use "the cosmic condom" (replaces at the end of go.mod) just in case * Update genesis_test.go * revert a memkey change * memstorekey change * Update modules/apps/27-interchain-accounts/host/client/cli/cli.go Co-authored-by: Marko <marko@baricevic.me> * Update keeper_test.go * don't add tests (reduce diff) (#215) * don't add tests (reduce diff) * Update keeper_test.go * Update grpc_query_test.go * Update capability_test.go * use the separated capability module * sync * tidy * remove an unneeded import * fix ics27 tests * fix: add back signer and validate basic checks * fix: coordinator no longer updates time before committing a block * fix: handle querying validator set for current block * fix: correctly parse channelID from solomachine * remove print statement * Merge feature branch * bump capability module to v1.0.0-rc2 * fix fee event test * linter fixes * comment about replace directive * merge fix for client test * remove unused import * fix capability imports * adjust timeout * potentially a better way to test for the event * Update modules/core/04-channel/keeper/events.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * build(deps): Bump bufbuild/buf-setup-action from 1.23.1 to 1.24.0 (#4090) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.23.1 to 1.24.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.23.1...v1.24.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Use alpine as base image for building simd. (#4067) Co-authored-by: Carlos Rodriguez <carlos@interchain.io> * fix: undo unnecessary capability changes * testing: simplify ica codec setup * refactor: remove unnecessary begin blocka and end block functions * fix: add back removed events * test: add back commented test with fixed logic * nit: move context unwrapping to callsite * nit: rename found to err * nit: remove unnecessary client state registration in solo machine * nit: formatting * nit: undo merge conflict change * fix: grpc err check * nit: error formatting * nit: add back linter check to reduce review diffs * test: fixup channel tests * test: add back missing tests * simapp: match sdk structure * refactor: remove unnecessary code * remove: unnecessary file * fix: add back simapp upgrades * fix: remove added changes from merge conflict * update sdk * tidy * cleanup and add to capbability * cleanup staking keeper, account keeper, and gov router * remove height from keeper test * update proto builder version * revert changes to the misbehaviour test * eliminate unnecessary aliases * tidy capabilities * bump deps again (to be sure) * cleanup with changes from sdk upstream * fix minor delegation address setup in SetupWithGenesisValSet * minor * switch to ext vote set * resolve transfer timeout-height flag redefined on cmd test err * bump sdk * tidy * fix a linting issue in app.go * use abci instead of abcitypes * remove named returns * use latest capability module * rm unnecessary import alias: pkg context * updating to latest buf tag for cosmos-sdk * imp: add in-code docs to ica message authentication * test: simplify test logic * nit: testing fixes * refactor: slim down necessary changes in testing pkg * refactor: format upgrade handlers properly * refactor: simapp app.go cleanup * fix: fix build issue and simplify test code * rm: root_v2.go depinject is not supported for ibc-go yet This file did not build * refactor: remove unnecessary functions in test_helpers.go * fix: simd cmd registration * fix: use AND concatentation for event queries * go mod tidy --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: sontrinh16 <trinhleson2000@gmail.com> Co-authored-by: Ruslan Akhtariev <rakhtariev@icloud.com> Co-authored-by: GnaD13 <cpt.meoz@gmail.com> Co-authored-by: Colin Axnér <25233464+colin-axner@users.noreply.github.com> Co-authored-by: sontrinh16 <48055119+sontrinh16@users.noreply.github.com> Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: Carlos Rodriguez <carlos@interchain.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: srdtrk <59252793+srdtrk@users.noreply.github.com> Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> Co-authored-by: Jim Fasarakis-Hilliard <d.f.hilliard@gmail.com> Co-authored-by: Damian Nolan <damiannolan@gmail.com>
1 parent ac6300b commit 72bf690

File tree

140 files changed

+1454
-1181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1454
-1181
lines changed

.github/workflows/proto-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
- uses: bufbuild/buf-push-action@v1
1818
with:
1919
input: "proto"
20-
buf_token: ${{ secrets.BUF_TOKEN }}
20+
buf_token: ${{ secrets.BUF_TOKEN }}

.golangci.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
run:
22
tests: true
3-
# # timeout for analysis, e.g. 30s, 5m, default is 1m
4-
timeout: 5m
3+
timeout: 15m
54

65
linters:
76
disable-all: true

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ docs-lint-changed:
318318
### Protobuf ###
319319
###############################################################################
320320

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

e2e/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1131,8 +1131,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
11311131
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
11321132
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
11331133
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
1134-
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
1135-
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
1134+
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
1135+
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
11361136
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
11371137
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
11381138
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

e2e/tests/core/02-client/client_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515
tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version"
1616
tmtypes "github.com/cometbft/cometbft/types"
1717
tmversion "github.com/cometbft/cometbft/version"
18-
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
1918
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
2019
"github.com/strangelove-ventures/interchaintest/v7/ibc"
2120
test "github.com/strangelove-ventures/interchaintest/v7/testutil"
2221
"github.com/stretchr/testify/suite"
2322

23+
"github.com/cosmos/cosmos-sdk/client/grpc/ccmtservice"
2424
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
2525

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

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

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

370-
commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
370+
commit, err := test.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
371371
if err != nil {
372372
return nil, err
373373
}

e2e/tests/upgrades/upgrade_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"time"
88

99
sdkmath "cosmossdk.io/math"
10+
upgradetypes "cosmossdk.io/x/upgrade/types"
1011
sdk "github.com/cosmos/cosmos-sdk/types"
1112
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
12-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
1313
"github.com/cosmos/gogoproto/proto"
1414
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
1515
interchaintest "github.com/strangelove-ventures/interchaintest/v7"

e2e/testsuite/codec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/hex"
55
"fmt"
66

7+
upgradetypes "cosmossdk.io/x/upgrade/types"
78
"github.com/cosmos/cosmos-sdk/codec"
89
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
910
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -15,7 +16,6 @@ import (
1516
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
1617
grouptypes "github.com/cosmos/cosmos-sdk/x/group"
1718
proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
18-
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
1919
intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
2020

2121
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"

e2e/testsuite/grpc_query.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sort"
77
"time"
88

9-
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
9+
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
1010
sdk "github.com/cosmos/cosmos-sdk/types"
1111
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
1212
"github.com/cosmos/cosmos-sdk/x/authz"
@@ -51,7 +51,7 @@ type GRPCClients struct {
5151
AuthQueryClient authtypes.QueryClient
5252
AuthZQueryClient authz.QueryClient
5353

54-
ConsensusServiceClient tmservice.ServiceClient
54+
ConsensusServiceClient cmtservice.ServiceClient
5555
}
5656

5757
// InitGRPCClients establishes GRPC clients with the given chain.
@@ -88,7 +88,7 @@ func (s *E2ETestSuite) InitGRPCClients(chain *cosmos.CosmosChain) {
8888
ParamsQueryClient: paramsproposaltypes.NewQueryClient(grpcConn),
8989
AuthQueryClient: authtypes.NewQueryClient(grpcConn),
9090
AuthZQueryClient: authz.NewQueryClient(grpcConn),
91-
ConsensusServiceClient: tmservice.NewServiceClient(grpcConn),
91+
ConsensusServiceClient: cmtservice.NewServiceClient(grpcConn),
9292
}
9393
}
9494

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

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

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

319319
cfg := EncodingConfig()
320320

321-
var account authtypes.AccountI
321+
var account sdk.AccountI
322322
if err := cfg.InterfaceRegistry.UnpackAny(resp.Account, &account); err != nil {
323323
return nil, err
324324
}

go.mod

+75-38
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,29 @@ go 1.20
33
module github.com/cosmos/ibc-go/v7
44

55
require (
6-
cosmossdk.io/api v0.3.1
6+
cosmossdk.io/api v0.7.0
7+
cosmossdk.io/client/v2 v2.0.0-20230722073756-0fa85b7a424d
8+
cosmossdk.io/core v0.9.0
79
cosmossdk.io/errors v1.0.0
10+
cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca
811
cosmossdk.io/math v1.0.1
9-
github.com/armon/go-metrics v0.4.1
10-
github.com/cometbft/cometbft v0.37.2
11-
github.com/cometbft/cometbft-db v0.8.0
12-
github.com/cosmos/cosmos-proto v1.0.0-beta.2
13-
github.com/cosmos/cosmos-sdk v0.47.4
12+
cosmossdk.io/store v1.0.0-alpha.1
13+
cosmossdk.io/tools/confix v0.0.0-20230722073756-0fa85b7a424d
14+
cosmossdk.io/x/circuit v0.0.0-20230722073756-0fa85b7a424d
15+
cosmossdk.io/x/evidence v0.0.0-20230722073756-0fa85b7a424d
16+
cosmossdk.io/x/feegrant v0.0.0-20230722073756-0fa85b7a424d
17+
cosmossdk.io/x/tx v0.9.1
18+
cosmossdk.io/x/upgrade v0.0.0-20230722073756-0fa85b7a424d
19+
github.com/cometbft/cometbft v0.38.0-rc3
20+
github.com/cosmos/cosmos-db v1.0.0
21+
github.com/cosmos/cosmos-proto v1.0.0-beta.3
22+
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230723220119-d68a1231a44b
1423
github.com/cosmos/gogoproto v1.4.10
15-
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1
24+
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc3
1625
github.com/cosmos/ics23/go v0.10.0
1726
github.com/golang/protobuf v1.5.3
1827
github.com/grpc-ecosystem/grpc-gateway v1.16.0
28+
github.com/hashicorp/go-metrics v0.5.1
1929
github.com/spf13/cast v1.5.1
2030
github.com/spf13/cobra v1.7.0
2131
github.com/spf13/viper v1.16.0
@@ -32,48 +42,54 @@ require (
3242
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3343
cloud.google.com/go/iam v1.1.0 // indirect
3444
cloud.google.com/go/storage v1.30.1 // indirect
35-
cosmossdk.io/core v0.5.1 // indirect
45+
cosmossdk.io/collections v0.3.0 // indirect
3646
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
37-
cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect
38-
cosmossdk.io/tools/rosetta v0.2.1 // indirect
3947
filippo.io/edwards25519 v1.0.0 // indirect
4048
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4149
github.com/99designs/keyring v1.2.1 // indirect
42-
github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect
43-
github.com/aws/aws-sdk-go v1.44.203 // indirect
50+
github.com/DataDog/zstd v1.5.5 // indirect
51+
github.com/aws/aws-sdk-go v1.44.224 // indirect
4452
github.com/beorn7/perks v1.0.1 // indirect
4553
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4654
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
55+
github.com/bits-and-blooms/bitset v1.8.0 // indirect
4756
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
4857
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
4958
github.com/cespare/xxhash v1.1.0 // indirect
5059
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5160
github.com/chzyer/readline v1.5.1 // indirect
5261
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
53-
github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect
54-
github.com/confio/ics23/go v0.9.0 // indirect
62+
github.com/cockroachdb/errors v1.10.0 // indirect
63+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
64+
github.com/cockroachdb/pebble v0.0.0-20230711190327-88bbab59ff4f // indirect
65+
github.com/cockroachdb/redact v1.1.5 // indirect
66+
github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 // indirect
67+
github.com/cometbft/cometbft-db v0.8.0 // indirect
5568
github.com/cosmos/btcutil v1.0.5 // indirect
5669
github.com/cosmos/go-bip39 v1.0.0 // indirect
5770
github.com/cosmos/gogogateway v1.2.0 // indirect
58-
github.com/cosmos/iavl v0.20.0 // indirect
59-
github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect
60-
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
61-
github.com/creachadair/taskgroup v0.4.2 // indirect
71+
github.com/cosmos/iavl v1.0.0-beta.2 // indirect
72+
github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect
73+
github.com/creachadair/atomicfile v0.3.1 // indirect
74+
github.com/creachadair/tomledit v0.0.24 // indirect
6275
github.com/danieljoos/wincred v1.1.2 // indirect
6376
github.com/davecgh/go-spew v1.1.1 // indirect
64-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
77+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
6578
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
6679
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6780
github.com/dgraph-io/ristretto v0.1.1 // indirect
6881
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
6982
github.com/dustin/go-humanize v1.0.1 // indirect
7083
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
84+
github.com/emicklei/dot v1.5.0 // indirect
85+
github.com/fatih/color v1.15.0 // indirect
7186
github.com/felixge/httpsnoop v1.0.2 // indirect
7287
github.com/fsnotify/fsnotify v1.6.0 // indirect
88+
github.com/getsentry/sentry-go v0.22.0 // indirect
7389
github.com/go-kit/kit v0.12.0 // indirect
7490
github.com/go-kit/log v0.2.1 // indirect
7591
github.com/go-logfmt/logfmt v0.6.0 // indirect
76-
github.com/go-playground/universal-translator v0.18.0 // indirect
92+
github.com/gobwas/ws v1.1.0 // indirect
7793
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
7894
github.com/gogo/googleapis v1.4.1 // indirect
7995
github.com/gogo/protobuf v1.3.2 // indirect
@@ -91,49 +107,55 @@ require (
91107
github.com/gorilla/handlers v1.5.1 // indirect
92108
github.com/gorilla/mux v1.8.0 // indirect
93109
github.com/gorilla/websocket v1.5.0 // indirect
94-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
110+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
95111
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
96-
github.com/gtank/merlin v0.1.1 // indirect
97-
github.com/gtank/ristretto255 v0.1.2 // indirect
98112
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
99113
github.com/hashicorp/go-getter v1.7.1 // indirect
114+
github.com/hashicorp/go-hclog v1.5.0 // indirect
100115
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
116+
github.com/hashicorp/go-plugin v1.4.10 // indirect
101117
github.com/hashicorp/go-safetemp v1.0.0 // indirect
118+
github.com/hashicorp/go-uuid v1.0.2 // indirect
102119
github.com/hashicorp/go-version v1.6.0 // indirect
103120
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
104121
github.com/hashicorp/hcl v1.0.0 // indirect
122+
github.com/hashicorp/yamux v0.1.1 // indirect
105123
github.com/hdevalence/ed25519consensus v0.1.0 // indirect
106124
github.com/huandu/skiplist v1.2.0 // indirect
125+
github.com/iancoleman/strcase v0.3.0 // indirect
107126
github.com/improbable-eng/grpc-web v0.15.0 // indirect
108127
github.com/inconshreveable/mousetrap v1.1.0 // indirect
109128
github.com/jmespath/go-jmespath v0.4.0 // indirect
110129
github.com/jmhodges/levigo v1.0.0 // indirect
111-
github.com/klauspost/compress v1.16.3 // indirect
112-
github.com/leodido/go-urn v1.2.1 // indirect
130+
github.com/klauspost/compress v1.16.7 // indirect
131+
github.com/kr/pretty v0.3.1 // indirect
132+
github.com/kr/text v0.2.0 // indirect
113133
github.com/lib/pq v1.10.7 // indirect
114134
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
115-
github.com/linxGnu/grocksdb v1.7.16 // indirect
135+
github.com/linxGnu/grocksdb v1.8.0 // indirect
116136
github.com/magiconair/properties v1.8.7 // indirect
117137
github.com/manifoldco/promptui v0.9.0 // indirect
118138
github.com/mattn/go-colorable v0.1.13 // indirect
119139
github.com/mattn/go-isatty v0.0.19 // indirect
120140
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
121-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
122141
github.com/minio/highwayhash v1.0.2 // indirect
123142
github.com/mitchellh/go-homedir v1.1.0 // indirect
124143
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
125144
github.com/mitchellh/mapstructure v1.5.0 // indirect
126145
github.com/mtibben/percent v0.2.1 // indirect
127-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
128-
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
146+
github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect
147+
github.com/oklog/run v1.1.0 // indirect
148+
github.com/onsi/ginkgo v1.16.4 // indirect
149+
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
150+
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
129151
github.com/pkg/errors v0.9.1 // indirect
130152
github.com/pmezard/go-difflib v1.0.0 // indirect
131-
github.com/prometheus/client_golang v1.14.0 // indirect
132-
github.com/prometheus/client_model v0.3.0 // indirect
133-
github.com/prometheus/common v0.42.0 // indirect
134-
github.com/prometheus/procfs v0.9.0 // indirect
135-
github.com/rakyll/statik v0.1.7 // indirect
153+
github.com/prometheus/client_golang v1.16.0 // indirect
154+
github.com/prometheus/client_model v0.4.0 // indirect
155+
github.com/prometheus/common v0.44.0 // indirect
156+
github.com/prometheus/procfs v0.11.0 // indirect
136157
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
158+
github.com/rogpeppe/go-internal v1.11.0 // indirect
137159
github.com/rs/cors v1.8.3 // indirect
138160
github.com/rs/zerolog v1.29.1 // indirect
139161
github.com/sasha-s/go-deadlock v0.3.1 // indirect
@@ -144,29 +166,44 @@ require (
144166
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
145167
github.com/tendermint/go-amino v0.16.0 // indirect
146168
github.com/tidwall/btree v1.6.0 // indirect
147-
github.com/ugorji/go/codec v1.2.7 // indirect
148169
github.com/ulikunitz/xz v0.5.11 // indirect
149170
github.com/zondax/hid v0.9.1 // indirect
150171
github.com/zondax/ledger-go v0.14.1 // indirect
151172
go.etcd.io/bbolt v1.3.7 // indirect
152173
go.opencensus.io v0.24.0 // indirect
153174
golang.org/x/crypto v0.11.0 // indirect
154-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
175+
golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
155176
golang.org/x/net v0.12.0 // indirect
156177
golang.org/x/oauth2 v0.8.0 // indirect
178+
golang.org/x/sync v0.3.0 // indirect
157179
golang.org/x/sys v0.10.0 // indirect
158180
golang.org/x/term v0.10.0 // indirect
159181
golang.org/x/text v0.11.0 // indirect
182+
golang.org/x/tools v0.9.1 // indirect
160183
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
161184
google.golang.org/api v0.126.0 // indirect
162185
google.golang.org/appengine v1.6.7 // indirect
163186
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
164187
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
165188
gopkg.in/ini.v1 v1.67.0 // indirect
166189
gopkg.in/yaml.v3 v3.0.1 // indirect
190+
gotest.tools/v3 v3.5.0 // indirect
167191
nhooyr.io/websocket v1.8.6 // indirect
168-
pgregory.net/rapid v0.5.5 // indirect
192+
pgregory.net/rapid v1.0.0 // indirect
169193
sigs.k8s.io/yaml v1.3.0 // indirect
170194
)
171195

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

0 commit comments

Comments
 (0)