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.

Sign up for GitHub

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

chore: update sdk 50 branch from main #4316

Merged
merged 9 commits into from
Aug 17, 2023
Merged

chore: update sdk 50 branch from main #4316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
951b3ab
build(deps): Bump bufbuild/buf-setup-action from 1.25.0 to 1.25.1 (#4…
dependabot[bot] Aug 7, 2023
5c7f286
deps: bump golangci-lint to v1.53.3 (#4276)
faddat Aug 8, 2023
25d3c3a
Merge remote-tracking branch 'origin/main' into HEAD
faddat Aug 8, 2023
00a680c
testing: fix usage on TimeoutPacket to use counterparty portID/channe…
colin-axner Aug 9, 2023
7dcb9ed
build(deps): Bump bufbuild/buf-setup-action from 1.25.1 to 1.26.0 (#4…
dependabot[bot] Aug 10, 2023
1c3bd52
use go1.21
faddat Aug 11, 2023
da22b14
Merge remote-tracking branch 'origin/main' into faddat/update-50-to-m…
faddat Aug 11, 2023
67c560c
bump cosmos-sdk
faddat Aug 11, 2023
e607008
increase golangci timeout
faddat Aug 12, 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/golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
uses: golangci/golangci-lint-action@v3.6.0
with:
version: v1.53.3
args: --timeout 5m
args: --timeout 10m
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: bufbuild/buf-setup-action@v1.25.0
- uses: bufbuild/buf-setup-action@v1.26.0
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.20
go 1.21

module github.com/cosmos/ibc-go/v7

Expand All @@ -19,7 +19,7 @@ require (
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.20230802171422-ee5b2e3afc4f
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230811080659-5b0c08130c52
github.com/cosmos/gogoproto v1.4.10
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc3
github.com/cosmos/ics23/go v0.10.0
Expand All @@ -43,7 +43,7 @@ require (
cloud.google.com/go/iam v1.1.0 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
cosmossdk.io/collections v0.3.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // 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
Expand Down Expand Up @@ -85,7 +85,7 @@ require (
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/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
Expand Down Expand Up @@ -176,9 +176,9 @@ require (
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/sys v0.11.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/text v0.12.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
Expand Down
43 changes: 43 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/capability/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cosmos/ibc-go/modules/capability

go 1.20
go 1.21

replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

Expand Down
34 changes: 34 additions & 0 deletions modules/capability/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions testing/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,9 @@ func (endpoint *Endpoint) TimeoutPacket(packet channeltypes.Packet) error {
return fmt.Errorf("unsupported order type %s", endpoint.ChannelConfig.Order)
}

proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey)
nextSeqRecv, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID)
counterparty := endpoint.Counterparty
proof, proofHeight := counterparty.QueryProof(packetKey)
nextSeqRecv, found := counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(counterparty.Chain.GetContext(), counterparty.ChannelConfig.PortID, counterparty.ChannelID)
require.True(endpoint.Chain.TB, found)

timeoutMsg := channeltypes.NewMsgTimeout(
Expand Down