aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-08 15:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: prefer mutual close over unilateral, even if fee identical.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-02 11:16:18 +10:30
committed by Christian Decker
parent f527f39613
commit 4ed13401ce
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lightningd/peer_control.c
View File

@@ -1764,7 +1764,9 @@ void peer_last_tx(struct peer *peer, struct bitcoin_tx *tx,
peer->last_tx = tal_steal(peer, tx);
}
/* Is this better than the last tx we were holding? */
/* Is this better than the last tx we were holding? This can happen
* even without closingd misbehaving, if we have multiple,
* interrupted, rounds of negotiation. */
static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
{
u64 weight, fee, last_fee, ideal_fee, min_fee;
@@ -1801,6 +1803,8 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
old_diff = imaxabs((s64)ideal_fee - (s64)last_fee);
new_diff = imaxabs((s64)ideal_fee - (s64)fee);
/* In case of a tie, prefer new over old: this covers the preference
* for a mutual close over a unilateral one. */
log_debug(peer->log, "... That's %s our ideal %"PRIu64,
new_diff < old_diff
? "closer to"
@@ -1809,7 +1813,7 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
: "same distance to",
ideal_fee);
return (new_diff < old_diff);
return new_diff <= old_diff;
}
static void peer_received_closing_signature(struct peer *peer, const u8 *msg)