Skip to content

Commit 1e98674

Browse files
authored
Three chains ack fix (cosmos#419)
* ack fix * test and update configs
1 parent 9f13a93 commit 1e98674

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

configs/three/paths/demo.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"src":{"chain-id":"ibc-0","client-id":"ibconeclient","connection-id":"ibconeconnection","channel-id":"ibconexfer","port-id":"transfer","order":"unordered","version":"ics20-1"},"dst":{"chain-id":"ibc-1","client-id":"ibczeroclient","connection-id":"ibczeroconnection","channel-id":"ibczeroxfer","port-id":"transfer","order":"unordered","version":"ics20-1"},"strategy":{"type":"naive"}}
1+
{"src":{"chain-id":"ibc-0","client-id":"","connection-id":"","channel-id":"","port-id":"transfer","order":"unordered","version":"ics20-1"},"dst":{"chain-id":"ibc-1","client-id":"","connection-id":"","channel-id":"","port-id":"transfer","order":"unordered","version":"ics20-1"},"strategy":{"type":"naive"}}

configs/three/paths/demo2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"src":{"chain-id":"ibc-1","client-id":"ibctwoclient","connection-id":"ibctwoconnection","channel-id":"ibctwoxfer","port-id":"transfer","order":"unordered","version":"ics20-1"},"dst":{"chain-id":"ibc-2","client-id":"ibconeclient","connection-id":"ibconeconnection","channel-id":"ibconexfer","port-id":"transfer","order":"unordered","version":"ics20-1"},"strategy":{"type":"naive"}}
1+
{"src":{"chain-id":"ibc-1","client-id":"","connection-id":"","channel-id":"","port-id":"transfer","order":"unordered","version":"ics20-1"},"dst":{"chain-id":"ibc-2","client-id":"","connection-id":"","channel-id":"","port-id":"transfer","order":"unordered","version":"ics20-1"},"strategy":{"type":"naive"}}

relayer/naive-strategy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ func relayPacketFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (rela
632632
}
633633

634634
func acknowledgementFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (relayPacket, error) {
635-
txs, err := src.QueryTxs(sh.GetHeight(src.ChainID), 1, 1000, ackPacketQuery(dst.PathEnd.ChannelID, int(seq)))
635+
txs, err := src.QueryTxs(sh.GetHeight(src.ChainID), 1, 1000, ackPacketQuery(src.PathEnd.ChannelID, int(seq)))
636636
switch {
637637
case err != nil:
638638
return nil, err
@@ -814,6 +814,6 @@ func rcvPacketQuery(channelID string, seq int) []string {
814814
}
815815

816816
func ackPacketQuery(channelID string, seq int) []string {
817-
return []string{fmt.Sprintf("%s.packet_src_channel='%s'", waTag, channelID),
817+
return []string{fmt.Sprintf("%s.packet_dst_channel='%s'", waTag, channelID),
818818
fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq)}
819819
}

0 commit comments

Comments
 (0)