aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: add more debugging info for closing.

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 a0f924376f
commit 191e7f4c5c
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lightningd/peer_control.c
View File

@@ -1771,7 +1771,7 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
s64 old_diff, new_diff; s64 old_diff, new_diff;
size_t i; size_t i;
/* Calculate actual fee. */ /* Calculate actual fee (adds in eliminated outputs) */
fee = peer->funding_satoshi; fee = peer->funding_satoshi;
for (i = 0; i < tal_count(tx->output); i++) for (i = 0; i < tal_count(tx->output); i++)
fee -= tx->output[i].amount; fee -= tx->output[i].amount;
@@ -1780,12 +1780,20 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
for (i = 0; i < tal_count(peer->last_tx); i++) for (i = 0; i < tal_count(peer->last_tx); i++)
last_fee -= peer->last_tx->output[i].amount; last_fee -= peer->last_tx->output[i].amount;
log_debug(peer->log, "Their actual closing tx fee is %"PRIu64
" vs previous %"PRIu64, fee, last_fee);
/* Weight once we add in sigs. */ /* Weight once we add in sigs. */
weight = measure_tx_cost(tx) + 74 * 2; weight = measure_tx_cost(tx) + 74 * 2;
min_fee = get_feerate(peer->ld->topology, FEERATE_SLOW) * weight / 1000; min_fee = get_feerate(peer->ld->topology, FEERATE_SLOW) * weight / 1000;
if (fee < min_fee) if (fee < min_fee) {
log_debug(peer->log, "... That's below our min %"PRIu64
" for weight %"PRIu64" at feerate %u",
min_fee, weight,
get_feerate(peer->ld->topology, FEERATE_SLOW));
return false; return false;
}
ideal_fee = get_feerate(peer->ld->topology, FEERATE_NORMAL) * weight / 1000; ideal_fee = get_feerate(peer->ld->topology, FEERATE_NORMAL) * weight / 1000;
@@ -1793,6 +1801,14 @@ static bool better_closing_fee(struct peer *peer, const struct bitcoin_tx *tx)
old_diff = imaxabs((s64)ideal_fee - (s64)last_fee); old_diff = imaxabs((s64)ideal_fee - (s64)last_fee);
new_diff = imaxabs((s64)ideal_fee - (s64)fee); new_diff = imaxabs((s64)ideal_fee - (s64)fee);
log_debug(peer->log, "... That's %s our ideal %"PRIu64,
new_diff < old_diff
? "closer to"
: new_diff > old_diff
? "further from"
: "same distance to",
ideal_fee);
return (new_diff < old_diff); return (new_diff < old_diff);
} }