Basically, `devtools/reduce-includes.sh */*.c`. Build time from make clean (RUST=0) (includes building external libs): Before: real 0m38.944000-40.416000(40.1131+/-0.4)s user 3m6.790000-17.159000(15.0571+/-2.8)s sys 0m35.304000-37.336000(36.8942+/-0.57)s After: real 0m37.872000-39.974000(39.5466+/-0.59)s user 3m1.211000-14.968000(12.4556+/-3.9)s sys 0m35.008000-36.830000(36.4143+/-0.5)s Build time after touch config.vars (RUST=0): Before: real 0m19.831000-21.862000(21.5528+/-0.58)s user 2m15.361000-30.731000(28.4798+/-4.4)s sys 0m21.056000-22.339000(22.0346+/-0.35)s After: real 0m18.384000-21.307000(20.8605+/-0.92)s user 2m5.585000-26.843000(23.6017+/-6.7)s sys 0m19.650000-22.003000(21.4943+/-0.69)s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
166 lines
4.9 KiB
C
166 lines
4.9 KiB
C
#include "config.h"
|
|
#include <common/json_command.h>
|
|
#include <lightningd/chaintopology.h>
|
|
#include <lightningd/feerate.h>
|
|
#include <lightningd/jsonrpc.h>
|
|
#include <lightningd/lightningd.h>
|
|
|
|
const char *feerate_name(enum feerate feerate)
|
|
{
|
|
switch (feerate) {
|
|
case FEERATE_OPENING: return "opening";
|
|
case FEERATE_MUTUAL_CLOSE: return "mutual_close";
|
|
case FEERATE_UNILATERAL_CLOSE: return "unilateral_close";
|
|
case FEERATE_DELAYED_TO_US: return "delayed_to_us";
|
|
case FEERATE_HTLC_RESOLUTION: return "htlc_resolution";
|
|
case FEERATE_PENALTY: return "penalty";
|
|
case FEERATE_MIN: return "min_acceptable";
|
|
case FEERATE_MAX: return "max_acceptable";
|
|
}
|
|
abort();
|
|
}
|
|
|
|
struct command_result *param_feerate_style(struct command *cmd,
|
|
const char *name,
|
|
const char *buffer,
|
|
const jsmntok_t *tok,
|
|
enum feerate_style **style)
|
|
{
|
|
*style = tal(cmd, enum feerate_style);
|
|
if (json_tok_streq(buffer, tok,
|
|
feerate_style_name(FEERATE_PER_KSIPA))) {
|
|
**style = FEERATE_PER_KSIPA;
|
|
return NULL;
|
|
} else if (json_tok_streq(buffer, tok,
|
|
feerate_style_name(FEERATE_PER_KBYTE))) {
|
|
**style = FEERATE_PER_KBYTE;
|
|
return NULL;
|
|
}
|
|
|
|
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
|
|
"'%s' should be '%s' or '%s', not '%.*s'",
|
|
name,
|
|
feerate_style_name(FEERATE_PER_KSIPA),
|
|
feerate_style_name(FEERATE_PER_KBYTE),
|
|
json_tok_full_len(tok), json_tok_full(buffer, tok));
|
|
}
|
|
|
|
/* This can set **feerate to 0, if it's unknown. */
|
|
static struct command_result *param_feerate_unchecked(struct command *cmd,
|
|
const char *name,
|
|
const char *buffer,
|
|
const jsmntok_t *tok,
|
|
u32 **feerate)
|
|
{
|
|
*feerate = tal(cmd, u32);
|
|
|
|
if (json_tok_streq(buffer, tok, "opening")) {
|
|
**feerate = opening_feerate(cmd->ld->topology);
|
|
return NULL;
|
|
}
|
|
if (json_tok_streq(buffer, tok, "mutual_close")) {
|
|
**feerate = mutual_close_feerate(cmd->ld->topology);
|
|
return NULL;
|
|
}
|
|
if (json_tok_streq(buffer, tok, "penalty")) {
|
|
**feerate = penalty_feerate(cmd->ld->topology);
|
|
return NULL;
|
|
}
|
|
if (json_tok_streq(buffer, tok, "unilateral_close")) {
|
|
**feerate = unilateral_feerate(cmd->ld->topology, false);
|
|
return NULL;
|
|
}
|
|
if (json_tok_streq(buffer, tok, "unilateral_anchor_close")) {
|
|
**feerate = unilateral_feerate(cmd->ld->topology, true);
|
|
return NULL;
|
|
}
|
|
|
|
/* We used SLOW, NORMAL, and URGENT as feerate targets previously,
|
|
* and many commands rely on this syntax now.
|
|
* It's also really more natural for an user interface. */
|
|
if (json_tok_streq(buffer, tok, "slow")) {
|
|
**feerate = feerate_for_deadline(cmd->ld->topology, 100);
|
|
return NULL;
|
|
} else if (json_tok_streq(buffer, tok, "normal")) {
|
|
**feerate = feerate_for_deadline(cmd->ld->topology, 12);
|
|
return NULL;
|
|
} else if (json_tok_streq(buffer, tok, "urgent")) {
|
|
**feerate = feerate_for_deadline(cmd->ld->topology, 6);
|
|
return NULL;
|
|
} else if (json_tok_streq(buffer, tok, "minimum")) {
|
|
**feerate = get_feerate_floor(cmd->ld->topology);
|
|
return NULL;
|
|
}
|
|
|
|
/* Can specify number of blocks as a target */
|
|
if (json_tok_endswith(buffer, tok, "blocks")) {
|
|
jsmntok_t base = *tok;
|
|
base.end -= strlen("blocks");
|
|
u32 numblocks;
|
|
|
|
if (!json_to_number(buffer, &base, &numblocks)) {
|
|
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
|
|
"'%s' should be an integer not '%.*s'",
|
|
name, base.end - base.start,
|
|
buffer + base.start);
|
|
}
|
|
**feerate = feerate_for_deadline(cmd->ld->topology, numblocks);
|
|
return NULL;
|
|
}
|
|
|
|
/* It's a number... */
|
|
tal_free(*feerate);
|
|
return param_feerate_val(cmd, name, buffer, tok, feerate);
|
|
}
|
|
|
|
struct command_result *param_feerate(struct command *cmd, const char *name,
|
|
const char *buffer, const jsmntok_t *tok,
|
|
u32 **feerate)
|
|
{
|
|
struct command_result *ret;
|
|
|
|
ret = param_feerate_unchecked(cmd, name, buffer, tok, feerate);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (**feerate == 0)
|
|
return command_fail(cmd, BCLI_NO_FEE_ESTIMATES,
|
|
"Cannot estimate fees (yet)");
|
|
|
|
return NULL;
|
|
}
|
|
|
|
struct command_result *param_feerate_val(struct command *cmd,
|
|
const char *name, const char *buffer,
|
|
const jsmntok_t *tok,
|
|
u32 **feerate_per_kw)
|
|
{
|
|
jsmntok_t base = *tok;
|
|
enum feerate_style style;
|
|
unsigned int num;
|
|
|
|
if (json_tok_endswith(buffer, tok,
|
|
feerate_style_name(FEERATE_PER_KBYTE))) {
|
|
style = FEERATE_PER_KBYTE;
|
|
base.end -= strlen(feerate_style_name(FEERATE_PER_KBYTE));
|
|
} else if (json_tok_endswith(buffer, tok,
|
|
feerate_style_name(FEERATE_PER_KSIPA))) {
|
|
style = FEERATE_PER_KSIPA;
|
|
base.end -= strlen(feerate_style_name(FEERATE_PER_KSIPA));
|
|
} else
|
|
style = FEERATE_PER_KBYTE;
|
|
|
|
if (!json_to_number(buffer, &base, &num)) {
|
|
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
|
|
"'%s' should be an integer with optional perkw/perkb, not '%.*s'",
|
|
name, base.end - base.start,
|
|
buffer + base.start);
|
|
}
|
|
|
|
*feerate_per_kw = tal(cmd, u32);
|
|
**feerate_per_kw = feerate_from_style(num, style);
|
|
if (**feerate_per_kw < FEERATE_FLOOR)
|
|
**feerate_per_kw = FEERATE_FLOOR;
|
|
return NULL;
|
|
}
|