mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 13:25:43 +01:00
Code Issues Projects Releases Wiki Activity

listpeers: show correct amounts for starting funding allocation

Browse Source 
With dual-funded channels, it's possible for the funding allocation of
the non-opener to not be zero
This commit is contained in:
niftynei 2020-09-16 16:28:36 -05:00 committed by Rusty Russell
parent d0e42e2c36
commit b4989b9e15
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lightningd/peer_control.c
View File

@ -699,7 +699,8 @@ static void json_add_channel(struct lightningd *ld,
const struct channel *channel) const struct channel *channel)
{ {
struct channel_stats channel_stats; struct channel_stats channel_stats;
struct amount_msat funding_msat; struct amount_msat funding_msat, peer_msats, our_msats;
struct amount_sat peer_funded_sats;
struct peer *p = channel->peer; struct peer *p = channel->peer;
json_object_start(response, key); json_object_start(response, key);
@ -745,36 +746,45 @@ static void json_add_channel(struct lightningd *ld,
json_add_string(response, NULL, "option_anchor_outputs"); json_add_string(response, NULL, "option_anchor_outputs");
json_array_end(response); json_array_end(response);
// FIXME @conscott : Modify this when dual-funded channels if (!amount_sat_sub(&peer_funded_sats, channel->funding,
// are implemented channel->our_funds)) {
json_object_start(response, "funding_allocation_msat"); log_broken(channel->log,
if (channel->opener == LOCAL) { "Overflow subtracing funding %s, our funds %s",
json_add_u64(response, node_id_to_hexstr(tmpctx, &p->id), 0); type_to_string(tmpctx, struct amount_sat,
json_add_u64(response, node_id_to_hexstr(tmpctx, &ld->id), &channel->funding),
channel->funding.satoshis * 1000); /* Raw: raw JSON field */ type_to_string(tmpctx, struct amount_sat,
} else { &channel->our_funds));
json_add_u64(response, node_id_to_hexstr(tmpctx, &ld->id), 0); peer_funded_sats = AMOUNT_SAT(0);
json_add_u64(response, node_id_to_hexstr(tmpctx, &p->id),
channel->funding.satoshis * 1000); /* Raw: raw JSON field */
} }
if (!amount_sat_to_msat(&peer_msats, peer_funded_sats)) {
log_broken(channel->log,
"Overflow converting peer sats %s to msat",
type_to_string(tmpctx, struct amount_sat,
&peer_funded_sats));
peer_msats = AMOUNT_MSAT(0);
}
if (!amount_sat_to_msat(&our_msats, channel->our_funds)) {
log_broken(channel->log,
"Overflow converting peer sats %s to msat",
type_to_string(tmpctx, struct amount_sat,
&channel->our_funds));
our_msats = AMOUNT_MSAT(0);
}
json_object_start(response, "funding_allocation_msat");
json_add_u64(response, node_id_to_hexstr(tmpctx, &p->id),
peer_msats.millisatoshis); /* Raw: JSON field */
json_add_u64(response, node_id_to_hexstr(tmpctx, &ld->id),
our_msats.millisatoshis); /* Raw: JSON field */
json_object_end(response); json_object_end(response);
json_object_start(response, "funding_msat"); json_object_start(response, "funding_msat");
if (channel->opener == LOCAL) { json_add_sat_only(response,
json_add_sat_only(response, node_id_to_hexstr(tmpctx, &p->id),
node_id_to_hexstr(tmpctx, &p->id), peer_funded_sats);
AMOUNT_SAT(0)); json_add_sat_only(response,
json_add_sat_only(response, node_id_to_hexstr(tmpctx, &ld->id),
node_id_to_hexstr(tmpctx, &ld->id), channel->our_funds);
channel->funding);
} else {
json_add_sat_only(response,
node_id_to_hexstr(tmpctx, &ld->id),
AMOUNT_SAT(0));
json_add_sat_only(response,
node_id_to_hexstr(tmpctx, &p->id),
channel->funding);
}
json_object_end(response); json_object_end(response);
if (!amount_sat_to_msat(&funding_msat, channel->funding)) { if (!amount_sat_to_msat(&funding_msat, channel->funding)) {