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

coinmvt: don't use msats in fields not called "_msat".

Browse Source 
The new msat fields are turned into Millisatoshi, so handle that correctly
too in tests too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: Plugins: `coin_movement` notification: `balance`, `credit`, `debit` and `fees` (use `balance_msat`, `credit_msat`, `debit_msat` and `fees_msat`)
This commit is contained in:
Rusty Russell
2022-06-19 16:49:11 +09:30
parent e2f0ca9cbe
commit ca69e293d1
7 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lightningd/notification.c
View File

@@ -1,4 +1,5 @@
#include "config.h"
#include <common/configdir.h>
#include <common/json_helpers.h>
#include <common/type_to_string.h>
#include <lightningd/channel.h>
@@ -478,8 +479,13 @@ static void coin_movement_notification_serialize(struct json_stream *stream,
json_add_string(stream, "originating_account",
mvt->originating_acct);
json_mvt_id(stream, mvt->type, &mvt->id);
json_add_amount_msat_only(stream, "credit", mvt->credit);
json_add_amount_msat_only(stream, "debit", mvt->debit);
if (deprecated_apis) {
json_add_amount_msat_only(stream, "credit", mvt->credit);
json_add_amount_msat_only(stream, "debit", mvt->debit);
}
json_add_amount_msat_only(stream, "credit_msat", mvt->credit);
json_add_amount_msat_only(stream, "debit_msat", mvt->debit);
/* Only chain movements */
if (mvt->output_val)
json_add_amount_sats_deprecated(stream, "output_value",
@@ -489,9 +495,13 @@ static void coin_movement_notification_serialize(struct json_stream *stream,
json_add_num(stream, "output_count",
mvt->output_count);
if (mvt->fees)
json_add_amount_msat_only(stream, "fees",
if (mvt->fees) {
if (deprecated_apis)
json_add_amount_msat_only(stream, "fees",
*mvt->fees);
json_add_amount_msat_only(stream, "fees_msat",
*mvt->fees);
}
json_array_start(stream, "tags");
for (size_t i = 0; i < tal_count(mvt->tags); i++)
@@ -535,7 +545,10 @@ static void balance_snapshot_notification_serialize(struct json_stream *stream,
json_object_start(stream, NULL);
json_add_string(stream, "account_id",
snap->accts[i]->acct_id);
json_add_amount_msat_only(stream, "balance",
if (deprecated_apis)
json_add_amount_msat_only(stream, "balance",
snap->accts[i]->balance);
json_add_amount_msat_only(stream, "balance_msat",
snap->accts[i]->balance);
json_add_string(stream, "coin_type", snap->accts[i]->bip173_name);
json_object_end(stream);