Skip to content

Commit 39a6f5f

Browse files
crodriguezvegacolin-axnerseantking
authored
backport #589 #603 to v1.1.x (#609)
* backport #589 * backport #603 * update changelog * fix build problem Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com> Co-authored-by: Sean King <seantking@users.noreply.github.com> Co-authored-by: Carlos Rodriguez <crodveg@gmail.com>
1 parent b5e1547 commit 39a6f5f

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ Ref: https://keepachangelog.com/en/1.0.0/
3434

3535
# Changelog
3636

37+
## [v1.1.5](https://github.com/cosmos/ibc-go/releases/tag/v1.1.5) - 2021-12-15
38+
39+
### Dependencies
40+
41+
* [\#589](https://github.com/cosmos/ibc-go/pull/589) Bump SDK version to v0.44.5
42+
43+
### Bug Fixes
44+
45+
* (modules/core) [\#603](https://github.com/cosmos/ibc-go/pull/603) Fix module name emitted as part of `OnChanOpenInit` event. Replacing `connection` module name with `channel`.
46+
3747
## [v1.1.4](https://github.com/cosmos/ibc-go/releases/tag/v1.1.4) - 2021-12-05
3848

3949
### Dependencies
@@ -89,6 +99,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
8999
* (modules/light-clients/06-solomachine) [\#153](https://github.com/cosmos/ibc-go/pull/153) Fix solo machine proof height sequence mismatch bug.
90100
* (modules/light-clients/06-solomachine) [\#122](https://github.com/cosmos/ibc-go/pull/122) Fix solo machine merkle prefix casting bug.
91101
* (modules/light-clients/06-solomachine) [\#120](https://github.com/cosmos/ibc-go/pull/120) Fix solo machine handshake verification bug.
102+
* (modules/light-clients/06-solomachine) [\#153](https://github.com/cosmos/ibc-go/pull/153) fix solo machine connection handshake failure at `ConnectionOpenAck`.
92103

93104
### API Breaking
94105

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alp
77
require (
88
github.com/armon/go-metrics v0.3.9
99
github.com/confio/ics23/go v0.6.6
10-
github.com/cosmos/cosmos-sdk v0.44.4
10+
github.com/cosmos/cosmos-sdk v0.44.5
1111
github.com/gogo/protobuf v1.3.3
1212
github.com/golang/protobuf v1.5.2
1313
github.com/gorilla/mux v1.8.0

‎go.sum

+6-8
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,15 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
184184
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
185185
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
186186
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
187-
github.com/cosmos/cosmos-sdk v0.44.4 h1:5oJpMr0Uz6PmODDklyNmXLnuByMqonNTxi+LAyhqews=
188-
github.com/cosmos/cosmos-sdk v0.44.4/go.mod h1:0QTCOkE8IWu5LZyfnbbjFjxYRIcV4pBOr7+zPpJwl58=
187+
github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44=
188+
github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU=
189+
github.com/cosmos/cosmos-sdk v0.44.5 h1:t5h+KPzZb0Zsag1RP1DCMQlyJyIQqJcqSPJrbUCDGHY=
190+
github.com/cosmos/cosmos-sdk v0.44.5/go.mod h1:maUA6m2TBxOJZkbwl0eRtEBgTX37kcaiOWU5t1HEGaY=
189191
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
190192
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
191193
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
192-
github.com/cosmos/iavl v0.17.2 h1:BT2u7DUvLLB+RYz9RItn/8n7Bt5xe5rj8QRTkk/PQU0=
193-
github.com/cosmos/iavl v0.17.2/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w=
194+
github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y=
195+
github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w=
194196
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
195197
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
196198
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
@@ -239,8 +241,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
239241
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
240242
github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
241243
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
242-
github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25 h1:2vLKys4RBU4pn2T/hjXMbvwTr1Cvy5THHrQkbeY9HRk=
243-
github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY=
244244
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
245245
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
246246
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -509,7 +509,6 @@ github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNr
509509
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
510510
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
511511
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
512-
github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA=
513512
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
514513
github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg=
515514
github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
@@ -896,7 +895,6 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh
896895
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
897896
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
898897
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
899-
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
900898
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
901899
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
902900
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=

‎modules/core/keeper/msg_server.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
1111
clienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
1212
connectiontypes "github.com/cosmos/ibc-go/modules/core/03-connection/types"
13-
"github.com/cosmos/ibc-go/modules/core/04-channel/types"
1413
channeltypes "github.com/cosmos/ibc-go/modules/core/04-channel/types"
1514
porttypes "github.com/cosmos/ibc-go/modules/core/05-port/types"
1615
coretypes "github.com/cosmos/ibc-go/modules/core/types"
@@ -286,7 +285,7 @@ func (k Keeper) ChannelOpenInit(goCtx context.Context, msg *channeltypes.MsgChan
286285
ctx.EventManager().EmitEvents(sdk.Events{
287286
sdk.NewEvent(
288287
sdk.EventTypeMessage,
289-
sdk.NewAttribute(sdk.AttributeKeyModule, connectiontypes.AttributeValueCategory),
288+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
290289
),
291290
})
292291

@@ -322,7 +321,7 @@ func (k Keeper) ChannelOpenTry(goCtx context.Context, msg *channeltypes.MsgChann
322321
ctx.EventManager().EmitEvents(sdk.Events{
323322
sdk.NewEvent(
324323
sdk.EventTypeMessage,
325-
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
324+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
326325
),
327326
})
328327

@@ -359,7 +358,7 @@ func (k Keeper) ChannelOpenAck(goCtx context.Context, msg *channeltypes.MsgChann
359358
ctx.EventManager().EmitEvents(sdk.Events{
360359
sdk.NewEvent(
361360
sdk.EventTypeMessage,
362-
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
361+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
363362
),
364363
})
365364

@@ -394,7 +393,7 @@ func (k Keeper) ChannelOpenConfirm(goCtx context.Context, msg *channeltypes.MsgC
394393
ctx.EventManager().EmitEvents(sdk.Events{
395394
sdk.NewEvent(
396395
sdk.EventTypeMessage,
397-
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
396+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
398397
),
399398
})
400399

@@ -428,7 +427,7 @@ func (k Keeper) ChannelCloseInit(goCtx context.Context, msg *channeltypes.MsgCha
428427
ctx.EventManager().EmitEvents(sdk.Events{
429428
sdk.NewEvent(
430429
sdk.EventTypeMessage,
431-
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
430+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
432431
),
433432
})
434433

@@ -463,7 +462,7 @@ func (k Keeper) ChannelCloseConfirm(goCtx context.Context, msg *channeltypes.Msg
463462
ctx.EventManager().EmitEvents(sdk.Events{
464463
sdk.NewEvent(
465464
sdk.EventTypeMessage,
466-
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
465+
sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory),
467466
),
468467
})
469468

0 commit comments

Comments
 (0)