mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 10:46:58 +01:00
Code Issues Projects Releases Wiki Activity

channeld: speak no wumbo.

Browse source 
We cap our htlc_maximum_msat at 2^32-1.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-11-21 21:06:21 +10:30
parent 5a12af817a
commit bed7986650
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
channeld/channeld.c
View file

@ -10,6 +10,7 @@
* reading and writing synchronously we could deadlock if we hit buffer * reading and writing synchronously we could deadlock if we hit buffer
* limits, unlikely as that is. * limits, unlikely as that is.
*/ */
#include <bitcoin/chainparams.h>
#include <bitcoin/privkey.h> #include <bitcoin/privkey.h>
#include <bitcoin/script.h> #include <bitcoin/script.h>
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
@ -60,7 +61,6 @@
#define PEER_FD 3 #define PEER_FD 3
#define GOSSIP_FD 4 #define GOSSIP_FD 4
#define HSM_FD 5 #define HSM_FD 5
#define min(x, y) ((x) < (y) ? (x) : (y))
struct commit_sigs { struct commit_sigs {
struct peer *peer; struct peer *peer;
@ -236,12 +236,22 @@ static const u8 *hsm_req(const tal_t *ctx, const u8 *req TAKES)
* capacity minus the cumulative reserve. * capacity minus the cumulative reserve.
* FIXME: does this need fuzz? * FIXME: does this need fuzz?
*/ */
static const u64 advertised_htlc_max(const struct channel *channel) static u64 advertised_htlc_max(const struct channel *channel)
{ {
u64 cumulative_reserve_msat = (channel->config[LOCAL].channel_reserve_satoshis + u64 lower_bound;
channel->config[REMOTE].channel_reserve_satoshis) * 1000; u64 cumulative_reserve_msat;
return min(channel->config[REMOTE].max_htlc_value_in_flight_msat,
channel->funding_msat - cumulative_reserve_msat); cumulative_reserve_msat =
(channel->config[LOCAL].channel_reserve_satoshis +
channel->config[REMOTE].channel_reserve_satoshis) * 1000;
lower_bound = channel->config[REMOTE].max_htlc_value_in_flight_msat;
if (channel->funding_msat - cumulative_reserve_msat < lower_bound)
lower_bound = channel->funding_msat - cumulative_reserve_msat;
/* FIXME BOLT QUOTE: https://github.com/lightningnetwork/lightning-rfc/pull/512 once merged */
if (channel->chainparams->max_payment_msat < lower_bound)
lower_bound = channel->chainparams->max_payment_msat;
return lower_bound;
} }
/* Create and send channel_update to gossipd (and maybe peer) */ /* Create and send channel_update to gossipd (and maybe peer) */