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

wallet: Retrieve transaction annotations when listing transactions

Browse Source 
This triple join should be efficient to read, and to process. We have a
one-to-many (tx-to-annotations), followed by a
one-to-one (annotation-to-channel) join, so we are limited to annotations x
transactions results.
This commit is contained in:
Christian Decker
2019-10-02 19:36:28 +02:00
committed by neil saitug
parent ddae604f3d
commit d981b58234
3 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wallet/wallet.h
View File

@@ -219,6 +219,11 @@ enum wallet_payment_status {
PAYMENT_FAILED = 2
};
struct tx_annotation {
enum wallet_tx_type type;
struct short_channel_id channel;
};
static inline enum wallet_payment_status wallet_payment_status_in_db(enum wallet_payment_status w)
{
switch (w) {
@@ -295,8 +300,17 @@ struct wallet_transaction {
u32 blockheight;
u32 txindex;
u8 *rawtx;
enum wallet_tx_type type;
u64 channel_id;
/* Fully parsed transaction */
const struct bitcoin_tx *tx;
struct tx_annotation annotation;
/* tal_arr containing the annotation types, if any, for the respective
* inputs and outputs. 0 if there are no annotations for the
* element. */
struct tx_annotation *input_annotations;
struct tx_annotation *output_annotations;
};
/**
@@ -1179,7 +1193,7 @@ void free_unreleased_txs(struct wallet *w);
*
* @param ctx: allocation context for the returned list
* @param wallet: Wallet to load from.
* @return A tal_arr of wallet transactions
* @return A tal_arr of wallet annotated transactions
*/
struct wallet_transaction *wallet_transactions_get(struct wallet *w, const tal_t *ctx);