From 6bbfef51989ad9a9cac3513c6595bb7c725828dc Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 19 Aug 2015 11:04:06 +0200 Subject: [PATCH] add timestamp to history command output, convert value to float --- lib/commands.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/commands.py b/lib/commands.py index dedfc9d68..dd008f32b 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -453,13 +453,18 @@ class Commands: for item in self.wallet.get_history(): tx_hash, conf, value, timestamp, balance = item try: - time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3] + time_str = datetime.datetime.fromtimestamp(timestamp).isoformat(' ')[:-3] except Exception: time_str = "----" - label, is_default_label = self.wallet.get_label(tx_hash) - - out.append({'txid':tx_hash, 'date':"%16s"%time_str, 'label':label, 'value':format_satoshis(value), 'confirmations':conf}) + out.append({ + 'txid':tx_hash, + 'timestamp':timestamp, + 'date':"%16s"%time_str, + 'label':label, + 'value':float(format_satoshis(value)) if value is not None else None, + 'confirmations':conf} + ) return out @command('w')