perform check_new_tx inside add_transaction
This commit is contained in:
parent
8ab6529298
commit
21bff48630
|
@ -193,16 +193,11 @@ class Wallet:
|
||||||
self.tx_event = threading.Event()
|
self.tx_event = threading.Event()
|
||||||
|
|
||||||
for tx_hash, tx in self.transactions.items():
|
for tx_hash, tx in self.transactions.items():
|
||||||
if self.check_new_tx(tx_hash, tx):
|
|
||||||
self.update_tx_outputs(tx_hash)
|
self.update_tx_outputs(tx_hash)
|
||||||
else:
|
|
||||||
print_error("unreferenced tx", tx_hash)
|
|
||||||
self.transactions.pop(tx_hash)
|
|
||||||
|
|
||||||
|
|
||||||
def add_transaction(self, tx):
|
def add_transaction(self, tx):
|
||||||
h = tx.hash()
|
h = tx.hash()
|
||||||
self.transactions[h] = tx
|
|
||||||
# find the address corresponding to pay-to-pubkey inputs
|
# find the address corresponding to pay-to-pubkey inputs
|
||||||
tx.add_extra_addresses(self.transactions)
|
tx.add_extra_addresses(self.transactions)
|
||||||
for o in tx.d.get('outputs'):
|
for o in tx.d.get('outputs'):
|
||||||
|
@ -210,6 +205,14 @@ class Wallet:
|
||||||
for tx2 in self.transactions.values():
|
for tx2 in self.transactions.values():
|
||||||
tx2.add_extra_addresses({h:tx})
|
tx2.add_extra_addresses({h:tx})
|
||||||
|
|
||||||
|
if self.check_new_tx(h, tx):
|
||||||
|
self.transactions[h] = tx
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
print_error("unreferenced tx", tx_hash)
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def set_up_to_date(self,b):
|
def set_up_to_date(self,b):
|
||||||
with self.lock: self.up_to_date = b
|
with self.lock: self.up_to_date = b
|
||||||
|
@ -1016,13 +1019,13 @@ class Wallet:
|
||||||
|
|
||||||
|
|
||||||
def receive_tx_callback(self, tx_hash, tx, tx_height):
|
def receive_tx_callback(self, tx_hash, tx, tx_height):
|
||||||
if not self.check_new_tx(tx_hash, tx):
|
|
||||||
|
with self.transaction_lock:
|
||||||
|
if not self.add_transaction(tx):
|
||||||
# may happen due to pruning
|
# may happen due to pruning
|
||||||
print_error("received transaction that is no longer referenced in history", tx_hash)
|
print_error("received transaction that is no longer referenced in history", tx_hash)
|
||||||
return
|
return
|
||||||
|
|
||||||
with self.transaction_lock:
|
|
||||||
self.add_transaction(tx)
|
|
||||||
self.interface.pending_transactions_for_notifications.append(tx)
|
self.interface.pending_transactions_for_notifications.append(tx)
|
||||||
self.save_transactions()
|
self.save_transactions()
|
||||||
if self.verifier and tx_height>0:
|
if self.verifier and tx_height>0:
|
||||||
|
@ -1334,6 +1337,7 @@ class Wallet:
|
||||||
# 2 check that referencing addresses are in the tx
|
# 2 check that referencing addresses are in the tx
|
||||||
for addr in addresses:
|
for addr in addresses:
|
||||||
if not tx.has_address(addr):
|
if not tx.has_address(addr):
|
||||||
|
print "z", addr, tx.inputs
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
Loading…
Reference in New Issue