tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8e65df3ae736e9ef29efeadb1c72ad36dd3bb910
DIR parent c00b1f649a97627d2032f570d84744c800db4d96
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 31 Mar 2015 18:57:50 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M gui/qt/main_window.py | 3 +++
M lib/wallet.py | 3 ++-
M plugins/openalias.py | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -689,6 +689,9 @@ class ElectrumWindow(QMainWindow):
for item in self.wallet.get_history(self.current_account):
tx_hash, conf, value, timestamp, balance = item
time_str = _("unknown")
+ if conf is None and timestamp is None:
+ continue # skip history in offline mode
+
if conf > 0:
time_str = self.format_time(timestamp)
if conf == -1:
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -744,7 +744,8 @@ class Abstract_Wallet(object):
#balance += value
conf, timestamp = self.verifier.get_confirmations(tx_hash) if self.verifier else (None, None)
history.append( (tx_hash, conf, value, timestamp) )
- history.sort(key = lambda x: self.verifier.get_txpos(x[0]))
+ if self.verifier:
+ history.sort(key = lambda x: self.verifier.get_txpos(x[0]))
c, u = self.get_balance(domain)
balance = c + u
DIR diff --git a/plugins/openalias.py b/plugins/openalias.py
t@@ -185,7 +185,7 @@ class Plugin(BasePlugin):
try:
resolver = dns.resolver.Resolver()
resolver.timeout = 2.0
- resolver.lifetime = 2.0
+ resolver.lifetime = 4.0
records = resolver.query(url, dns.rdatatype.TXT)
for record in records:
string = record.strings[0]
t@@ -232,7 +232,7 @@ class Plugin(BasePlugin):
for i in xrange(len(parts), 0, -1):
sub = '.'.join(parts[i - 1:])
query = dns.message.make_query(sub, dns.rdatatype.NS)
- response = dns.query.udp(query, ns, 1)
+ response = dns.query.udp(query, ns, 3)
if response.rcode() != dns.rcode.NOERROR:
self.print_error("query error")
return 0
t@@ -250,7 +250,7 @@ class Plugin(BasePlugin):
query = dns.message.make_query(sub,
dns.rdatatype.DNSKEY,
want_dnssec=True)
- response = dns.query.udp(query, ns, 1)
+ response = dns.query.udp(query, ns, 3)
if response.rcode() != 0:
self.print_error("query error")
return 0