From 4a393b5d0e68c9e7121467da52a0f0771a67ff07 Mon Sep 17 00:00:00 2001
From: valued mammal <valuedmammal@protonmail.com>
Date: Thu, 1 Jan 2026 12:24:19 -0500
Subject: [PATCH] fix: Respect nullable columns of tx table

Before, reading the tx_graph ChangeSet might have failed
or returned incorrect data by attempting to decode a column
having a NULL value. This is fixed by introducing a `TxRow`
struct with optional fields and deriving `FromRow` for it.
The `txid` field is currently the only non-nullable column.
Now we only parse a value and update the tx_graph ChangeSet
if the column actually contains a value.
---
 src/async_store.rs | 52 +++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/async_store.rs b/src/async_store.rs
index 7539306..12a661e 100644
--- a/src/async_store.rs
+++ b/src/async_store.rs
@@ -201,24 +201,27 @@ impl Store {
     pub async fn read_tx_graph(&self) -> Result<tx_graph::ChangeSet<ConfirmationBlockTime>, Error> {
         let mut changeset = tx_graph::ChangeSet::default();
 
-        let rows = sqlx::query("SELECT txid, tx, first_seen, last_seen, last_evicted FROM tx")
-            .fetch_all(&self.pool)
-            .await?;
+        let rows: Vec<TxRow> =
+            sqlx::query_as("SELECT txid, tx, first_seen, last_seen, last_evicted FROM tx")
+                .fetch_all(&self.pool)
+                .await?;
         for row in rows {
-            let txid: String = row.get("txid");
-            let txid: Txid = txid.parse()?;
-            let data: Vec<u8> = row.get("tx");
-            let tx: Transaction = consensus::encode::deserialize(&data)?;
-            let first_seen: i64 = row.get("first_seen");
-            let last_seen: i64 = row.get("last_seen");
-            let last_evicted: i64 = row.get("last_evicted");
-
-            changeset.txs.insert(Arc::new(tx));
-            changeset.first_seen.insert(txid, first_seen.try_into()?);
-            changeset.last_seen.insert(txid, last_seen.try_into()?);
-            changeset
-                .last_evicted
-                .insert(txid, last_evicted.try_into()?);
+            let txid: Txid = row.txid.parse()?;
+            if let Some(data) = row.tx {
+                let tx: Transaction = consensus::encode::deserialize(&data)?;
+                changeset.txs.insert(Arc::new(tx));
+            }
+            if let Some(first_seen) = row.first_seen {
+                changeset.first_seen.insert(txid, first_seen.try_into()?);
+            }
+            if let Some(last_seen) = row.last_seen {
+                changeset.last_seen.insert(txid, last_seen.try_into()?);
+            }
+            if let Some(last_evicted) = row.last_evicted {
+                changeset
+                    .last_evicted
+                    .insert(txid, last_evicted.try_into()?);
+            }
         }
 
         let rows = sqlx::query("SELECT txid, vout, value, script FROM txout")
@@ -315,6 +318,21 @@ impl Store {
     }
 }
 
+/// Represents a row in the tx table.
+#[derive(Debug, sqlx::FromRow)]
+struct TxRow {
+    /// Txid
+    txid: String,
+    /// Raw transaction
+    tx: Option<Vec<u8>>,
+    /// First seen
+    first_seen: Option<i64>,
+    /// Last seen
+    last_seen: Option<i64>,
+    /// Last evicted
+    last_evicted: Option<i64>,
+}
+
 #[cfg(test)]
 mod test {
     use super::*;