AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: make labels private, and access to need lock

Browse Source 
e.g. labels plugin iterated over wallet.labels on asyncio thread while user could trigger an edit from Qt thread
This commit is contained in:
SomberNight
2020-10-13 18:30:24 +02:00
parent da4f11dbd3
commit 4b6c86ecbe
13 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/text.py
View File

@@ -136,7 +136,7 @@ class ElectrumGui:
else:
time_str = 'unconfirmed'
label = self.wallet.get_label(hist_item.txid)
label = self.wallet.get_label_for_txid(hist_item.txid)
if len(label) > 40:
label = label[0:37] + '...'
self.history.append(format_str % (time_str, label, format_satoshis(hist_item.delta, whitespaces=True),
@@ -177,7 +177,7 @@ class ElectrumGui:
def print_addresses(self):
fmt = "%-35s %-30s"
messages = map(lambda addr: fmt % (addr, self.wallet.labels.get(addr,"")), self.wallet.get_addresses())
messages = map(lambda addr: fmt % (addr, self.wallet.get_label(addr)), self.wallet.get_addresses())
self.print_list(messages, fmt % ("Address", "Label"))
def print_edit_line(self, y, label, text, index, size):
@@ -314,7 +314,7 @@ class ElectrumGui:
elif out == "Edit label":
s = self.get_string(6 + self.pos, 18)
if s:
self.wallet.labels[key] = s
self.wallet.set_label(key, s)
def run_banner_tab(self, c):
self.show_message(repr(c))
@@ -379,7 +379,7 @@ class ElectrumGui:
return
if self.str_description:
self.wallet.labels[tx.txid()] = self.str_description
self.wallet.set_label(tx.txid(), self.str_description)
self.show_message(_("Please wait..."), getchar=False)
try: