tfix: synchronize generated duplicated addresses - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 8774f1a193129ca6af503e75cb6ffced3ffefe5a
DIR parent 9d1c31255c235a7506d29514b90628c3927d83be
HTML Author: thomasv <thomasv@gitorious>
Date: Mon, 2 Sep 2013 13:41:31 +0200
fix: synchronize generated duplicated addresses
Diffstat:
M gui/installwizard.py | 7 +++----
M lib/wallet.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/installwizard.py b/gui/installwizard.py
t@@ -179,14 +179,13 @@ class InstallWizard(QDialog):
#self.interface.start(wait = False)
- # start wallet threads
- wallet.start_threads(self.interface, self.blockchain)
-
-
# generate the first addresses, in case we are offline
if s is None or a == 'create':
wallet.synchronize()
+ # start wallet threads
+ wallet.start_threads(self.interface, self.blockchain)
+
if a == 'restore' and s is not None:
try:
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -665,7 +665,7 @@ class Wallet:
if tx_height == 0:
tx_age = 0
else:
- tx_age = self.verifier.height - tx_height + 1
+ tx_age = self.verifier.blockchain.height - tx_height + 1
if tx_age > age:
age = tx_age
return age > 2