LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

split out fee from value when possible

Browse source
This commit is contained in:
Lex Berezhny 2018-11-28 10:57:32 -05:00
parent 92d1230a90
commit 158c354a27
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lbrynet/extras/wallet/manager.py
View file

@ -300,8 +300,6 @@ class LbryWalletManager(BaseWalletManager):
item = { item = {
'txid': tx.id, 'txid': tx.id,
'timestamp': ts, 'timestamp': ts,
'value': dewies_to_lbc(tx.net_account_balance),
'fee': dewies_to_lbc(tx.fee),
'date': datetime.fromtimestamp(ts).isoformat(' ')[:-3] if tx.height > 0 else None, 'date': datetime.fromtimestamp(ts).isoformat(' ')[:-3] if tx.height > 0 else None,
'confirmations': headers.height - tx.height if tx.height > 0 else 0, 'confirmations': headers.height - tx.height if tx.height > 0 else 0,
'claim_info': [], 'claim_info': [],
@ -309,6 +307,12 @@ class LbryWalletManager(BaseWalletManager):
'support_info': [], 'support_info': [],
'abandon_info': [] 'abandon_info': []
} }
if all([txi.txo_ref.txo is not None for txi in tx.inputs]):
item['value'] -= dewies_to_lbc(tx.net_account_balance - tx.fee)
item['fee'] = dewies_to_lbc(tx.fee)
else:
item['value'] = dewies_to_lbc(tx.net_account_balance)
item['fee'] = '0' # can't calculate fee without all input txos
for txo in tx.my_claim_outputs: for txo in tx.my_claim_outputs:
item['claim_info'].append({ item['claim_info'].append({
'address': txo.get_address(account.ledger), 'address': txo.get_address(account.ledger),
@ -358,11 +362,6 @@ class LbryWalletManager(BaseWalletManager):
'claim_name': txo.claim_name, 'claim_name': txo.claim_name,
'nout': txo.position 'nout': txo.position
}) })
if all([txi.txo_ref.txo is not None for txi in tx.inputs]):
item['fee'] = dewies_to_lbc(tx.fee)
item['value'] -= item['fee']
else:
item['fee'] = '0' # can't calculate fee without all input txos
history.append(item) history.append(item)
return history return history