update occurences of get_history
This commit is contained in:
parent
81372ffe4b
commit
f051a3e577
|
@ -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():
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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')
|
||||
|
||||
label, is_default_label = self.wallet.get_label(tx_hash)
|
||||
if is_default_label:
|
||||
|
|
|
@ -108,7 +108,7 @@ 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]
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue