mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-19 05:44:12 +01:00
Code Issues Projects Releases Wiki Activity

htlc: Replay unprocessed HTLCs loaded from the DB

Browse Source
This commit is contained in:
Christian Decker 2019-05-21 14:10:34 +02:00 committed by Rusty Russell
parent f7bfe166a8
commit 909913c265
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lightningd/peer_htlcs.c
View File

@ -1978,6 +1978,7 @@ void htlcs_reconnect(struct lightningd *ld,
struct htlc_in *hin; struct htlc_in *hin;
struct htlc_out *hout; struct htlc_out *hout;
struct htlc_in_map unprocessed; struct htlc_in_map unprocessed;
enum onion_type failcode;
/* Any HTLCs which happened to be incoming and weren't forwarded before /* Any HTLCs which happened to be incoming and weren't forwarded before
* we shutdown/crashed: fail them now. * we shutdown/crashed: fail them now.
@ -2037,9 +2038,17 @@ void htlcs_reconnect(struct lightningd *ld,
for (hin = htlc_in_map_first(&unprocessed, &ini); hin; for (hin = htlc_in_map_first(&unprocessed, &ini); hin;
hin = htlc_in_map_next(&unprocessed, &ini)) { hin = htlc_in_map_next(&unprocessed, &ini)) {
log_unusual(hin->key.channel->log, log_unusual(hin->key.channel->log,
"Failing old unprocessed HTLC #%"PRIu64, "Replaying old unprocessed HTLC #%"PRIu64,
hin->key.id); hin->key.id);
fail_in_htlc(hin, WIRE_TEMPORARY_NODE_FAILURE, NULL, NULL); if (!peer_accepted_htlc(hin->key.channel, hin->key.id, &failcode)) {
fail_in_htlc(hin,
failcode != 0
? failcode
: WIRE_TEMPORARY_NODE_FAILURE,
NULL, NULL);
} else if (failcode) {
fail_in_htlc(hin, failcode, NULL, NULL);
}
} }
/* Don't leak memory! */ /* Don't leak memory! */

8
tests/test_closing.py
View File

@ -1125,6 +1125,10 @@ def test_onchain_multihtlc_our_unilateral(node_factory, bitcoind):
# Now, restart and manually reconnect end nodes (so they don't ignore HTLCs) # Now, restart and manually reconnect end nodes (so they don't ignore HTLCs)
# In fact, they'll fail them with WIRE_TEMPORARY_NODE_FAILURE. # In fact, they'll fail them with WIRE_TEMPORARY_NODE_FAILURE.
# TODO Remove our reliance on HTLCs failing on startup and the need for
# this plugin
nodes[0].daemon.opts['plugin'] = 'tests/plugins/fail_htlcs.py'
nodes[-1].daemon.opts['plugin'] = 'tests/plugins/fail_htlcs.py'
nodes[0].restart() nodes[0].restart()
nodes[-1].restart() nodes[-1].restart()
@ -1213,6 +1217,10 @@ def test_onchain_multihtlc_their_unilateral(node_factory, bitcoind):
# Now, restart and manually reconnect end nodes (so they don't ignore HTLCs) # Now, restart and manually reconnect end nodes (so they don't ignore HTLCs)
# In fact, they'll fail them with WIRE_TEMPORARY_NODE_FAILURE. # In fact, they'll fail them with WIRE_TEMPORARY_NODE_FAILURE.
# TODO Remove our reliance on HTLCs failing on startup and the need for
# this plugin
nodes[0].daemon.opts['plugin'] = 'tests/plugins/fail_htlcs.py'
nodes[-1].daemon.opts['plugin'] = 'tests/plugins/fail_htlcs.py'
nodes[0].restart() nodes[0].restart()
nodes[-1].restart() nodes[-1].restart()