AaronFiore/electrum
1
0
Fork 0
Code Activity

change partial txn format: add header. only parse inputs and witness for partial txns.

Browse Source
This commit is contained in:
SomberNight
2018-06-04 19:01:23 +02:00
parent 89040de758
commit a0ba5a7962
5 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/wallet.py
View File

@@ -332,7 +332,7 @@ class Abstract_Wallet(PrintError):
continue
tx = self.transactions.get(tx_hash)
if tx is not None:
self.add_transaction(tx_hash, tx)
self.add_transaction(tx_hash, tx, allow_unrelated=True)
save = True
if save:
self.save_transactions()
@@ -826,7 +826,7 @@ class Abstract_Wallet(PrintError):
conflicting_txns -= {txid}
return conflicting_txns
def add_transaction(self, tx_hash, tx):
def add_transaction(self, tx_hash, tx, allow_unrelated=False):
assert tx_hash, tx_hash
assert tx, tx
assert tx.is_complete()
@@ -839,10 +839,14 @@ class Abstract_Wallet(PrintError):
# being is_mine, as we roll the gap_limit forward
is_coinbase = tx.inputs()[0]['type'] == 'coinbase'
tx_height = self.get_tx_height(tx_hash)[0]
is_mine = any([self.is_mine(txin['address']) for txin in tx.inputs()])
is_for_me = any([self.is_mine(self.get_txout_address(txo)) for txo in tx.outputs()])
if not is_mine and not is_for_me:
raise UnrelatedTransactionException()
if not allow_unrelated:
# note that during sync, if the transactions are not properly sorted,
# it could happen that we think tx is unrelated but actually one of the inputs is is_mine.
# this is the main motivation for allow_unrelated
is_mine = any([self.is_mine(self.get_txin_address(txin)) for txin in tx.inputs()])
is_for_me = any([self.is_mine(self.get_txout_address(txo)) for txo in tx.outputs()])
if not is_mine and not is_for_me:
raise UnrelatedTransactionException()
# Find all conflicting transactions.
# In case of a conflict,
# 1. confirmed > mempool > local
@@ -953,7 +957,7 @@ class Abstract_Wallet(PrintError):
def receive_tx_callback(self, tx_hash, tx, tx_height):
self.add_unverified_tx(tx_hash, tx_height)
self.add_transaction(tx_hash, tx)
self.add_transaction(tx_hash, tx, allow_unrelated=True)
def receive_history_callback(self, addr, hist, tx_fees):
with self.lock:
@@ -974,7 +978,7 @@ class Abstract_Wallet(PrintError):
tx = self.transactions.get(tx_hash)
if tx is None:
continue
self.add_transaction(tx_hash, tx)
self.add_transaction(tx_hash, tx, allow_unrelated=True)
# Store fees
self.tx_fees.update(tx_fees)
@@ -1771,6 +1775,7 @@ class Abstract_Wallet(PrintError):
def get_depending_transactions(self, tx_hash):
"""Returns all (grand-)children of tx_hash in this wallet."""
children = set()
# TODO rewrite this to use self.spent_outpoints
for other_hash, tx in self.transactions.items():
for input in (tx.inputs()):
if input["prevout_hash"] == tx_hash: