Skip to content

Commit 8b0fa62

Browse files
author
Daisuke Kanda
committed
set NextSequenceRecv of TimeoutPacket not zero in unordered channel
Signed-off-by: Daisuke Kanda <[email protected]>
1 parent 78e1ff1 commit 8b0fa62

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

Diff for: core/naive-strategy.go

+15-10
Original file line numberDiff line numberDiff line change
@@ -464,18 +464,23 @@ func collectPackets(ctx QueryContext, chain *ProvableChain, packets PacketInfoLi
464464
logger := GetChannelLogger(chain)
465465

466466
var nextSequenceRecv uint64
467-
for _, p := range packets {
468-
if p.Sort == "timeout" {
469-
res, err := chain.QueryNextSequenceReceive(ctx)
470-
if err != nil {
471-
logger.Error("failed to QueryNextSequenceReceive", err,
472-
"height", ctx.Height(),
473-
)
474-
return nil, err
467+
if chain.Path().GetOrder() == chantypes.ORDERED {
468+
for _, p := range packets {
469+
if p.Sort == "timeout" {
470+
res, err := chain.QueryNextSequenceReceive(ctx)
471+
if err != nil {
472+
logger.Error("failed to QueryNextSequenceReceive", err,
473+
"height", ctx.Height(),
474+
)
475+
return nil, err
476+
}
477+
nextSequenceRecv = res.NextSequenceReceive
478+
break
475479
}
476-
nextSequenceRecv = res.NextSequenceReceive
477-
break
478480
}
481+
} else {
482+
// nextSequenceRecv has no effect in unordered channel but ibc-go expect it is not zero.
483+
nextSequenceRecv = 1
479484
}
480485

481486
var msgs []sdk.Msg

0 commit comments

Comments
 (0)