Skip to content

Shutdown fixes #847

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

Merged
cdecker merged 9 commits into from
Feb 2, 2018
Merged

Shutdown fixes #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
956ff8f
channeld: don't send update_fee after shutdown.
rustyrussell Feb 2, 2018
901cd93
lightningd: add more debugging info for closing.
rustyrussell Feb 2, 2018
6dd10fc
test_lightning: add tests for closing with differetn feerates.
rustyrussell Feb 2, 2018
0739278
lightningd: prefer mutual close over unilateral, even if fee identical.
rustyrussell Feb 2, 2018
a0b7b4a
closingd: use the final commitment tx fee as the maximum.
rustyrussell Feb 2, 2018
16aac04
closingd: rewrite negotiation.
rustyrussell Feb 2, 2018
6b99dd0
closingd: don't punish peers who can't negotiate properly.
rustyrussell Feb 2, 2018
53a9e4f
test_lightning.py: speed up test_closing_different_fees
rustyrussell Feb 2, 2018
89fb750
pay: remove cmd pointer from htlc_out.
rustyrussell Feb 2, 2018
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
13 changes: 13 additions & 0 deletions channeld/channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,19 @@ static void send_commit(struct peer *peer)
return;
}

/* BOLT #2:
*
* - if no HTLCs remain in either commitment transaction:
* - MUST NOT send any `update` message after a `shutdown`.
*/
if (peer->shutdown_sent[LOCAL] && !channel_has_htlcs(peer->channel)) {
status_trace("Can't send commit: final shutdown phase");

peer->commit_timer = NULL;
tal_free(tmpctx);
return;
}

/* If we wanted to update fees, do it now. */
if (peer->channel->funder == LOCAL
&& peer->desired_feerate != channel_feerate(peer->channel, REMOTE)) {
Expand Down
Loading