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

json-rpc: Print details and annotations for listtransactions

Browse Source
This commit is contained in:
Christian Decker 2019-10-02 19:38:46 +02:00 committed by neil saitug
parent d981b58234
commit 33bb4f7f58
1 changed files with 97 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
wallet/walletrpc.c
View File

@ -905,6 +905,14 @@ struct {
{0, NULL} {0, NULL}
}; };
static const char *txtype_to_string(enum wallet_tx_type t)
{
for (size_t i=0; wallet_tx_type_display_names[i].name != NULL; i++)
if (t == wallet_tx_type_display_names[i].t)
return wallet_tx_type_display_names[i].name;
return NULL;
}
static void json_add_txtypes(struct json_stream *result, const char *fieldname, enum wallet_tx_type value) static void json_add_txtypes(struct json_stream *result, const char *fieldname, enum wallet_tx_type value)
{ {
json_array_start(result, fieldname); json_array_start(result, fieldname);
@ -915,6 +923,92 @@ static void json_add_txtypes(struct json_stream *result, const char *fieldname,
json_array_end(result); json_array_end(result);
} }
static void json_transaction_details(struct json_stream *response,
const struct wallet_transaction *tx)
{
struct wally_tx *wtx = tx->tx->wtx;
json_object_start(response, NULL);
json_add_txid(response, "hash", &tx->id);
json_add_hex_talarr(response, "rawtx", tx->rawtx);
json_add_u64(response, "blockheight", tx->blockheight);
json_add_num(response, "txindex", tx->txindex);
if (tx->annotation.type != 0)
json_add_txtypes(response, "type", tx->annotation.type);
else
json_add_null(response, "type");
if (tx->annotation.channel.u64 != 0)
json_add_short_channel_id(response, "channel", &tx->annotation.channel);
else
json_add_null(response, "channel");
json_add_u32(response, "locktime", wtx->locktime);
json_add_u32(response, "version", wtx->version);
json_array_start(response, "inputs");
for (size_t i=0; i<wtx->num_inputs; i++) {
struct wally_tx_input *in = &wtx->inputs[i];
struct tx_annotation *ann = &tx->output_annotations[i];
const char *txtype = txtype_to_string(ann->type);
json_object_start(response, NULL);
json_add_hex(response, "txid", in->txhash, sizeof(in->txhash));
json_add_u32(response, "index", in->index);
json_add_u32(response, "sequence", in->sequence);
if (txtype != NULL)
json_add_string(response, "type", txtype);
else
json_add_null(response, "type");
if (ann->channel.u64 != 0)
json_add_short_channel_id(response, "channel", &ann->channel);
else
json_add_null(response, "channel");
json_object_end(response);
}
json_array_end(response);
json_array_start(response, "outputs");
for (size_t i=0; i<wtx->num_outputs; i++) {
struct wally_tx_output *out = &wtx->outputs[i];
struct tx_annotation *ann = &tx->output_annotations[i];
const char *txtype = txtype_to_string(ann->type);
struct amount_asset amt = bitcoin_tx_output_get_amount(tx->tx, i);
struct amount_sat sat;
/* TODO We should eventually handle non-bitcoin assets as well. */
if (amount_asset_is_main(&amt))
sat = amount_asset_to_sat(&amt);
else
sat = AMOUNT_SAT(0);
json_object_start(response, NULL);
json_add_u32(response, "index", i);
json_add_amount_sat_only(response, "satoshis", sat);
if (txtype != NULL)
json_add_string(response, "type", txtype);
else
json_add_null(response, "type");
if (ann->channel.u64 != 0)
json_add_short_channel_id(response, "channel", &ann->channel);
else
json_add_null(response, "channel");
json_add_hex(response, "scriptPubKey", out->script, out->script_len);
json_object_end(response);
}
json_array_end(response);
json_object_end(response);
}
static struct command_result *json_listtransactions(struct command *cmd, static struct command_result *json_listtransactions(struct command *cmd,
const char *buffer, const char *buffer,
const jsmntok_t *obj UNNEEDED, const jsmntok_t *obj UNNEEDED,
@ -930,14 +1024,9 @@ static struct command_result *json_listtransactions(struct command *cmd,
response = json_stream_success(cmd); response = json_stream_success(cmd);
json_array_start(response, "transactions"); json_array_start(response, "transactions");
for (size_t i=0; i<tal_count(txs); i++) { for (size_t i=0; i<tal_count(txs); i++)
json_object_start(response, NULL); json_transaction_details(response, &txs[i]);
json_add_txid(response, "hash", &txs[i].id);
json_add_hex_talarr(response, "rawtx", txs[i].rawtx);
json_add_u64(response, "blockheight", txs[i].blockheight);
json_add_num(response, "txindex", txs[i].txindex);
json_object_end(response);
}
json_array_end(response); json_array_end(response);
return command_success(cmd, response); return command_success(cmd, response);
} }