tsolve deadlock during restore - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 39a85767a3554df5ab328de1e13a8133185bebd7
DIR parent 5bb441ce3768f9daacb2453067df90fecba85595
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 4 Nov 2012 20:53:27 +0100
solve deadlock during restore
Diffstat:
M electrum | 11 +++++------
M lib/interface.py | 2 +-
M lib/verifier.py | 8 ++++++++
M lib/wallet.py | 31 ++++++++++++++-----------------
4 files changed, 28 insertions(+), 24 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -193,6 +193,10 @@ if __name__ == '__main__':
gui = gui.ElectrumGui(wallet, config)
interface.register_callback('peers', gui.server_list_changed)
+
+ verifier = WalletVerifier(interface, config)
+ wallet.set_verifier(verifier)
+
try:
found = config.wallet_file_exists
if not found:
t@@ -208,12 +212,7 @@ if __name__ == '__main__':
if not found:
exit(1)
- verifier = WalletVerifier(interface, config)
- wallet.set_verifier(verifier)
- if not config.get('disable_spv'):
- verifier.start()
- else:
- print "warning: SPV is disabled"
+ verifier.start()
gui.main(url)
wallet.save()
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -75,7 +75,7 @@ class Interface(threading.Thread):
def queue_json_response(self, c):
# uncomment to debug
- # print_error( "<--",c )
+ print_error( "<--",c )
msg_id = c.get('id')
error = c.get('error')
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -344,3 +344,11 @@ class WalletVerifier(threading.Thread):
new_bits = c + MM * i
return new_bits, new_target
+ def get_timestamp(self, tx_height):
+ if tx_height>0:
+ header = self.read_header(tx_height)
+ timestamp = header.get('timestamp')
+ else:
+ timestamp = 1e12
+ return timestamp
+
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -356,11 +356,12 @@ class Wallet:
def fill_addressbook(self):
for tx_hash, tx in self.transactions.items():
if self.get_tx_value(tx_hash)<0:
- for i in tx['outputs']:
- if not self.is_mine(i) and i not in self.addressbook:
- self.addressbook.append(i)
+ for o in tx['outputs']:
+ addr = o.get('address')
+ if not self.is_mine(addr) and addr not in self.addressbook:
+ self.addressbook.append(addr)
# redo labels
- self.update_tx_labels()
+ # self.update_tx_labels()
def get_address_flags(self, addr):
t@@ -537,9 +538,9 @@ class Wallet:
def receive_tx_callback(self, tx_hash, d):
#print "updating history for", addr
- with self.lock:
- self.transactions[tx_hash] = d
- self.update_tx_outputs(tx_hash)
+ #with self.lock:
+ self.transactions[tx_hash] = d
+ self.update_tx_outputs(tx_hash)
if self.verifier: self.verifier.add(tx_hash)
self.save()
t@@ -869,13 +870,7 @@ class Wallet:
self.verifier.add(tx_hash)
- def set_tx_timestamp(self, tx_hash, tx_height):
- if tx_height>0:
- header = self.verifier.read_header(tx_height)
- timestamp = header.get('timestamp')
- else:
- timestamp = 1e12
-
+ def set_tx_timestamp(self, tx_hash, timestamp):
with self.lock:
self.transactions[tx_hash]['timestamp'] = timestamp
t@@ -957,7 +952,8 @@ class WalletSynchronizer(threading.Thread):
# 2. get a response
r = self.interface.get_response('synchronizer')
- if not r: continue
+ if not r:
+ continue
# 3. handle response
method = r['method']
t@@ -982,14 +978,14 @@ class WalletSynchronizer(threading.Thread):
if (tx_hash, tx_height) not in requested_tx and (tx_hash, tx_height) not in missing_tx:
missing_tx.append( (tx_hash, tx_height) )
else:
- self.wallet.set_tx_timestamp(tx_hash, tx_height)
+ timestamp = self.wallet.verifier.get_timestamp(tx_height)
+ self.wallet.set_tx_timestamp(tx_hash, timestamp)
elif method == 'blockchain.transaction.get':
tx_hash = params[0]
tx_height = params[1]
d = self.deserialize_tx(tx_hash, tx_height, result)
self.wallet.receive_tx_callback(tx_hash, d)
- self.wallet.set_tx_timestamp(tx_hash, tx_height)
self.was_updated = True
requested_tx.remove( (tx_hash, tx_height) )
print_error("received tx:", d)
t@@ -1018,5 +1014,6 @@ class WalletSynchronizer(threading.Thread):
vds.write(raw_tx.decode('hex'))
d = deserialize.parse_Transaction(vds)
d['tx_hash'] = tx_hash
+ d['timestamp'] = self.wallet.verifier.get_timestamp(tx_height)
return d