tMerge pull request #909 from Tafelpoot/showaccount - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e6317ceca177e6fdf819c389a494eb7242cb1cd0
DIR parent c225795793696c5b5d4a9243ebeb129091229ca5
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Fri, 31 Oct 2014 15:01:22 +0100
Merge pull request #909 from Tafelpoot/showaccount
add account info for internal transfer description
Diffstat:
M lib/wallet.py | 10 ++++++++++
1 file changed, 10 insertions(+), 0 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -635,6 +635,16 @@ class Abstract_Wallet(object):
break
else:
default_label = '(internal)'
+ if len(self.accounts) > 1:
+ # find input account and output account
+ i_addr = tx.inputs[0]["address"]
+ i_acc,_ = self.get_address_index(i_addr)
+ for o_addr in tx.get_output_addresses():
+ o_acc,_ = self.get_address_index(o_addr)
+ if o_acc != i_acc:
+ default_label = '(internal: %s --> %s)'%(self.get_account_name(i_acc),self.get_account_name(o_acc))
+ break
+
else:
for o_addr in tx.get_output_addresses():
if self.is_mine(o_addr) and not self.is_change(o_addr):