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

channeld: don't ever use 0 as a feerate.

Browse Source 
This has been reported several times on regtest, most recently by Gijs
van Dam.  It turns out approx_max_feerate() was returning 0 in some
corner cases: we should *not* be using that value (as shown, it's
overly conservative) except as a ceiling on fee *increases*.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: Protocol: don't ever send 0 fee_updates (regtest bug).
This commit is contained in:
Rusty Russell
2021-07-08 12:17:01 +09:30
parent 063366ed7e
commit 131e79ab91
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channeld/channeld.c
View File

@@ -1106,7 +1106,7 @@ static struct bitcoin_signature *unraw_sigs(const tal_t *ctx,
/* Do we want to update fees? */
static bool want_fee_update(const struct peer *peer, u32 *target)
{
u32 max, val;
u32 current, val;
if (peer->channel->opener != LOCAL)
return false;
@@ -1116,19 +1116,28 @@ static bool want_fee_update(const struct peer *peer, u32 *target)
if (peer->stfu)
return false;
#endif
current = channel_feerate(peer->channel, REMOTE);
max = approx_max_feerate(peer->channel);
val = peer->desired_feerate;
/* max is *approximate*: only take it into account if we're
* trying to increase feerate. */
if (peer->desired_feerate > current) {
/* FIXME: We should avoid adding HTLCs until we can meet this
* feerate! */
u32 max = approx_max_feerate(peer->channel);
/* FIXME: We should avoid adding HTLCs until we can meet this
* feerate! */
if (val > max)
val = max;
val = peer->desired_feerate;
/* Respect max, but don't let us *decrease* us */
if (val > max)
val = max;
if (val < current)
val = current;
} else
val = peer->desired_feerate;
if (target)
*target = val;
return val != channel_feerate(peer->channel, REMOTE);
return val != current;
}
static void send_commit(struct peer *peer)