mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-01-18 05:12:45 +01:00
dualopend, openchannel_init: pull out feerate parsing logic
we'll use it again here shortly
This commit is contained in:
parent
334ec0084b
commit
d7f76a6e1f
@ -2335,6 +2335,29 @@ static struct command_result *json_openchannel_update(struct command *cmd,
|
||||
return command_still_pending(cmd);
|
||||
}
|
||||
|
||||
static struct command_result *init_set_feerate(struct command *cmd,
|
||||
u32 **feerate_per_kw,
|
||||
u32 **feerate_per_kw_funding)
|
||||
|
||||
{
|
||||
if (!*feerate_per_kw_funding) {
|
||||
*feerate_per_kw_funding = tal(cmd, u32);
|
||||
**feerate_per_kw_funding = opening_feerate(cmd->ld->topology);
|
||||
if (!**feerate_per_kw_funding)
|
||||
return command_fail(cmd, LIGHTNINGD,
|
||||
"`funding_feerate` not specified and fee "
|
||||
"estimation failed");
|
||||
}
|
||||
if (!*feerate_per_kw) {
|
||||
*feerate_per_kw = tal(cmd, u32);
|
||||
/* FIXME: Anchors are on by default, we should use the lowest
|
||||
* possible feerate */
|
||||
**feerate_per_kw = **feerate_per_kw_funding;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct command_result *json_openchannel_init(struct command *cmd,
|
||||
const char *buffer,
|
||||
const jsmntok_t *obj UNNEEDED,
|
||||
@ -2350,6 +2373,7 @@ static struct command_result *json_openchannel_init(struct command *cmd,
|
||||
struct wally_psbt *psbt;
|
||||
const u8 *our_upfront_shutdown_script;
|
||||
struct open_attempt *oa;
|
||||
struct command_result *res;
|
||||
u8 *msg;
|
||||
|
||||
if (!param(cmd, buffer, params,
|
||||
@ -2389,20 +2413,9 @@ static struct command_result *json_openchannel_init(struct command *cmd,
|
||||
struct wally_psbt,
|
||||
psbt));
|
||||
|
||||
if (!feerate_per_kw_funding) {
|
||||
feerate_per_kw_funding = tal(cmd, u32);
|
||||
*feerate_per_kw_funding = opening_feerate(cmd->ld->topology);
|
||||
if (!*feerate_per_kw_funding)
|
||||
return command_fail(cmd, LIGHTNINGD,
|
||||
"`funding_feerate` not specified and fee "
|
||||
"estimation failed");
|
||||
}
|
||||
if (!feerate_per_kw) {
|
||||
feerate_per_kw = tal(cmd, u32);
|
||||
/* FIXME: Anchors are on by default, we should use the lowest
|
||||
* possible feerate */
|
||||
*feerate_per_kw = *feerate_per_kw_funding;
|
||||
}
|
||||
res = init_set_feerate(cmd, &feerate_per_kw, &feerate_per_kw_funding);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
if (!topology_synced(cmd->ld->topology)) {
|
||||
return command_fail(cmd, FUNDING_STILL_SYNCING_BITCOIN,
|
||||
|
Loading…
Reference in New Issue
Block a user