treturn dict in get_addr_utxo - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 332c5d41e604e3ab75eca0cf6ebf6ac1d4bcc1d6
DIR parent 9aa3f2d9e29d9c0d4cec7336c6a2140bad8b77c2
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 7 Oct 2017 12:52:52 +0200
return dict in get_addr_utxo
Diffstat:
M lib/wallet.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -489,7 +489,7 @@ class Abstract_Wallet(PrintError):
coins, spent = self.get_addr_io(address)
for txi in spent:
coins.pop(txi)
- out = []
+ out = {}
for txo, v in coins.items():
tx_height, value, is_cb = v
prevout_hash, prevout_n = txo.split(':')
t@@ -501,7 +501,7 @@ class Abstract_Wallet(PrintError):
'height':tx_height,
'coinbase':is_cb
}
- out.append(x)
+ out[txo] = x
return out
# return the total amount ever received by an address
t@@ -539,7 +539,7 @@ class Abstract_Wallet(PrintError):
domain = set(domain) - self.frozen_addresses
for addr in domain:
utxos = self.get_addr_utxo(addr)
- for x in utxos:
+ for x in utxos.values():
if confirmed_only and x['height'] <= 0:
continue
if mature and x['coinbase'] and x['height'] + COINBASE_MATURITY > self.get_local_height():
t@@ -1061,10 +1061,8 @@ class Abstract_Wallet(PrintError):
else:
return
coins = self.get_addr_utxo(address)
- for item in coins:
- if item['prevout_hash'] == txid and item['prevout_n'] == i:
- break
- else:
+ item = coins.get(txid+':%d'%i)
+ if not item:
return
self.add_input_info(item)
inputs = [item]