Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recover from missed RPC events after WebSocket subscription is closed by Tendermint #1205

Merged
merged 17 commits into from
Jul 21, 2021
Merged

Recover from missed RPC events after WebSocket subscription is closed by Tendermint #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5be2b09
Propagate JSON-RPC errors through the Rust subscription
romac Jul 16, 2021
7c17d17
Use tendermint-rs branch with both fixes
romac Jul 16, 2021
557bf99
Fix compilation issue in tests
romac Jul 16, 2021
3cd5ebc
Clear pending packets when event subscription is cancelled
romac Jul 19, 2021
5e19880
Temp: Update one-chain script to use 10s commit timeout
romac Jul 20, 2021
1eb0ae9
Use tendermint-rs master
romac Jul 20, 2021
ffe01df
Update Cargo.lock
romac Jul 20, 2021
84c340b
Update changelog
romac Jul 20, 2021
3a8d003
Merge branch 'master' into romac/propagate-rpc-errors
romac Jul 20, 2021
4f8313e
Update lockfile
romac Jul 20, 2021
592d24a
Increase delay before checking for relaying result in e2e tests
romac Jul 20, 2021
f0a095f
Merge branch 'master' into romac/propagate-rpc-errors
romac Jul 20, 2021
412d4ee
Add comment explaining who the RPC error is propagated to
romac Jul 21, 2021
7f3103f
Merge branch 'master' into romac/propagate-rpc-errors
romac Jul 21, 2021
7b45718
Improve event monitor logs
romac Jul 21, 2021
8c05deb
Reset `timeout_commit` and `timeout_propose` to 1s
romac Jul 21, 2021
2107bd7
Merge branch 'master' into romac/propagate-rpc-errors
romac Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@

