BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify loops

This commit is contained in:
ecdsa 2013-03-24 12:20:13 +01:00
parent 7c4fa714d2
commit 01d43719a6
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/wallet.py
View File

@ -429,12 +429,10 @@ class Wallet:
def update_tx_outputs(self, tx_hash): def update_tx_outputs(self, tx_hash):
tx = self.transactions.get(tx_hash) tx = self.transactions.get(tx_hash)
i = 0
for item in tx.outputs: for i, (addr, value) in enumerate(tx.outputs):
addr, value = item
key = tx_hash+ ':%d'%i key = tx_hash+ ':%d'%i
self.prevout_values[key] = value self.prevout_values[key] = value
i += 1
for item in tx.inputs: for item in tx.inputs:
if self.is_mine(item.get('address')): if self.is_mine(item.get('address')):
@ -452,13 +450,11 @@ class Wallet:
for tx_hash, tx_height in h: for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash) tx = self.transactions.get(tx_hash)
if not tx: continue if not tx: continue
i = 0
for item in tx.outputs: for i, (addr, value) in enumerate(tx.outputs):
addr, value = item
if addr == address: if addr == address:
key = tx_hash + ':%d'%i key = tx_hash + ':%d'%i
received_coins.append(key) received_coins.append(key)
i +=1
for tx_hash, tx_height in h: for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash) tx = self.transactions.get(tx_hash)
@ -473,13 +469,10 @@ class Wallet:
if key in received_coins: if key in received_coins:
v -= value v -= value
i = 0 for i, (addr, value) in enumerate(tx.outputs):
for item in tx.outputs:
addr, value = item
key = tx_hash + ':%d'%i key = tx_hash + ':%d'%i
if addr == address: if addr == address:
v += value v += value
i += 1
if tx_height: if tx_height:
c += v c += v
@ -651,7 +644,7 @@ class Wallet:
c, u = self.get_balance() c, u = self.get_balance()
if balance != c+u: if balance != c+u:
v_str = format_satoshis( c+u - balance, True, self.num_zeros) #v_str = format_satoshis( c+u - balance, True, self.num_zeros)
result.append( ('', 1000, 0, c+u-balance, None, c+u-balance, None ) ) result.append( ('', 1000, 0, c+u-balance, None, c+u-balance, None ) )
balance = c + u - balance balance = c + u - balance
@ -909,10 +902,10 @@ class Wallet:
ext_requests.append( ('blockchain.address.get_history', [_addr]) ) ext_requests.append( ('blockchain.address.get_history', [_addr]) )
ext_h = self.interface.synchronous_get(ext_requests) ext_h = self.interface.synchronous_get(ext_requests)
print_error("sync:", ext_requests, ext_h)
height = None height = None
for h in ext_h: for h in ext_h:
if h == ['*']: continue if h == ['*']: continue
print_error(h)
for item in h: for item in h:
if item.get('tx_hash') == tx_hash: if item.get('tx_hash') == tx_hash:
height = item.get('height') height = item.get('height')