AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: use get_txin_value in get_wallet_delta

Browse Source
This commit is contained in:
SomberNight
2020-10-16 21:10:32 +02:00
parent 55b5335ebb
commit 8b2eb83238
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
electrum/address_synchronizer.py
View File

@@ -144,11 +144,16 @@ class AddressSynchronizer(Logger):
return tx.outputs()[prevout_n].address return tx.outputs()[prevout_n].address
return None return None
def get_txin_value(self, txin: TxInput) -> Optional[int]: def get_txin_value(self, txin: TxInput, *, address: str = None) -> Optional[int]:
if txin.value_sats() is not None: if txin.value_sats() is not None:
return txin.value_sats() return txin.value_sats()
prevout_hash = txin.prevout.txid.hex() prevout_hash = txin.prevout.txid.hex()
prevout_n = txin.prevout.out_idx prevout_n = txin.prevout.out_idx
if address:
d = self.db.get_txo_addr(prevout_hash, address)
for n, v, cb in d:
if n == txin.prevout.out_idx:
return v
tx = self.db.get_transaction(prevout_hash) tx = self.db.get_transaction(prevout_hash)
if tx: if tx:
return tx.outputs()[prevout_n].value return tx.outputs()[prevout_n].value
@@ -670,7 +675,7 @@ class AddressSynchronizer(Logger):
def get_wallet_delta(self, tx: Transaction): def get_wallet_delta(self, tx: Transaction):
""" effect of tx on wallet """ """ effect of tx on wallet """
is_relevant = False # "related to wallet?" is_relevant = False # "related to wallet?"
is_mine = False is_mine = False # "is any input mine?"
is_pruned = False is_pruned = False
is_partial = False is_partial = False
v_in = v_out = v_out_mine = 0 v_in = v_out = v_out_mine = 0
@@ -679,15 +684,7 @@ class AddressSynchronizer(Logger):
if self.is_mine(addr): if self.is_mine(addr):
is_mine = True is_mine = True
is_relevant = True is_relevant = True
d = self.db.get_txo_addr(txin.prevout.txid.hex(), addr) value = self.get_txin_value(txin, address=addr)
for n, v, cb in d:
if n == txin.prevout.out_idx:
value = v
break
else:
value = None
if value is None:
value = txin.value_sats()
if value is None: if value is None:
is_pruned = True is_pruned = True
else: else: