aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: add json_add_tx helper.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-06-05 14:59:01 +09:30
parent aa21eea62b
commit 7e02fbe6ec
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lightningd/peer_control.c
View File

@@ -237,13 +237,12 @@ static void
resolve_one_close_command(struct close_command *cc, bool cooperative)
{
struct json_stream *result = json_stream_success(cc->cmd);
u8 *tx = linearize_tx(result, cc->channel->last_tx);
struct bitcoin_txid txid;
bitcoin_txid(cc->channel->last_tx, &txid);
json_object_start(result, NULL);
json_add_hex_talarr(result, "tx", tx);
json_add_tx(result, "tx", cc->channel->last_tx);
json_add_txid(result, "txid", &txid);
if (cooperative)
json_add_string(result, "type", "mutual");
@@ -1501,7 +1500,6 @@ static struct command_result *json_sign_last_tx(struct command *cmd,
struct node_id *peerid;
struct peer *peer;
struct json_stream *response;
u8 *linear;
struct channel *channel;
if (!param(cmd, buffer, params,
@@ -1523,13 +1521,13 @@ static struct command_result *json_sign_last_tx(struct command *cmd,
response = json_stream_success(cmd);
log_debug(channel->log, "dev-sign-last-tx: signing tx with %zu outputs",
channel->last_tx->wtx->num_outputs);
sign_last_tx(channel);
linear = linearize_tx(cmd, channel->last_tx);
json_object_start(response, NULL);
json_add_tx(response, "tx", channel->last_tx);
json_object_end(response);
remove_sig(channel->last_tx);
json_object_start(response, NULL);
json_add_hex_talarr(response, "tx", linear);
json_object_end(response);
return command_success(cmd, response);
}