From 68b9ded24aff5a1b2a6ff593fd58755b1ddf55d6 Mon Sep 17 00:00:00 2001
From: Michael Schmoock <michael@schmoock.net>
Date: Mon, 18 Nov 2019 09:56:12 +0100
Subject: [PATCH] fix: listtx set txindex only if blockheight is known

---
 wallet/wallet.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/wallet/wallet.c b/wallet/wallet.c
index c69d161bd..06d1a0738 100644
--- a/wallet/wallet.c
+++ b/wallet/wallet.c
@@ -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