aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-10 09:34:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

mfc: Add a commitment_feerate optional parameter to multifundchannel

Browse Source 
Technically there *are* two feerates that we need to know:
  - the feerate to use for the funding transaction, and
  - the feerate to tell our peer to use for our commitment txs/htlc txs

As written, `multifundchannel` uses the same feerate for both. This
optional parameter will allow us to differentiate between the two, which
will be exceedingly handy for anchor output worlds. ;)

FIXME: test this

Changelog-Added: JSON API: `multifundchannel` has a new optional argument, 'commitment_feerate', which can be used to differentiate between the funding feerate and the channel's initial commitment feerate
This commit is contained in:
niftynei
2020-10-14 21:39:54 -05:00
committed by Rusty Russell
parent ae825fff26
commit e66937e012
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/spender/multifundchannel.c
View File

@@ -147,8 +147,17 @@ struct multifundchannel_command {
*/
size_t pending;
/* The feerate desired by the user. */
/* The feerate desired by the user.
* If cmtmt_feerate_str is present, will only be used
* for the funding transaction. */
const char *feerate_str;
/* The feerate desired by the user for
* the channel commitment and HTLC txs.
* If not provided, defaults to the feerate_str
* value. */
const char *cmtmt_feerate_str;
/* The minimum number of confirmations for owned
UTXOs to be selected.
*/
@@ -1164,7 +1173,9 @@ fundchannel_start_dest(struct multifundchannel_destination *dest)
json_add_string(req->js, "amount",
fmt_amount_sat(tmpctx, &dest->amount));
if (mfc->feerate_str)
if (mfc->cmtmt_feerate_str)
json_add_string(req->js, "feerate", mfc->cmtmt_feerate_str);
else if (mfc->feerate_str)
json_add_string(req->js, "feerate", mfc->feerate_str);
json_add_bool(req->js, "announce", dest->announce);
json_add_string(req->js, "push_msat",
@@ -1988,7 +1999,7 @@ json_multifundchannel(struct command *cmd,
const jsmntok_t *params)
{
struct multifundchannel_destination *dests;
const char *feerate_str;
const char *feerate_str, *cmtmt_feerate_str;
u32 *minconf;
const jsmntok_t *utxos_tok;
u32 *minchannels;
@@ -2001,6 +2012,7 @@ json_multifundchannel(struct command *cmd,
p_opt_def("minconf", param_number, &minconf, 1),
p_opt("utxos", param_tok, &utxos_tok),
p_opt("minchannels", param_positive_number, &minchannels),
p_opt("commitment_feerate", param_string, &cmtmt_feerate_str),
NULL))
return command_param_failed();
@@ -2017,6 +2029,7 @@ json_multifundchannel(struct command *cmd,
mfc->destinations[i].mfc = mfc;
mfc->feerate_str = feerate_str;
mfc->cmtmt_feerate_str = cmtmt_feerate_str;
mfc->minconf = *minconf;
if (utxos_tok)
mfc->utxos_str = tal_strndup(mfc, json_tok_full(buf, utxos_tok),