LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: small perf optimisation in add_transaction

Browse source
This commit is contained in:
SomberNight 2018-09-18 02:14:23 +02:00
parent 11bf084a1f
commit c8f82c71c9
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
electrum/address_synchronizer.py
View file

@ -195,7 +195,7 @@ class AddressSynchronizer(PrintError):
if self.synchronizer: if self.synchronizer:
self.synchronizer.add(address) self.synchronizer.add(address)
def get_conflicting_transactions(self, tx): def get_conflicting_transactions(self, tx_hash, tx):
"""Returns a set of transaction hashes from the wallet history that are """Returns a set of transaction hashes from the wallet history that are
directly conflicting with tx, i.e. they have common outpoints being directly conflicting with tx, i.e. they have common outpoints being
spent with tx. If the tx is already in wallet history, that will not be spent with tx. If the tx is already in wallet history, that will not be
@ -214,18 +214,18 @@ class AddressSynchronizer(PrintError):
# this outpoint has already been spent, by spending_tx # this outpoint has already been spent, by spending_tx
assert spending_tx_hash in self.transactions assert spending_tx_hash in self.transactions
conflicting_txns |= {spending_tx_hash} conflicting_txns |= {spending_tx_hash}
txid = tx.txid() if tx_hash in conflicting_txns:
if txid in conflicting_txns:
# this tx is already in history, so it conflicts with itself # this tx is already in history, so it conflicts with itself
if len(conflicting_txns) > 1: if len(conflicting_txns) > 1:
raise Exception('Found conflicting transactions already in wallet history.') raise Exception('Found conflicting transactions already in wallet history.')
conflicting_txns -= {txid} conflicting_txns -= {tx_hash}
return conflicting_txns return conflicting_txns
def add_transaction(self, tx_hash, tx, allow_unrelated=False): def add_transaction(self, tx_hash, tx, allow_unrelated=False):
assert tx_hash, tx_hash assert tx_hash, tx_hash
assert tx, tx assert tx, tx
assert tx.is_complete() assert tx.is_complete()
# assert tx_hash == tx.txid() # disabled as expensive; test done by Synchronizer.
# we need self.transaction_lock but get_tx_height will take self.lock # we need self.transaction_lock but get_tx_height will take self.lock
# so we need to take that too here, to enforce order of locks # so we need to take that too here, to enforce order of locks
with self.lock, self.transaction_lock: with self.lock, self.transaction_lock:
@ -250,7 +250,7 @@ class AddressSynchronizer(PrintError):
# When this method exits, there must NOT be any conflict, so # When this method exits, there must NOT be any conflict, so
# either keep this txn and remove all conflicting (along with dependencies) # either keep this txn and remove all conflicting (along with dependencies)
# or drop this txn # or drop this txn
conflicting_txns = self.get_conflicting_transactions(tx) conflicting_txns = self.get_conflicting_transactions(tx_hash, tx)
if conflicting_txns: if conflicting_txns:
existing_mempool_txn = any( existing_mempool_txn = any(
self.get_tx_height(tx_hash2).height in (TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT) self.get_tx_height(tx_hash2).height in (TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT)