Skip to content

Commit ab0675d

Browse files
faddatdependabot[bot]damiannolancolin-axner
authored
chore: update sdk 50 branch from main (#4316)
* build(deps): Bump bufbuild/buf-setup-action from 1.25.0 to 1.25.1 (#4286) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.25.0 to 1.25.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.25.0...v1.25.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps: bump golangci-lint to v1.53.3 (#4276) Co-authored-by: Damian Nolan <damiannolan@gmail.com> * testing: fix usage on TimeoutPacket to use counterparty portID/channelID in nextSeqRecv query (#4319) * build(deps): Bump bufbuild/buf-setup-action from 1.25.1 to 1.26.0 (#4321) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.25.1 to 1.26.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.25.1...v1.26.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 go1.21 * bump cosmos-sdk * increase golangci timeout --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Damian Nolan <damiannolan@gmail.com> Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
1 parent 4e1d13e commit ab0675d

File tree

7 files changed

+89
-11
lines changed

7 files changed

+89
-11
lines changed

.github/workflows/golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
uses: golangci/golangci-lint-action@v3.6.0
2424
with:
2525
version: v1.53.3
26-
args: --timeout 5m
26+
args: --timeout 10m

.github/workflows/proto-registry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v3
16-
- uses: bufbuild/buf-setup-action@v1.25.0
16+
- uses: bufbuild/buf-setup-action@v1.26.0
1717
- uses: bufbuild/buf-push-action@v1
1818
with:
1919
input: "proto"

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.20
1+
go 1.21
22

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

@@ -19,7 +19,7 @@ require (
1919
github.com/cometbft/cometbft v0.38.0-rc3
2020
github.com/cosmos/cosmos-db v1.0.0
2121
github.com/cosmos/cosmos-proto v1.0.0-beta.3
22-
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230802171422-ee5b2e3afc4f
22+
github.com/cosmos/cosmos-sdk v0.50.0-beta.0.0.20230811080659-5b0c08130c52
2323
github.com/cosmos/gogoproto v1.4.10
2424
github.com/cosmos/ibc-go/modules/capability v1.0.0-rc3
2525
github.com/cosmos/ics23/go v0.10.0
@@ -43,7 +43,7 @@ require (
4343
cloud.google.com/go/iam v1.1.0 // indirect
4444
cloud.google.com/go/storage v1.30.1 // indirect
4545
cosmossdk.io/collections v0.3.0 // indirect
46-
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
46+
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
4747
filippo.io/edwards25519 v1.0.0 // indirect
4848
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4949
github.com/99designs/keyring v1.2.1 // indirect
@@ -85,7 +85,7 @@ require (
8585
github.com/fatih/color v1.15.0 // indirect
8686
github.com/felixge/httpsnoop v1.0.2 // indirect
8787
github.com/fsnotify/fsnotify v1.6.0 // indirect
88-
github.com/getsentry/sentry-go v0.22.0 // indirect
88+
github.com/getsentry/sentry-go v0.23.0 // indirect
8989
github.com/go-kit/kit v0.12.0 // indirect
9090
github.com/go-kit/log v0.2.1 // indirect
9191
github.com/go-logfmt/logfmt v0.6.0 // indirect
@@ -176,9 +176,9 @@ require (
176176
golang.org/x/net v0.12.0 // indirect
177177
golang.org/x/oauth2 v0.8.0 // indirect
178178
golang.org/x/sync v0.3.0 // indirect
179-
golang.org/x/sys v0.10.0 // indirect
179+
golang.org/x/sys v0.11.0 // indirect
180180
golang.org/x/term v0.10.0 // indirect
181-
golang.org/x/text v0.11.0 // indirect
181+
golang.org/x/text v0.12.0 // indirect
182182
golang.org/x/tools v0.9.1 // indirect
183183
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
184184
google.golang.org/api v0.126.0 // indirect

go.sum

Lines changed: 43 additions & 0 deletions
Large diffs are not rendered by default.

modules/capability/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cosmos/ibc-go/modules/capability
22

3-
go 1.20
3+
go 1.21
44

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

modules/capability/go.sum

Lines changed: 34 additions & 0 deletions
Large diffs are not rendered by default.

testing/endpoint.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,9 @@ func (endpoint *Endpoint) TimeoutPacket(packet channeltypes.Packet) error {
524524
return fmt.Errorf("unsupported order type %s", endpoint.ChannelConfig.Order)
525525
}
526526

527-
proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey)
528-
nextSeqRecv, found := endpoint.Counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(endpoint.Counterparty.Chain.GetContext(), endpoint.ChannelConfig.PortID, endpoint.ChannelID)
527+
counterparty := endpoint.Counterparty
528+
proof, proofHeight := counterparty.QueryProof(packetKey)
529+
nextSeqRecv, found := counterparty.Chain.App.GetIBCKeeper().ChannelKeeper.GetNextSequenceRecv(counterparty.Chain.GetContext(), counterparty.ChannelConfig.PortID, counterparty.ChannelID)
529530
require.True(endpoint.Chain.TB, found)
530531

531532
timeoutMsg := channeltypes.NewMsgTimeout(

0 commit comments

Comments
 (0)