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

JSON-RPC: Add funds in channels to listfunds

Browse Source 
This caused a bit of confusion for our testers, when funding a channel
the funds are no longer available and listed in `lisfunds`, causing
them to believe funds to have disappeared. This PR adds funds that are
allocated to channels in the `listfunds` output, together with some
info about the channel, to make sure this doesn't happen again.

Signed-off-by: Christian Decker <decker.christian@gmail.com>
This commit is contained in:
Christian Decker
2018-02-09 14:24:33 +01:00
committed by Rusty Russell
parent 97871237bf
commit 68639db7db
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wallet/walletrpc.c
View File

@@ -16,6 +16,7 @@
#include <lightningd/jsonrpc.h>
#include <lightningd/lightningd.h>
#include <lightningd/log.h>
#include <lightningd/peer_control.h>
#include <lightningd/subd.h>
#include <wally_bip32.h>
#include <wire/wire_sync.h>
@@ -396,6 +397,7 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
const jsmntok_t *params UNUSED)
{
struct json_result *response = new_json_result(cmd);
struct peer *p;
struct utxo **utxos =
wallet_get_utxos(cmd, cmd->ld->wallet, output_state_available);
json_object_start(response, NULL);
@@ -408,7 +410,29 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
json_object_end(response);
}
json_array_end(response);
/* Add funds that are allocated to channels */
json_array_start(response, "channels");
list_for_each(&cmd->ld->peers, p, list) {
if (!p->our_msatoshi || !p->funding_txid)
continue;
json_object_start(response, NULL);
json_add_pubkey(response, "peer_id", &p->id);
if (p->scid)
json_add_short_channel_id(response, "short_channel_id",
p->scid);
/* Poor man's rounding to satoshis to match the unit for outputs */
json_add_u64(response, "channel_sat", (*p->our_msatoshi + 500)/1000);
json_add_u64(response, "channel_total_sat",
p->funding_satoshi);
json_add_txid(response, "funding_txid", p->funding_txid);
json_object_end(response);
}
json_array_end(response);
json_object_end(response);
command_success(cmd, response);
}