mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

fix: listtx set txindex only if blockheight is known

Browse source
This commit is contained in:
Michael Schmoock 2019-11-18 09:56:12 +01:00 • committed by Christian Decker
parent 6e433e0108
commit 68b9ded24a
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wallet/wallet.c
View file

@ -3461,16 +3461,18 @@ struct wallet_transaction *wallet_transactions_get(struct wallet *w, const tal_t
cur->tx = db_column_tx(txs, stmt, 1);
cur->rawtx = tal_dup_arr(txs, u8, db_column_blob(stmt, 1),
db_column_bytes(stmt, 1), 0);
/* TX may be unconfirmed. */
if (!db_column_is_null(stmt, 2) || !db_column_is_null(stmt, 3)) {
/* assert incomplete information */
assert(!db_column_is_null(stmt, 2) && !db_column_is_null(stmt, 3));
cur->blockheight = db_column_int(stmt, 2);
cur->txindex = db_column_int(stmt, 3);
} else {
cur->blockheight = 0;
cur->txindex = 0;
}
/* TX may be unconfirmed. */
if (!db_column_is_null(stmt, 2)) {
cur->blockheight = db_column_int(stmt, 2);
if (!db_column_is_null(stmt, 3)) {
cur->txindex = db_column_int(stmt, 3);
} else {
cur->txindex = 0;
}
} else {
cur->blockheight = 0;
cur->txindex = 0;
}
if (!db_column_is_null(stmt, 4))
cur->annotation.type = db_column_u64(stmt, 4);
else