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

openingd: subtract *both* reserves for our "effective capacity" calculation.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-12-11 08:57:32 +10:30
committed by neil saitug
parent 6d717d73a4
commit bc4a62d349
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
openingd/openingd.c
View File

@@ -14,6 +14,7 @@
#include <common/initial_channel.h> #include <common/initial_channel.h>
#include <common/key_derive.h> #include <common/key_derive.h>
#include <common/memleak.h> #include <common/memleak.h>
#include <common/overflows.h>
#include <common/peer_billboard.h> #include <common/peer_billboard.h>
#include <common/peer_failed.h> #include <common/peer_failed.h>
#include <common/pseudorand.h> #include <common/pseudorand.h>
@@ -143,27 +144,44 @@ static bool check_config_bounds(struct state *state,
*/ */
/* We accumulate this into an effective bandwidth minimum. */ /* We accumulate this into an effective bandwidth minimum. */
/* Overflow check before capacity calc. */ /* Add both reserves to deduct from capacity. */
if (remoteconf->channel_reserve_satoshis > state->funding_satoshis) { if (mul_overflows_u64(remoteconf->channel_reserve_satoshis, 1000)
|| add_overflows_u64(remoteconf->channel_reserve_satoshis * 1000,
state->localconf.channel_reserve_satoshis * 1000)) {
negotiation_failed(state, am_funder, negotiation_failed(state, am_funder,
"channel_reserve_satoshis %"PRIu64 "channel_reserve_satoshis %"PRIu64
" too large for funding_satoshis %"PRIu64, " too large",
remoteconf->channel_reserve_satoshis);
return false;
}
reserve_msat = remoteconf->channel_reserve_satoshis * 1000
+ state->localconf.channel_reserve_satoshis * 1000;
/* We checked this before, or it's ours. */
assert(!mul_overflows_u64(state->funding_satoshis, 1000));
/* If reserves are larger than total msat, we fail. */
if (reserve_msat > state->funding_satoshis * 1000) {
negotiation_failed(state, am_funder,
"channel_reserve_satoshis %"PRIu64
" and %"PRIu64" too large for funding_satoshis %"PRIu64,
remoteconf->channel_reserve_satoshis, remoteconf->channel_reserve_satoshis,
state->localconf.channel_reserve_satoshis,
state->funding_satoshis); state->funding_satoshis);
return false; return false;
} }
/* Consider highest reserve. */
reserve_msat = remoteconf->channel_reserve_satoshis * 1000;
if (state->localconf.channel_reserve_satoshis * 1000 > reserve_msat)
reserve_msat = state->localconf.channel_reserve_satoshis * 1000;
capacity_msat = state->funding_satoshis * 1000 - reserve_msat; capacity_msat = state->funding_satoshis * 1000 - reserve_msat;
/* If they set the max HTLC value to less than that number, it caps
* the channel capacity. */
if (remoteconf->max_htlc_value_in_flight_msat < capacity_msat) if (remoteconf->max_htlc_value_in_flight_msat < capacity_msat)
capacity_msat = remoteconf->max_htlc_value_in_flight_msat; capacity_msat = remoteconf->max_htlc_value_in_flight_msat;
if (remoteconf->htlc_minimum_msat * (u64)1000 > capacity_msat) { /* If the minimum htlc is greater than the capacity, the channel is
* useless. */
if (mul_overflows_u64(remoteconf->htlc_minimum_msat, 1000)
|| remoteconf->htlc_minimum_msat * (u64)1000 > capacity_msat) {
negotiation_failed(state, am_funder, negotiation_failed(state, am_funder,
"htlc_minimum_msat %"PRIu64 "htlc_minimum_msat %"PRIu64
" too large for funding_satoshis %"PRIu64 " too large for funding_satoshis %"PRIu64