Merge pull request JoinMarket-Org#119 from domob1812/fix-rpcwallet-from

Fix BitcoinCoreWallet's UTXO selection.
ghtdak · Jul 4, 2015 · 4454ee2 · 4454ee2
2 parents 5b9d842 + 0ed7345
commit 4454ee2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/common.py b/lib/common.py
@@ -362,8 +362,8 @@ def get_utxos_by_mixdepth(self):
         for u in unspent_list:
             if not u['spendable']:
                 continue
-            if self.fromaccount and 'account' in u and u['account'
-                                               ] != self.fromaccount:
+            if self.fromaccount and (
+                ('account' not in u) or u['account'] != self.fromaccount):
                 continue
             result[0][u['txid'] + ':' + str(u['vout'])] = {
                 'address': u['address'],