move freeze and prioritize functions into wallet class
This commit is contained in:
parent
e463968da3
commit
34be852061
30
electrum
30
electrum
|
@ -505,37 +505,17 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
elif cmd == 'freeze':
|
elif cmd == 'freeze':
|
||||||
addr = args[1]
|
addr = args[1]
|
||||||
if addr in self.wallet.all_addresses() and addr not in self.wallet.frozen_addresses:
|
print self.wallet.freeze(addr)
|
||||||
self.wallet.frozen_addresses.append(addr)
|
|
||||||
self.wallet.save()
|
|
||||||
print True
|
|
||||||
else:
|
|
||||||
print False
|
|
||||||
|
|
||||||
elif cmd == 'unfreeze':
|
elif cmd == 'unfreeze':
|
||||||
addr = args[1]
|
addr = args[1]
|
||||||
if addr in self.wallet.all_addresses() and addr in self.wallet.frozen_addresses:
|
print self.wallet.unfreeze(addr)
|
||||||
self.wallet.frozen_addresses.remove(addr)
|
|
||||||
self.wallet.save()
|
|
||||||
print True
|
|
||||||
else:
|
|
||||||
print False
|
|
||||||
|
|
||||||
elif cmd == 'prioritize':
|
elif cmd == 'prioritize':
|
||||||
addr = args[1]
|
addr = args[1]
|
||||||
if addr in self.wallet.all_addresses() and addr not in self.wallet.frozen_addresses:
|
print self.wallet.prioritize(addr)
|
||||||
self.wallet.prioritized_addresses.append(addr)
|
|
||||||
self.wallet.save()
|
|
||||||
print True
|
|
||||||
else:
|
|
||||||
print False
|
|
||||||
|
|
||||||
elif cmd == 'unprioritize':
|
elif cmd == 'unprioritize':
|
||||||
addr = args[1]
|
addr = args[1]
|
||||||
if addr in self.wallet.all_addresses() and addr in self.wallet.frozen_addresses:
|
print self.wallet.unprioritize(addr)
|
||||||
self.wallet.prioritized_addresses.remove(addr)
|
|
||||||
self.wallet.save()
|
|
||||||
print True
|
|
||||||
else:
|
|
||||||
print False
|
|
||||||
|
|
||||||
|
|
|
@ -547,10 +547,9 @@ class ElectrumWindow(QMainWindow):
|
||||||
addr = self.get_current_addr(True)
|
addr = self.get_current_addr(True)
|
||||||
if not addr: return
|
if not addr: return
|
||||||
if addr in self.wallet.frozen_addresses:
|
if addr in self.wallet.frozen_addresses:
|
||||||
self.wallet.frozen_addresses.remove(addr)
|
self.wallet.unfreeze(addr)
|
||||||
else:
|
else:
|
||||||
self.wallet.frozen_addresses.append(addr)
|
self.wallet.freeze(addr)
|
||||||
self.wallet.save()
|
|
||||||
self.update_receive_tab()
|
self.update_receive_tab()
|
||||||
|
|
||||||
self.freezeButton = b = EnterButton(_("Freeze"), toggle_freeze)
|
self.freezeButton = b = EnterButton(_("Freeze"), toggle_freeze)
|
||||||
|
@ -560,10 +559,9 @@ class ElectrumWindow(QMainWindow):
|
||||||
addr = self.get_current_addr(True)
|
addr = self.get_current_addr(True)
|
||||||
if not addr: return
|
if not addr: return
|
||||||
if addr in self.wallet.prioritized_addresses:
|
if addr in self.wallet.prioritized_addresses:
|
||||||
self.wallet.prioritized_addresses.remove(addr)
|
self.wallet.unprioritize(addr)
|
||||||
else:
|
else:
|
||||||
self.wallet.prioritized_addresses.append(addr)
|
self.wallet.prioritize(addr)
|
||||||
self.wallet.save()
|
|
||||||
self.update_receive_tab()
|
self.update_receive_tab()
|
||||||
|
|
||||||
self.prioritizeButton = b = EnterButton(_("Prioritize"), toggle_priority)
|
self.prioritizeButton = b = EnterButton(_("Prioritize"), toggle_priority)
|
||||||
|
|
|
@ -995,5 +995,34 @@ class Wallet:
|
||||||
self.interface.subscribe(self.all_addresses())
|
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
|
||||||
|
|
Loading…
Reference in New Issue