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

move freeze and prioritize functions into wallet class

This commit is contained in:
thomasv 2012-06-07 11:18:11 +02:00
parent e463968da3
commit 34be852061
3 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
electrum
View File

@ -505,37 +505,17 @@ if __name__ == '__main__':
elif cmd == 'freeze':
addr = args[1]
if addr in self.wallet.all_addresses() and addr not in self.wallet.frozen_addresses:
self.wallet.frozen_addresses.append(addr)
self.wallet.save()
print True
else:
print False
print self.wallet.freeze(addr)
elif cmd == 'unfreeze':
addr = args[1]
if addr in self.wallet.all_addresses() and addr in self.wallet.frozen_addresses:
self.wallet.frozen_addresses.remove(addr)
self.wallet.save()
print True
else:
print False
print self.wallet.unfreeze(addr)
elif cmd == 'prioritize':
addr = args[1]
if addr in self.wallet.all_addresses() and addr not in self.wallet.frozen_addresses:
self.wallet.prioritized_addresses.append(addr)
self.wallet.save()
print True
else:
print False
print self.wallet.prioritize(addr)
elif cmd == 'unprioritize':
addr = args[1]
if addr in self.wallet.all_addresses() and addr in self.wallet.frozen_addresses:
self.wallet.prioritized_addresses.remove(addr)
self.wallet.save()
print True
else:
print False
print self.wallet.unprioritize(addr)

10
lib/gui_qt.py
View File

@ -547,10 +547,9 @@ class ElectrumWindow(QMainWindow):
addr = self.get_current_addr(True)
if not addr: return
if addr in self.wallet.frozen_addresses:
self.wallet.frozen_addresses.remove(addr)
self.wallet.unfreeze(addr)
else:
self.wallet.frozen_addresses.append(addr)
self.wallet.save()
self.wallet.freeze(addr)
self.update_receive_tab()
self.freezeButton = b = EnterButton(_("Freeze"), toggle_freeze)
@ -560,10 +559,9 @@ class ElectrumWindow(QMainWindow):
addr = self.get_current_addr(True)
if not addr: return
if addr in self.wallet.prioritized_addresses:
self.wallet.prioritized_addresses.remove(addr)
self.wallet.unprioritize(addr)
else:
self.wallet.prioritized_addresses.append(addr)
self.wallet.save()
self.wallet.prioritize(addr)
self.update_receive_tab()
self.prioritizeButton = b = EnterButton(_("Prioritize"), toggle_priority)

29
lib/wallet.py
View File

@ -995,5 +995,34 @@ class Wallet:
self.interface.subscribe(self.all_addresses())
def freeze(self,addr):
if addr in self.all_addresses() and addr not in self.frozen_addresses:
self.frozen_addresses.append(addr)
self.save()
return True
else:
return False
def unfreeze(self,addr):
if addr in self.all_addresses() and addr in self.frozen_addresses:
self.frozen_addresses.remove(addr)
self.save()
return True
else:
return False
def prioritize(self,addr):
if addr in self.all_addresses() and addr not in self.frozen_addresses and addr not in self.prioritized_addresses:
self.prioritized_addresses.append(addr)
self.save()
return True
else:
return False
def unprioritize(self,addr):
if addr in self.all_addresses() and addr in self.prioritized_addresses:
self.prioritized_addresses.remove(addr)
self.save()
return True
else:
return False