electrum

commit f051a3e5779793619bdbd2feff73abd3a0cc1e55
parent 81372ffe4bd13c5aff02cbd3b8624f4d58279e2c
Author: ThomasV <thomasv@gitorious>
Date:   Mon, 30 Mar 2015 20:17:24 +0200

update occurences of get_history

Diffstat:
M
gui/android.py
 | 
6
+++---
M
gui/gtk.py
 | 
3
++-
M
gui/qt/main_window.py
 | 
11
++---------
M
gui/text.py
 | 
4
++--
M
lib/util.py
 | 
2
++

5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/gui/android.py b/gui/android.py
@@ -323,10 +323,10 @@ settings_layout = make_layout(""" <ListView
 
 def get_history_values(n):
     values = []
-    h = wallet.get_tx_history()
+    h = wallet.get_history()
     length = min(n, len(h))
     for i in range(length):
-        tx_hash, conf, is_mine, value, fee, balance, timestamp = h[-i-1]
+        tx_hash, conf, value, timestamp, balance = h[-i-1]
         try:
             dt = datetime.datetime.fromtimestamp( timestamp )
             if dt.date() == dt.today().date():
@@ -338,7 +338,7 @@ def get_history_values(n):
         conf_str = 'v' if conf else 'o'
         label, is_default_label = wallet.get_label(tx_hash)
         label = label.replace('<','').replace('>','')
-        values.append((conf_str, '  ' + time_str, '  ' + format_satoshis(value,True), '  ' + label))
+        values.append((conf_str, '  ' + time_str, '  ' + format_satoshis(value, True), '  ' + label))
 
     return values
 
diff --git a/gui/gtk.py b/gui/gtk.py
@@ -1171,7 +1171,7 @@ class ElectrumWindow:
         self.history_list.clear()
 
         for item in self.wallet.get_history():
-            tx_hash, conf, is_mine, value, fee, balance, timestamp = item
+            tx_hash, conf, value, timestamp, balance = item
             if conf > 0:
                 try:
                     time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
@@ -1199,6 +1199,7 @@ class ElectrumWindow:
         import datetime
         if not tx_hash: return ''
         tx = self.wallet.transactions.get(tx_hash)
+        tx.deserialize()
         is_relevant, is_mine, v, fee = self.wallet.get_wallet_delta(tx)
         conf, timestamp = self.wallet.verifier.get_confirmations(tx_hash)
 
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -702,15 +702,8 @@ class ElectrumWindow(QMainWindow):
             else:
                 icon = QIcon(":icons/confirmed.png")
 
-            if value is not None:
-                v_str = self.format_amount(value, True, whitespaces=True)
-            else:
-                v_str = _('unknown')
-
-            if balance is not None:
-                balance_str = self.format_amount(balance, whitespaces=True)
-            else:
-                balance_str = _('unknown')
+            v_str = self.format_amount(value, True, whitespaces=True)
+            balance_str = self.format_amount(balance, whitespaces=True)
 
             label, is_default_label = self.wallet.get_label(tx_hash)
             if is_default_label:
diff --git a/gui/text.py b/gui/text.py
@@ -108,10 +108,10 @@ class ElectrumGui:
         self.history = []
 
         for item in self.wallet.get_history():
-            tx_hash, conf, is_mine, value, fee, balance, timestamp = item
+            tx_hash, conf, value, timestamp, balance = item
             if conf:
                 try:
-                    time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
+                    time_str = datetime.datetime.fromtimestamp(timestamp).isoformat(' ')[:-3]
                 except Exception:
                     time_str = "------"
             else:
diff --git a/lib/util.py b/lib/util.py
@@ -109,6 +109,8 @@ def user_dir():
 
 def format_satoshis(x, is_diff=False, num_zeros = 0, decimal_point = 8, whitespaces=False):
     from decimal import Decimal
+    if x is None:
+        return 'unknown'
     s = Decimal(x)
     sign, digits, exp = s.as_tuple()
     digits = map(str, digits)