AaronFiore/electrum
1
0
Fork 0
Code Activity

proper handling of arg_types. add more options for listaddresses

Browse Source
This commit is contained in:
ThomasV
2015-05-30 18:49:58 +02:00
parent bf98b547e1
commit 92a158b910
3 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/wallet.py
View File

@@ -1013,8 +1013,11 @@ class Abstract_Wallet(object):
self.use_encryption = (new_password != None)
self.storage.put('use_encryption', self.use_encryption,True)
def is_frozen(self, addr):
return addr in self.frozen_addresses
def freeze(self,addr):
if self.is_mine(addr) and addr not in self.frozen_addresses:
if self.is_mine(addr) and self.is_frozen(addr):
self.frozen_addresses.append(addr)
self.storage.put('frozen_addresses', self.frozen_addresses, True)
return True
@@ -1022,7 +1025,7 @@ class Abstract_Wallet(object):
return False
def unfreeze(self,addr):
if self.is_mine(addr) and addr in self.frozen_addresses:
if self.is_mine(addr) and self.is_frozen(addr):
self.frozen_addresses.remove(addr)
self.storage.put('frozen_addresses', self.frozen_addresses, True)
return True
@@ -1148,6 +1151,10 @@ class Abstract_Wallet(object):
c, u, x = self.get_addr_balance(address)
return len(h), len(h) > 0 and c == -u
def is_empty(self, address):
c, u, x = self.get_addr_balance(address)
return c+u+x == 0
def address_is_old(self, address, age_limit=2):
age = -1
h = self.history.get(address, [])