bkpr: remove different currency support.

We still output the fields, they're just always the currency of the node.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Changed: Plugins: `bookkeeper` now explicitly assumes every transaction is in the same currency as the node (true unless you added manually)

Author: rustyrussell

onchaind/test/run-grind_feerate-bug.c

@@ -134,14 +134,6 @@ struct chain_coin_mvt *new_coin_external_spend(const tal_t *ctx UNNEEDED,
 					       struct mvt_tags tags)
 
 { fprintf(stderr, "new_coin_external_spend called!\n"); abort(); }
-/* Generated stub for new_coin_wallet_deposit */
-struct chain_coin_mvt *new_coin_wallet_deposit(const tal_t *ctx UNNEEDED,
-					       const struct bitcoin_outpoint *outpoint UNNEEDED,
-					       u32 blockheight UNNEEDED,
-					       struct amount_sat amount UNNEEDED,
-					       struct mvt_tags tags)
-
-{ fprintf(stderr, "new_coin_wallet_deposit called!\n"); abort(); }
 /* Generated stub for new_onchain_htlc_deposit */
 struct chain_coin_mvt *new_onchain_htlc_deposit(const tal_t *ctx UNNEEDED,
 						const struct bitcoin_outpoint *outpoint UNNEEDED,

onchaind/test/run-grind_feerate.c

@@ -184,14 +184,6 @@ struct chain_coin_mvt *new_coin_external_spend(const tal_t *ctx UNNEEDED,
 					       struct mvt_tags tags)
 
 { fprintf(stderr, "new_coin_external_spend called!\n"); abort(); }
-/* Generated stub for new_coin_wallet_deposit */
-struct chain_coin_mvt *new_coin_wallet_deposit(const tal_t *ctx UNNEEDED,
-					       const struct bitcoin_outpoint *outpoint UNNEEDED,
-					       u32 blockheight UNNEEDED,
-					       struct amount_sat amount UNNEEDED,
-					       struct mvt_tags tags)
-
-{ fprintf(stderr, "new_coin_wallet_deposit called!\n"); abort(); }
 /* Generated stub for new_onchain_htlc_deposit */
 struct chain_coin_mvt *new_onchain_htlc_deposit(const tal_t *ctx UNNEEDED,
 						const struct bitcoin_outpoint *outpoint UNNEEDED,

plugins/bkpr/bookkeeper.c

@@ -316,7 +316,8 @@ static struct command_result *json_inspect(struct command *cmd,
 						     ev->output_value);
 				json_add_amount_msat(res, "credit_msat",
 						     ev->credit);
-				json_add_string(res, "currency", ev->currency);
+				json_add_string(res, "currency",
+						chainparams->lightning_hrp);
 				if (ev->origin_acct)
 					json_add_string(res, "originating_account",
 							ev->origin_acct);
@@ -333,7 +334,7 @@ static struct command_result *json_inspect(struct command *cmd,
 							     "output_value_msat",
 							     ev->output_value);
 					json_add_string(res, "currency",
-							ev->currency);
+							chainparams->lightning_hrp);
 				}
 				json_add_string(res, "spend_tag", ev->tag);
 				json_add_txid(res, "spending_txid",
@@ -628,7 +629,6 @@ struct new_account_info {
 	struct account *acct;
 	struct amount_msat curr_bal;
 	u32 timestamp;
-	char *currency;
 };
 
 static void try_update_open_fees(struct command *cmd,
@@ -709,7 +709,6 @@ static bool new_missed_channel_account(struct command *cmd,
 				       const char *buf,
 				       const jsmntok_t *result,
 				       struct account *acct,
-				       const char *currency,
 				       u64 timestamp)
 {
 	struct chain_event *chain_ev;
@@ -762,7 +761,6 @@ static bool new_missed_channel_account(struct command *cmd,
 		ok = amount_msat_add(&chain_ev->output_value,
 				     amt, remote_amt);
 		assert(ok);
-		chain_ev->currency = tal_strdup(chain_ev, currency);
 		chain_ev->origin_acct = NULL;
 		/* 2s before the channel opened, minimum */
 		chain_ev->timestamp = timestamp - 2;
@@ -821,7 +819,6 @@ static bool new_missed_channel_account(struct command *cmd,
 						    push_credit,
 						    push_debit,
 						    AMOUNT_MSAT(0),
-						    currency,
 						    NULL, 0,
 						    timestamp - 1);
 			log_channel_event(db, acct, chan_ev);
@@ -905,7 +902,6 @@ static char *msat_find_diff(struct amount_msat balance,
 }
 
 static void log_journal_entry(struct account *acct,
-			      const char *currency,
 			      u64 timestamp,
 			      struct amount_msat credit_diff,
 			      struct amount_msat debit_diff)
@@ -923,7 +919,6 @@ static void log_journal_entry(struct account *acct,
 				    credit_diff,
 				    debit_diff,
 				    AMOUNT_MSAT(0),
-				    currency,
 				    NULL, 0,
 				    timestamp);
 	db_begin_transaction(db);
@@ -959,7 +954,6 @@ static struct command_result *listpeerchannels_multi_done(struct command *cmd,
 
 		if (!new_missed_channel_account(cmd, buf, result,
 					        info->acct,
-					        info->currency,
 					        info->timestamp)) {
 			plugin_log(cmd->plugin, LOG_BROKEN,
 				   "Unable to find account %s in listpeerchannels",
@@ -981,7 +975,6 @@ static struct command_result *listpeerchannels_multi_done(struct command *cmd,
 			plugin_err(cmd->plugin, "%s", err);
 
 		log_journal_entry(info->acct,
-				  info->currency,
 				  info->timestamp - 1,
 				  credit_diff, debit_diff);
 	}
@@ -1068,17 +1061,14 @@ static struct command_result *json_balance_snapshot(struct command *cmd,
 	json_for_each_arr(i, acct_tok, accounts_tok) {
 		struct account *acct;
 		struct amount_msat snap_balance, credit, debit, credit_diff, debit_diff;
-		char *acct_name, *currency;
+		char *acct_name;
 		bool existed;
 
 		err = json_scan(cmd, buf, acct_tok,
 				"{account_id:%"
-				",balance_msat:%"
-				",coin_type:%}",
+				",balance_msat:%}",
 				JSON_SCAN_TAL(tmpctx, json_strdup, &acct_name),
-				JSON_SCAN(json_to_msat, &snap_balance),
-				JSON_SCAN_TAL(tmpctx, json_strdup,
-					      &currency));
+				JSON_SCAN(json_to_msat, &snap_balance));
 		if (err)
 			plugin_err(cmd->plugin,
 				   "`balance_snapshot` payload did not"
@@ -1129,8 +1119,6 @@ static struct command_result *json_balance_snapshot(struct command *cmd,
 			info->acct = tal_steal(info, acct);
 			info->curr_bal = snap_balance;
 			info->timestamp = timestamp_now;
-			info->currency =
-				tal_strdup(info, currency);
 
 			tal_arr_expand(&new_accts, info);
 			continue;
@@ -1155,7 +1143,6 @@ static struct command_result *json_balance_snapshot(struct command *cmd,
 					       credit_diff,
 					       debit_diff,
 					       AMOUNT_MSAT(0),
-					       currency,
 					       NULL, 0,
 					       timestamp);
 
@@ -1372,7 +1359,6 @@ listpeerchannels_done(struct command *cmd,
 
 	if (new_missed_channel_account(cmd, buf, result,
 					info->acct,
-					info->ev->currency,
 					info->ev->timestamp)) {
 		db_begin_transaction(db);
 		account_get_credit_debit(cmd->plugin, db, info->acct->name,
@@ -1389,7 +1375,6 @@ listpeerchannels_done(struct command *cmd,
 			plugin_err(cmd->plugin, "%s", err);
 
 		log_journal_entry(info->acct,
-				  info->ev->currency,
 				  info->ev->timestamp - 1,
 				  credit_diff, debit_diff);
 	} else
@@ -1509,7 +1494,6 @@ parse_and_log_chain_move(struct command *cmd,
 
 	e->credit = credit;
 	e->debit = debit;
-	e->currency = tal_steal(e, coin_type);
 	e->timestamp = timestamp;
 	e->tag = mvt_tag_str(tags[0]);
 	e->desc = tal_steal(e, desc);
@@ -1671,7 +1655,6 @@ parse_and_log_channel_move(struct command *cmd,
 
 	e->credit = credit;
 	e->debit = debit;
-	e->currency = tal_steal(e, coin_type);
 	e->timestamp = timestamp;
 	e->tag = mvt_tag_str(tags[0]);
 	e->desc = tal_steal(e, desc);
@@ -1747,15 +1730,13 @@ static struct command_result *json_utxo_deposit(struct command *cmd, const char
 			",transfer_from:%"
 			",outpoint:%"
 			",amount_msat:%"
-			",coin_type:%"
 			",timestamp:%"
 			",blockheight:%"
 			"}}}",
 			JSON_SCAN_TAL(tmpctx, json_strdup, &ev->acct_name),
 			JSON_SCAN_TAL(tmpctx, json_strdup, &ev->origin_acct),
 			JSON_SCAN(json_to_outpoint, &ev->outpoint),
 			JSON_SCAN(json_to_msat, &ev->credit),
-			JSON_SCAN_TAL(tmpctx, json_strdup, &ev->currency),
 			JSON_SCAN(json_to_u64, &ev->timestamp),
 			JSON_SCAN(json_to_u32, &ev->blockheight));
 
@@ -1824,15 +1805,13 @@ static struct command_result *json_utxo_spend(struct command *cmd, const char *b
 			",outpoint:%"
 			",spending_txid:%"
 			",amount_msat:%"
-			",coin_type:%"
 			",timestamp:%"
 			",blockheight:%"
 			"}}}",
 			JSON_SCAN_TAL(tmpctx, json_strdup, &acct_name),
 			JSON_SCAN(json_to_outpoint, &ev->outpoint),
 			JSON_SCAN(json_to_txid, ev->spending_txid),
 			JSON_SCAN(json_to_msat, &ev->debit),
-			JSON_SCAN_TAL(tmpctx, json_strdup, &ev->currency),
 			JSON_SCAN(json_to_u64, &ev->timestamp),
 			JSON_SCAN(json_to_u32, &ev->blockheight));
 

plugins/bkpr/chain_event.c

@@ -13,7 +13,7 @@ void json_add_chain_event(struct json_stream *out, struct chain_event *ev)
 	json_add_string(out, "tag", ev->tag);
 	json_add_amount_msat(out, "credit_msat", ev->credit);
 	json_add_amount_msat(out, "debit_msat", ev->debit);
-	json_add_string(out, "currency", ev->currency);
+	json_add_string(out, "currency", chainparams->lightning_hrp);
 	json_add_outpoint(out, "outpoint", &ev->outpoint);
 
 	if (ev->spending_txid)

plugins/bkpr/chain_event.h

@@ -47,9 +47,6 @@ struct chain_event {
 	/* Total 'amount' of output on this chain event */
 	struct amount_msat output_value;
 
-	/* What token are the credit/debits? */
-	const char *currency;
-
 	/* What time did the event happen */
 	u64 timestamp;
 

plugins/bkpr/channel_event.c

@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include <bitcoin/chainparams.h>
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/tal/str/str.h>
 #include <common/amount.h>
@@ -11,7 +12,6 @@ struct channel_event *new_channel_event(const tal_t *ctx,
 					struct amount_msat credit,
 					struct amount_msat debit,
 					struct amount_msat fees,
-					const char *currency,
 					struct sha256 *payment_id STEALS,
 					u32 part_id,
 					u64 timestamp)
@@ -22,7 +22,6 @@ struct channel_event *new_channel_event(const tal_t *ctx,
 	ev->credit = credit;
 	ev->debit = debit;
 	ev->fees = fees;
-	ev->currency = tal_strdup(ev, currency);
 	ev->payment_id = tal_steal(ev, payment_id);
 	ev->part_id = part_id;
 	ev->timestamp = timestamp;
@@ -43,7 +42,7 @@ void json_add_channel_event(struct json_stream *out,
 	json_add_amount_msat(out, "debit_msat", ev->debit);
 	if (!amount_msat_is_zero(ev->fees))
 		json_add_amount_msat(out, "fees_msat", ev->fees);
-	json_add_string(out, "currency", ev->currency);
+	json_add_string(out, "currency", chainparams->lightning_hrp);
 	if (ev->payment_id) {
 		json_add_sha256(out, "payment_id", ev->payment_id);
 		json_add_u32(out, "part_id", ev->part_id);

plugins/bkpr/channel_event.h

@@ -32,9 +32,6 @@ struct channel_event {
 	/* Total 'fees' related to this channel event */
 	struct amount_msat fees;
 
-	/* What token are the credit/debits? */
-	const char *currency;
-
 	/* Payment identifier (typically the preimage hash) */
 	struct sha256 *payment_id;
 
@@ -56,7 +53,6 @@ struct channel_event *new_channel_event(const tal_t *ctx,
 					struct amount_msat credit,
 					struct amount_msat debit,
 					struct amount_msat fees,
-					const char *currency,
 					struct sha256 *payment_id STEALS,
 					u32 part_id,
 					u64 timestamp);