- [ibc-relayer]
- Fixed: Hermes does not clear packets on start ([#1200])
- Recover from missed RPC events after WebSocket subscription is closed by Tendermint ([#1196])


[#1094]: https://github.com/informalsystems/ibc-rs/issues/1094
[#1114]: https://github.com/informalsystems/ibc-rs/issues/1114
[#1192]: https://github.com/informalsystems/ibc-rs/issues/1192
[#1194]: https://github.com/informalsystems/ibc-rs/issues/1194
[#1196]: https://github.com/informalsystems/ibc-rs/issues/1196
[#1198]: https://github.com/informalsystems/ibc-rs/issues/1198
[#1200]: https://github.com/informalsystems/ibc-rs/issues/1200

Expand Down
50 changes: 25 additions & 25 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 37 additions & 27 deletions e2e/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@


def passive_packets(
c: Config,
ibc0: ChainId, ibc1: ChainId, port_id: PortId,
ibc0_channel_id: ChannelId, ibc1_channel_id: ChannelId):
c: Config,
ibc0: ChainId, ibc1: ChainId, port_id: PortId,
ibc0_channel_id: ChannelId, ibc1_channel_id: ChannelId):

# 1. create some unreceived acks

Expand All @@ -27,26 +27,26 @@ def passive_packets(
src_channel=ibc0_channel_id, amount=10000, height_offset=1000, number_msgs=2)

# hermes tx raw ft-transfer ibc-0 ibc-1 transfer channel-1 10000 1000 -n 2
packet.packet_send(c, src=ibc1, dst=ibc0 , src_port=port_id,
packet.packet_send(c, src=ibc1, dst=ibc0, src_port=port_id,
src_channel=ibc1_channel_id, amount=10000, height_offset=1000, number_msgs=2)
sleep(5.0)

# hermes tx raw packet-recv ibc-1 ibc-0 transfer channel-0
packet.packet_recv(c, src=ibc0 , dst=ibc1,
packet.packet_recv(c, src=ibc0, dst=ibc1,
src_port=port_id, src_channel=ibc0_channel_id)

# hermes tx raw packet-recv ibc-0 ibc-1 transfer channel-1
packet.packet_recv(c, src=ibc1, dst=ibc0 ,
packet.packet_recv(c, src=ibc1, dst=ibc0,
src_port=port_id, src_channel=ibc1_channel_id)

# 2. create some unreceived packets

# hermes tx raw ft-transfer ibc-0 ibc-1 transfer channel-1 10000 1000 -n 3
packet.packet_send(c, src=ibc1, dst=ibc0 , src_port=port_id,
packet.packet_send(c, src=ibc1, dst=ibc0, src_port=port_id,
src_channel=ibc1_channel_id, amount=10000, height_offset=1000, number_msgs=3)

# hermes tx raw ft-transfer ibc-1 ibc-0 transfer channel-0 10000 1000 -n 4
packet.packet_send(c, src=ibc0 , dst=ibc1, src_port=port_id,
packet.packet_send(c, src=ibc0, dst=ibc1, src_port=port_id,
src_channel=ibc0_channel_id, amount=10000, height_offset=1000, number_msgs=4)

sleep(10.0)
Expand All @@ -55,7 +55,7 @@ def passive_packets(

# hermes query packet unreceived-packets ibc-0 transfer channel-0
unreceived = packet.query_unreceived_packets(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 3), (unreceived, "unreceived packet mismatch")

Expand All @@ -73,7 +73,7 @@ def passive_packets(

# hermes query packet unreceived-acks ibc-0 transfer channel-0
unreceived = packet.query_unreceived_acks(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 2), (unreceived, "unreceived packet mismatch")

Expand All @@ -100,28 +100,29 @@ def passive_packets(

# hermes query packet unreceived-packets ibc-0 transfer channel-0
unreceived = packet.query_unreceived_packets(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 0), (unreceived,
"unreceived packets mismatch (expected 0)")

# hermes query packet unreceived-acks ibc-0 transfer channel-0
unreceived = packet.query_unreceived_acks(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 0), (unreceived,
"unreceived acks mismatch (expected 0)")

# 7. send some packets
# hermes tx raw ft-transfer ibc-0 ibc-1 transfer channel-1 10000 1000 -n 3
packet.packet_send(c, src=ibc1, dst=ibc0 , src_port=port_id,
packet.packet_send(c, src=ibc1, dst=ibc0, src_port=port_id,
src_channel=ibc1_channel_id, amount=10000, height_offset=1000, number_msgs=3)

# hermes tx raw ft-transfer ibc-1 ibc-0 transfer channel-0 10000 1000 -n 4
packet.packet_send(c, src=ibc0, dst=ibc1, src_port=port_id,
src_channel=ibc0_channel_id, amount=10000, height_offset=1000, number_msgs=4)

sleep(10.0)
sleep(20.0)

# 8. verify that there are no pending packets
# hermes query packet unreceived-packets ibc-1 transfer channel-1
unreceived = packet.query_unreceived_packets(
Expand All @@ -139,30 +140,30 @@ def passive_packets(

# hermes query packet unreceived-packets ibc-0 transfer channel-0
unreceived = packet.query_unreceived_packets(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 0), (unreceived,
"unreceived packets mismatch (expected 0)")

# hermes query packet unreceived-acks ibc-0 transfer channel-0
unreceived = packet.query_unreceived_acks(
c, chain=ibc0 , port=port_id, channel=ibc0_channel_id)
c, chain=ibc0, port=port_id, channel=ibc0_channel_id)

assert (len(unreceived) == 0), (unreceived,
"unreceived acks mismatch (expected 0)")
# 9.Stop the relayer
proc.kill()


def raw(c: Config, ibc0: ChainId, ibc1: ChainId, port_id: PortId) -> Tuple[ ClientId, ConnectionId, ChannelId, ClientId, ConnectionId, ChannelId]:
def raw(c: Config, ibc0: ChainId, ibc1: ChainId, port_id: PortId) -> Tuple[ClientId, ConnectionId, ChannelId, ClientId, ConnectionId, ChannelId]:
ibc0_client_id = client.create_update_query_client(c, ibc0, ibc1)

# Allocate first IDs on ibc-1
ibc1_client_id = client.create_update_query_client(c, ibc1, ibc0)
ibc1_conn_id = connection.conn_init(
c, ibc1, ibc0 , ibc1_client_id, ibc0_client_id)
c, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
ibc1_chan_id = channel.chan_open_init(
c, dst=ibc1, src=ibc0 , dst_conn=ibc1_conn_id)
c, dst=ibc1, src=ibc0, dst_conn=ibc1_conn_id)

ibc1_client_id = client.create_update_query_client(c, ibc1, ibc0)

Expand Down Expand Up @@ -195,6 +196,7 @@ def raw(c: Config, ibc0: ChainId, ibc1: ChainId, port_id: PortId) -> Tuple[ Clie

return ibc0_client_id, ibc0_conn_id, ibc0_chan_id, ibc1_client_id, ibc1_conn_id, ibc1_chan_id


def main():
parser = argparse.ArgumentParser(
description='Test all relayer commands, end-to-end')
Expand Down Expand Up @@ -234,33 +236,41 @@ def main():

chains = toml.load(config.config_file)['chains']

ibc0 = chains[0]['id']
ibc0 = chains[0]['id']
ibc1 = chains[1]['id']
port_id = PortId('transfer')

ibc0_client_id, ibc0_conn_id, ibc0_chan_id, ibc1_client_id, ibc1_conn_id, ibc1_chan_id = raw(config, ibc0 , ibc1, port_id)
ibc0_client_id, ibc0_conn_id, ibc0_chan_id, ibc1_client_id, ibc1_conn_id, ibc1_chan_id = raw(
config, ibc0, ibc1, port_id)
sleep(2.0)

passive_packets(config, ibc0, ibc1, port_id, ibc0_chan_id, ibc1_chan_id)
sleep(2.0)

connection.passive_connection_init_then_start(config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
connection.passive_connection_init_then_start(
config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
sleep(2.0)

connection.passive_connection_start_then_init(config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
connection.passive_connection_start_then_init(
config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
sleep(2.0)

connection.passive_connection_try_then_start(config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
connection.passive_connection_try_then_start(
config, ibc1, ibc0, ibc1_client_id, ibc0_client_id)
sleep(2.0)

channel.passive_channel_start_then_init(config, ibc1, ibc0, ibc1_conn_id, port_id)
channel.passive_channel_start_then_init(
config, ibc1, ibc0, ibc1_conn_id, port_id)
sleep(2.0)

channel.passive_channel_init_then_start(config, ibc1, ibc0, ibc1_conn_id, port_id)
channel.passive_channel_init_then_start(
config, ibc1, ibc0, ibc1_conn_id, port_id)
sleep(2.0)

channel.passive_channel_try_then_start(config, ibc1, ibc0, ibc1_conn_id, ibc0_conn_id, port_id)
channel.passive_channel_try_then_start(
config, ibc1, ibc0, ibc1_conn_id, ibc0_conn_id, port_id)
sleep(2.0)


if __name__ == "__main__":
main()
13 changes: 7 additions & 6 deletions relayer-cli/src/commands/listen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::{fmt, ops::Deref, str::FromStr, sync::Arc, thread};
use abscissa_core::{application::fatal_error, error::BoxError, Command, Options, Runnable};
use itertools::Itertools;
use tokio::runtime::Runtime as TokioRuntime;
use tracing::{error, info};

use ibc::{events::IbcEvent, ics24_host::identifier::ChainId};

Expand Down Expand Up @@ -92,8 +93,8 @@ impl Runnable for ListenCmd {

/// Listen to events
pub fn listen(config: &ChainConfig, filters: &[EventFilter]) -> Result<(), BoxError> {
println!(
"[info] Listening for events `{}` on '{}'...",
info!(
"listening for events `{}` on '{}'...",
filters.iter().format(", "),
config.id
);
Expand All @@ -116,15 +117,15 @@ pub fn listen(config: &ChainConfig, filters: &[EventFilter]) -> Result<(), BoxEr
continue;
}

println!("- Event batch at height {}", batch.height);
info!("- event batch at height {}", batch.height);
romac marked this conversation as resolved.
Show resolved Hide resolved

for event in matching_events {
println!("+ {:#?}", event);
info!("+ {:#?}", event);
}

println!();
info!("");
}
Err(e) => println!("- Error: {}", e),
Err(e) => error!("- error: {}", e),
}
}

Expand Down
Loading