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

Fix BitcoinCoreWallet's UTXO selection.
ghtdak · Jul 4, 2015 · 764768e · 764768e
2 parents 37d0d6f + 6f4b4ec
commit 764768e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/common.py b/lib/common.py
@@ -323,7 +323,7 @@ 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'],
 				'value': int(Decimal(str(u['amount'])) * Decimal('1e8'))}