aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: allow --commit-fee-max=0 for "no limit"

Browse Source 
For testnet, fee estimates are not reliable at all.

Reported-by: Christian Decker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-10-07 14:00:17 +10:30
parent 44282eed16
commit 1e6f7059d3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/lightningd.c
View File

@@ -117,7 +117,7 @@ static void config_register_opts(struct lightningd_state *dstate)
"Minimum percentage of fee to accept for commitment"); "Minimum percentage of fee to accept for commitment");
opt_register_arg("--commit-fee-max=<percent>", opt_set_u32, opt_show_u32, opt_register_arg("--commit-fee-max=<percent>", opt_set_u32, opt_show_u32,
&dstate->config.commitment_fee_max_percent, &dstate->config.commitment_fee_max_percent,
"Maximum percentage of fee to accept for commitment"); "Maximum percentage of fee to accept for commitment (0 for unlimited)");
opt_register_arg("--commit-fee=<percent>", opt_set_u32, opt_show_u32, opt_register_arg("--commit-fee=<percent>", opt_set_u32, opt_show_u32,
&dstate->config.commitment_fee_percent, &dstate->config.commitment_fee_percent,
"Percentage of fee to request for their commitment"); "Percentage of fee to request for their commitment");
@@ -226,7 +226,8 @@ static void default_config(struct config *config)
static void check_config(struct lightningd_state *dstate) static void check_config(struct lightningd_state *dstate)
{ {
/* We do this by ensuring it's less than the minimum we would accept. */ /* We do this by ensuring it's less than the minimum we would accept. */
if (dstate->config.commitment_fee_max_percent if (dstate->config.commitment_fee_max_percent != 0
&& dstate->config.commitment_fee_max_percent
< dstate->config.commitment_fee_min_percent) < dstate->config.commitment_fee_min_percent)
fatal("Commitment fee invalid min-max %u-%u", fatal("Commitment fee invalid min-max %u-%u",
dstate->config.commitment_fee_min_percent, dstate->config.commitment_fee_min_percent,

5
daemon/packets.c
View File

@@ -308,8 +308,9 @@ Pkt *accept_pkt_open(struct peer *peer, const Pkt *pkt,
return pkt_err(peer, "Commitment fee %u below %"PRIu64" x %u%%", return pkt_err(peer, "Commitment fee %u below %"PRIu64" x %u%%",
o->initial_fee_rate, feerate, o->initial_fee_rate, feerate,
peer->dstate->config.commitment_fee_min_percent); peer->dstate->config.commitment_fee_min_percent);
if (o->initial_fee_rate if (peer->dstate->config.commitment_fee_max_percent != 0
> feerate * peer->dstate->config.commitment_fee_max_percent / 100) && (o->initial_fee_rate
> feerate * peer->dstate->config.commitment_fee_max_percent/100))
return pkt_err(peer, "Commitment fee %u above %"PRIu64" x %u%%", return pkt_err(peer, "Commitment fee %u above %"PRIu64" x %u%%",
o->initial_fee_rate, feerate, o->initial_fee_rate, feerate,
peer->dstate->config.commitment_fee_max_percent); peer->dstate->config.commitment_fee_max_percent);