From 83589ac73fdb4240676750ed25ac5ef6d1d1ec38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20Axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Wed, 10 Feb 2021 12:31:09 +0100 Subject: [PATCH 1/2] ack fix --- relayer/naive-strategy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/relayer/naive-strategy.go b/relayer/naive-strategy.go index 940aadaa4..d7c775c6b 100644 --- a/relayer/naive-strategy.go +++ b/relayer/naive-strategy.go @@ -632,7 +632,7 @@ func relayPacketFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (rela } func acknowledgementFromSequence(src, dst *Chain, sh *SyncHeaders, seq uint64) (relayPacket, error) { - txs, err := src.QueryTxs(sh.GetHeight(src.ChainID), 1, 1000, ackPacketQuery(dst.PathEnd.ChannelID, int(seq))) + txs, err := src.QueryTxs(sh.GetHeight(src.ChainID), 1, 1000, ackPacketQuery(src.PathEnd.ChannelID, int(seq))) switch { case err != nil: return nil, err @@ -814,6 +814,6 @@ func rcvPacketQuery(channelID string, seq int) []string { } func ackPacketQuery(channelID string, seq int) []string { - return []string{fmt.Sprintf("%s.packet_src_channel='%s'", waTag, channelID), + return []string{fmt.Sprintf("%s.packet_dst_channel='%s'", waTag, channelID), fmt.Sprintf("%s.packet_sequence='%d'", waTag, seq)} } From 82b066f3a3edd6ba80a9be472615096c56356ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20Axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Wed, 10 Feb 2021 12:44:26 +0100 Subject: [PATCH 2/2] test and update configs --- configs/three/paths/demo.json | 2 +- configs/three/paths/demo2.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/three/paths/demo.json b/configs/three/paths/demo.json index 6f151123f..26942c74d 100644 --- a/configs/three/paths/demo.json +++ b/configs/three/paths/demo.json @@ -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"}} \ No newline at end of file +{"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"}} diff --git a/configs/three/paths/demo2.json b/configs/three/paths/demo2.json index 5378fbf9e..3fac02a1f 100644 --- a/configs/three/paths/demo2.json +++ b/configs/three/paths/demo2.json @@ -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"}} \ No newline at end of file +{"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"}}