AaronFiore/electrum
1
0
Fork 0
Code Activity

json_db: add missing lock

Browse Source
This commit is contained in:
ThomasV
2019-02-28 16:11:19 +01:00
parent 943d1ba8f2
commit 2fd4cdcaa9
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/json_db.py
View File

@@ -105,6 +105,7 @@ class JsonDB(PrintError):
def commit(self): def commit(self):
pass pass
@locked
def dump(self): def dump(self):
return json.dumps(self.data, indent=4, sort_keys=True, cls=util.MyEncoder) return json.dumps(self.data, indent=4, sort_keys=True, cls=util.MyEncoder)
@@ -659,19 +660,16 @@ class JsonDB(PrintError):
self.history = self.get_data_ref('addr_history') # address -> list(txid, height) self.history = self.get_data_ref('addr_history') # address -> list(txid, height)
self.verified_tx = self.get_data_ref('verified_tx3') # txid -> TxMinedInfo. Access with self.lock. self.verified_tx = self.get_data_ref('verified_tx3') # txid -> TxMinedInfo. Access with self.lock.
self.tx_fees = self.get_data_ref('tx_fees') self.tx_fees = self.get_data_ref('tx_fees')
# convert list to set # convert list to set
for t in self.txi, self.txo: for t in self.txi, self.txo:
for d in t.values(): for d in t.values():
for addr, lst in d.items(): for addr, lst in d.items():
d[addr] = set([tuple(x) for x in lst]) d[addr] = set([tuple(x) for x in lst])
# remove unreferenced tx # remove unreferenced tx
for tx_hash in list(self.transactions.keys()): for tx_hash in list(self.transactions.keys()):
if not self.get_txi(tx_hash) and not self.get_txo(tx_hash): if not self.get_txi(tx_hash) and not self.get_txo(tx_hash):
self.print_error("removing unreferenced tx", tx_hash) self.print_error("removing unreferenced tx", tx_hash)
self.transactions.pop(tx_hash) self.transactions.pop(tx_hash)
# remove unreferenced outpoints # remove unreferenced outpoints
for prevout_hash in self.spent_outpoints.keys(): for prevout_hash in self.spent_outpoints.keys():
d = self.spent_outpoints[prevout_hash] d = self.spent_outpoints[prevout_hash]