zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove wallet.get_transactions() 

Because references are returned, it's not threadsafe as ThomasV
pointed out.
master
Neil Booth 11 years ago
parent
a47881d72b
commit
37c3cce329
2 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      lib/verifier.py
  2. 64
      lib/wallet.py

32
lib/verifier.py
Unescape View File

@ -36,19 +36,14 @@ class SPV(util.DaemonThread):
self.queue = Queue.Queue()
def run(self):
requested_merkle = []
requested_merkle = set()
while self.is_running():
verified_tx, unverified_tx = self.wallet.get_transactions()
# request missing tx
for tx_hash, tx_height in unverified_tx.items():
if tx_hash not in verified_tx:
# do not request merkle branch before headers are available
if tx_height > self.network.get_local_height():
continue
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
if self.network.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], self.queue.put):
self.print_error('requesting merkle', tx_hash)
requested_merkle.append(tx_hash)
unverified = self.wallet.get_unverified_txs()
for (tx_hash, tx_height) in unverified:
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
if self.network.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], self.queue.put):
self.print_error('requesting merkle', tx_hash)
requested_merkle.add(tx_hash)
try:
r = self.queue.get(timeout=0.1)
except Queue.Empty:
@ -97,12 +92,7 @@ class SPV(util.DaemonThread):
def undo_verifications(self, height):
verified_tx, unverified_tx = self.wallet.get_transactions()
txs = []
for tx_hash, item in verified_tx:
tx_height, timestamp, pos = item
if tx_height >= height:
self.print_error("redoing", tx_hash)
txs.append(tx_hash)
self.merkle_roots.pop(tx_hash, None)
self.wallet.unverify_txs(txs)
tx_hashes = selt.wallet.undo_verifications(height)
for tx_hash in tx_hashes:
self.print_error("redoing", tx_hash)
self.merkle_roots.pop(tx_hash, None)

64
lib/wallet.py
Unescape View File

@ -403,38 +403,48 @@ class Abstract_Wallet(object):
self.storage.put('verified_tx3', self.verified_tx, True)
self.network.trigger_callback('updated')
def unverify_txs(self, txs):
'''Used by the verifier when a reorg has happened'''
def get_unverified_txs(self):
'''Returns a list of tuples (tx_hash, height) that are unverified and not beyond local height'''
txs = []
with self.lock:
for tx_hash in txs:
self.verified_tx.pop(tx_hash, None)
def get_transactions(self):
'''Return the verified and unverified tx dicts'''
for tx_hash, tx_height in self.unverified_tx.items():
# do not request merkle branch before headers are available
if tx_hash not in self.verified_tx and tx_height <= self.network.get_local_height():
txs.append((tx_hash, tx_height))
return txs
def undo_verifications(self, height):
'''Used by the verifier when a reorg has happened'''
txs = []
with self.lock:
return self.verified_tx, self.unverified_tx
for tx_hash, item in self.verified_tx:
tx_height, timestamp, pos = item
if tx_height >= height:
self.verified_tx.pop(tx_hash, None)
txs.append(tx_hash)
return txs
def get_confirmations(self, tx):
""" return the number of confirmations of a monitored transaction. """
verified_tx, unverified_tx = self.get_transactions()
if tx in verified_tx:
height, timestamp, pos = verified_tx[tx]
conf = (self.network.get_local_height() - height + 1)
if conf <= 0: timestamp = None
elif tx in unverified_tx:
conf = -1
timestamp = None
else:
conf = 0
timestamp = None
with self.lock:
if tx in self.verified_tx:
height, timestamp, pos = self.verified_tx[tx]
conf = (self.network.get_local_height() - height + 1)
if conf <= 0: timestamp = None
elif tx in self.unverified_tx:
conf = -1
timestamp = None
else:
conf = 0
timestamp = None
return conf, timestamp
def get_txpos(self, tx_hash):
"return position, even if the tx is unverified"
verified_tx, unverified_tx = self.get_transactions()
x = verified_tx.get(tx_hash)
y = unverified_tx.get(tx_hash)
with self.lock:
x = self.verified_tx.get(tx_hash)
y = self.unverified_tx.get(tx_hash)
if x:
height, timestamp, pos = x
return height, pos
@ -1021,8 +1031,8 @@ class Abstract_Wallet(object):
self.add_unverified_tx (tx_hash, tx_height)
# if we are on a pruning server, remove unverified transactions
verified_tx, unverified_tx = self.get_transactions()
vr = verified_tx.keys() + unverified_tx.keys()
with self.lock:
vr = self.verified_tx.keys() + self.unverified_tx.keys()
for tx_hash in self.transactions.keys():
if tx_hash not in vr:
print_error("removing transaction", tx_hash)
@ -1038,7 +1048,6 @@ class Abstract_Wallet(object):
return False
# check that we are not "orphaning" a transaction
verified_tx, unverified_tx = self.get_transactions()
old_hist = self.history.get(addr,[])
for tx_hash, height in old_hist:
if tx_hash in map(lambda x:x[0], hist):
@ -1058,8 +1067,9 @@ class Abstract_Wallet(object):
if not tx: continue
# already verified?
if tx_hash in verified_tx:
continue
with self.lock:
if tx_hash in self.verified_tx:
continue
# unconfirmed tx
print_error("new history is orphaning transaction:", tx_hash)
# check that all outputs are not mine, request histories

Write Preview
Loading…
Cancel
Save