← Watch feed
lightningd: reorder JSON fields into more coherent order.
Public commit record
73/100 · Adequate
What the developer wrote
Authored by Rusty Russell
lightningd: reorder JSON fields into more coherent order.
This is mainly for the coming list commands, but it's just more
logical to have the common fields at the top.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
✓ Specific, descriptive subject✓ Names a concrete action or component✓ Provides detailed explanatory context
What changed, and why it matters
This commit simply rearranges the order in which information appears in JSON output for two internal accounting functions. No values are added, removed, or changed in meaning. It is a cosmetic/code-organization change with no security relevance.
Recommended action
No security action required. Treat as a normal refactoring commit.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The patch reorders json_add_* calls in json_add_chain_mvt_fields() and json_add_channel_mvt_fields() so that fields common to both structures are emitted first. Field names, data types, conditional logic, and callers are unchanged. No security bug is introduced or fixed.
Changed components
lightningd/coin_mvts.cInspect captured patch +14 / −12
diff --git a/lightningd/coin_mvts.c b/lightningd/coin_mvts.c
index 415a8b93..e31ede11 100644
--- a/lightningd/coin_mvts.c
+++ b/lightningd/coin_mvts.c
@@ -190,9 +190,16 @@ void json_add_chain_mvt_fields(struct json_stream *stream,
bool include_old_txid_field,
const struct chain_coin_mvt *chain_mvt)
{
+ /* Fields in common with channel moves go first */
+ json_add_mvt_account_id(stream, "account_id", &chain_mvt->account);
+ json_add_amount_msat(stream, "credit_msat", chain_mvt->credit);
+ json_add_amount_msat(stream, "debit_msat", chain_mvt->debit);
+ json_add_u64(stream, "timestamp", chain_mvt->timestamp);
+ add_movement_tags(stream, include_tags_arr, chain_mvt->tags, true);
+
+ json_add_outpoint(stream, "utxo", &chain_mvt->outpoint);
if (chain_mvt->peer_id)
json_add_node_id(stream, "peer_id", chain_mvt->peer_id);
- json_add_mvt_account_id(stream, "account_id", &chain_mvt->account);
if (chain_mvt->originating_acct)
json_add_mvt_account_id(stream, "originating_account", chain_mvt->originating_acct);
@@ -210,22 +217,16 @@ void json_add_chain_mvt_fields(struct json_stream *stream,
&chain_mvt->outpoint.txid));
json_add_u32(stream, "vout", chain_mvt->outpoint.n);
}
- json_add_outpoint(stream, "utxo", &chain_mvt->outpoint);
/* on-chain htlcs include a payment hash */
if (chain_mvt->payment_hash)
json_add_sha256(stream, "payment_hash", chain_mvt->payment_hash);
- json_add_amount_msat(stream, "credit_msat", chain_mvt->credit);
- json_add_amount_msat(stream, "debit_msat", chain_mvt->debit);
-
json_add_amount_sat_msat(stream,
"output_msat", chain_mvt->output_val);
if (chain_mvt->output_count > 0)
json_add_num(stream, "output_count", chain_mvt->output_count);
- add_movement_tags(stream, include_tags_arr, chain_mvt->tags, true);
json_add_u32(stream, "blockheight", chain_mvt->blockheight);
- json_add_u64(stream, "timestamp", chain_mvt->timestamp);
}
void json_add_channel_mvt_fields(struct json_stream *stream,
@@ -233,7 +234,13 @@ void json_add_channel_mvt_fields(struct json_stream *stream,
const struct channel_coin_mvt *chan_mvt,
bool extra_tags_field)
{
+ /* Fields in common with chain moves go first */
json_add_mvt_account_id(stream, "account_id", &chan_mvt->account);
+ json_add_amount_msat(stream, "credit_msat", chan_mvt->credit);
+ json_add_amount_msat(stream, "debit_msat", chan_mvt->debit);
+ json_add_u64(stream, "timestamp", chan_mvt->timestamp);
+ add_movement_tags(stream, include_tags_arr, chan_mvt->tags, extra_tags_field);
+
/* push funding / leases don't have a payment_hash */
if (chan_mvt->payment_hash)
json_add_sha256(stream, "payment_hash", chan_mvt->payment_hash);
@@ -241,10 +248,5 @@ void json_add_channel_mvt_fields(struct json_stream *stream,
json_add_u64(stream, "part_id", chan_mvt->part_and_group->part_id);
json_add_u64(stream, "group_id", chan_mvt->part_and_group->group_id);
}
- json_add_amount_msat(stream, "credit_msat", chan_mvt->credit);
- json_add_amount_msat(stream, "debit_msat", chan_mvt->debit);
json_add_amount_msat(stream, "fees_msat", chan_mvt->fees);
-
- add_movement_tags(stream, include_tags_arr, chan_mvt->tags, extra_tags_field);
- json_add_u64(stream, "timestamp", chan_mvt->timestamp);
}
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.