AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3936 from SomberNight/fix_3935

Browse Source 
fix: wallet.add_transaction
This commit is contained in:
ThomasV
2018-02-20 20:22:29 +01:00
committed by GitHub
parent febaedcd36 7b3c454542
commit 7578ac6abb
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/wallet.py
View File

@@ -733,7 +733,8 @@ class Abstract_Wallet(PrintError):
def get_conflicting_transactions(self, tx): def get_conflicting_transactions(self, 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. spent with tx. If the tx is already in wallet history, that will not be
reported as a conflict.
""" """
conflicting_txns = set() conflicting_txns = set()
with self.transaction_lock: with self.transaction_lock:
@@ -747,12 +748,20 @@ class Abstract_Wallet(PrintError):
# this outpoint (ser) has already been spent, by spending_tx # this outpoint (ser) 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 txid in conflicting_txns:
# this tx is already in history, so it conflicts with itself
if len(conflicting_txns) > 1:
raise Exception('Found conflicting transactions already in wallet history.')
conflicting_txns -= {txid}
return conflicting_txns return conflicting_txns
def add_transaction(self, tx_hash, tx): def add_transaction(self, tx_hash, tx):
with self.transaction_lock: with self.transaction_lock:
if tx in self.transactions: # NOTE: returning if tx in self.transactions might seem like a good idea
return True # BUT we track is_mine inputs in a txn, and during subsequent calls
# of add_transaction tx, we might learn of more-and-more inputs of
# being is_mine, as we roll the gap_limit forward
is_coinbase = tx.inputs()[0]['type'] == 'coinbase' is_coinbase = tx.inputs()[0]['type'] == 'coinbase'
tx_height = self.get_tx_height(tx_hash)[0] tx_height = self.get_tx_height(tx_hash)[0]
is_mine = any([self.is_mine(txin['address']) for txin in tx.inputs()]) is_mine = any([self.is_mine(txin['address']) for txin in tx.inputs()])
@@ -800,7 +809,6 @@ class Abstract_Wallet(PrintError):
prevout_hash = txi['prevout_hash'] prevout_hash = txi['prevout_hash']
prevout_n = txi['prevout_n'] prevout_n = txi['prevout_n']
ser = prevout_hash + ':%d'%prevout_n ser = prevout_hash + ':%d'%prevout_n
self.spent_outpoints[ser] = tx_hash
# find value from prev output # find value from prev output
if addr and self.is_mine(addr): if addr and self.is_mine(addr):
dd = self.txo.get(prevout_hash, {}) dd = self.txo.get(prevout_hash, {})
@@ -809,6 +817,8 @@ class Abstract_Wallet(PrintError):
if d.get(addr) is None: if d.get(addr) is None:
d[addr] = [] d[addr] = []
d[addr].append((ser, v)) d[addr].append((ser, v))
# we only track is_mine spends
self.spent_outpoints[ser] = tx_hash
break break
else: else:
self.pruned_txo[ser] = tx_hash self.pruned_txo[ser] = tx_hash