LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-20 18:09:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:spesmilo/electrum

Browse source
This commit is contained in:
SomberNight 2018-03-06 07:14:08 +01:00
commit 553993b4d0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/wallet.py
View file

@ -987,11 +987,11 @@ class Abstract_Wallet(PrintError):
def get_full_history(self, domain=None, from_timestamp=None, to_timestamp=None, fx=None, show_addresses=False): def get_full_history(self, domain=None, from_timestamp=None, to_timestamp=None, fx=None, show_addresses=False):
from .util import timestamp_to_datetime, Satoshis, Fiat from .util import timestamp_to_datetime, Satoshis, Fiat
out = [] out = []
capital_gains = 0
income = 0 income = 0
expenditures = 0 expenditures = 0
fiat_income = 0 capital_gains = Decimal(0)
fiat_expenditures = 0 fiat_income = Decimal(0)
fiat_expenditures = Decimal(0)
h = self.get_history(domain) h = self.get_history(domain)
for tx_hash, height, conf, timestamp, value, balance in h: for tx_hash, height, conf, timestamp, value, balance in h:
if from_timestamp and (timestamp or time.time()) < from_timestamp: if from_timestamp and (timestamp or time.time()) < from_timestamp: