From 9589ac6d023446aaeab2d3306816e94a8e4492a0 Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Fri, 22 Mar 2019 03:03:48 -0400
Subject: [PATCH] include tx in db get_txos()

---
 torba/client/basedatabase.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/torba/client/basedatabase.py b/torba/client/basedatabase.py
index ac4c252b2..c36626e53 100644
--- a/torba/client/basedatabase.py
+++ b/torba/client/basedatabase.py
@@ -444,19 +444,16 @@ class BaseDatabase(SQLiteMixin):
         if 'order_by' not in constraints:
             constraints['order_by'] = ["tx.height=0 DESC", "tx.height DESC", "tx.position DESC"]
         rows = await self.select_txos(
-            "amount, script, txid, tx.height, txo.position, chain, account", **constraints
+            "raw, txo.position, chain, account", **constraints
         )
-        output_class = self.ledger.transaction_class.output_class
-        return [
-            output_class(
-                amount=row[0],
-                script=output_class.script_class(row[1]),
-                tx_ref=TXRefImmutable.from_id(row[2], row[3]),
-                position=row[4],
-                is_change=row[5] == 1,
-                is_my_account=row[6] == my_account
-            ) for row in rows
-        ]
+        txos = []
+        for row in rows:
+            tx = self.ledger.transaction_class(row[0])
+            txo = tx.outputs[row[1]]
+            txo.is_change = row[2] == 1
+            txo.is_my_account = row[3] == my_account
+            txos.append(txo)
+        return txos
 
     async def get_txo_count(self, **constraints):
         constraints.pop('offset', None)