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

df-bugs: only include the funding if we're the opener

Browse Source 
`funding` field belongs to the INITIATOR!
This commit is contained in:
niftynei
2021-05-11 17:23:19 -05:00
committed by Rusty Russell
parent 260adb824e
commit 8908dd08ec
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lightningd/dual_open_control.c
View File

@@ -115,6 +115,7 @@ void json_add_unsaved_channel(struct json_stream *response,
const struct channel *channel)
{
struct amount_msat total;
struct open_attempt *oa;
if (!channel)
return;
@@ -123,6 +124,8 @@ void json_add_unsaved_channel(struct json_stream *response,
if (!channel->open_attempt)
return;
oa = channel->open_attempt;
json_object_start(response, NULL);
json_add_string(response, "state", channel_state_name(channel));
json_add_string(response, "owner", channel->owner->name);
@@ -139,13 +142,17 @@ void json_add_unsaved_channel(struct json_stream *response,
json_add_string(response, NULL, channel->billboard.transient);
json_array_end(response);
/* These should never fail. */
if (amount_sat_to_msat(&total, channel->open_attempt->funding)) {
json_add_amount_msat_compat(response, total,
"msatoshi_to_us", "to_us_msat");
/* This will change if peer adds funds */
json_add_amount_msat_compat(response, total,
"msatoshi_total", "total_msat");
/* funding + our_upfront_shutdown only available if we're initiator */
if (oa->role == TX_INITIATOR) {
if (amount_sat_to_msat(&total, oa->funding)) {
json_add_amount_msat_compat(response, total,
"msatoshi_to_us",
"to_us_msat");
/* This will change if peer adds funds */
json_add_amount_msat_compat(response, total,
"msatoshi_total",
"total_msat");
}
}
json_array_start(response, "features");