AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'contacts' of github.com:Tafelpoot/electrum into Tafelpoot-contacts

Browse Source
This commit is contained in:
ThomasV
2014-11-24 11:55:57 +01:00
parent 68c7d2e349 218a1ee2f7
commit f2988b657b
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@@ -483,10 +483,10 @@ class Abstract_Wallet(object):
return addr_list
def get_account_from_address(self, addr):
"Returns the account that contains this address, or None"
"Returns the account name that contains this address, or None"
for acc_id in self.accounts: # similar to get_address_index but simpler
if addr in self.get_account_addresses(acc_id):
return self.accounts[acc_id]
return self.get_account_name(acc_id)
return None
def get_account_balance(self, account):