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

lightningd: don't cap spendable_msat/receivable_msat for wumbo channels.

Browse Source 
If we both support large channels, we can actually send giant HTLCs.

This, in turn, fixes pay (which relies on this field!).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: Plugins: `pay` now knows it can use locally-connected wumbo channels for large payments.
Fixes: #5250
Fixes: #5417
This commit is contained in:
Rusty Russell
2022-11-29 13:37:44 +10:30
committed by Christian Decker
parent b6555dccaf
commit 3ca1c70c44
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lightningd/peer_control.c
View File

@@ -613,6 +613,7 @@ static void subtract_received_htlcs(const struct channel *channel,
struct amount_msat channel_amount_spendable(const struct channel *channel)
{
struct amount_msat spendable;
bool wumbo;
/* Compute how much we can send via this channel in one payment. */
if (!amount_msat_sub_sat(&spendable,
@@ -636,9 +637,15 @@ struct amount_msat channel_amount_spendable(const struct channel *channel)
channel->channel_info.their_config.htlc_minimum))
return AMOUNT_MSAT(0);
wumbo = feature_negotiated(channel->peer->ld->our_features,
channel->peer->their_features,
OPT_LARGE_CHANNELS);
/* We can't offer an HTLC over the max payment threshold either. */
if (amount_msat_greater(spendable, chainparams->max_payment))
if (amount_msat_greater(spendable, chainparams->max_payment)
&& !wumbo) {
spendable = chainparams->max_payment;
}
return spendable;
}
@@ -646,6 +653,7 @@ struct amount_msat channel_amount_spendable(const struct channel *channel)
struct amount_msat channel_amount_receivable(const struct channel *channel)
{
struct amount_msat their_msat, receivable;
bool wumbo;
/* Compute how much we can receive via this channel in one payment */
if (!amount_sat_sub_msat(&their_msat,
@@ -672,9 +680,15 @@ struct amount_msat channel_amount_receivable(const struct channel *channel)
if (amount_msat_less(receivable, channel->our_config.htlc_minimum))
return AMOUNT_MSAT(0);
wumbo = feature_negotiated(channel->peer->ld->our_features,
channel->peer->their_features,
OPT_LARGE_CHANNELS);
/* They can't offer an HTLC over the max payment threshold either. */
if (amount_msat_greater(receivable, chainparams->max_payment))
if (amount_msat_greater(receivable, chainparams->max_payment)
&& !wumbo) {
receivable = chainparams->max_payment;
}
return receivable;
}

1
tests/test_connection.py
View File

@@ -3407,7 +3407,6 @@ def test_pay_disconnect_stress(node_factory, executor):
@pytest.mark.openchannel('v1')
@pytest.mark.openchannel('v2')
@pytest.mark.xfail(strict=True)
def test_wumbo_channels(node_factory, bitcoind):
l1, l2, l3 = node_factory.get_nodes(3,
opts=[{'large-channels': None},