don't use address_is_old in code that can be run offline
authorThomasV <thomasv@gitorious>
Wed, 9 Jul 2014 16:23:33 +0000 (18:23 +0200)
committerThomasV <thomasv@gitorious>
Wed, 9 Jul 2014 16:23:33 +0000 (18:23 +0200)
gui/qt/main_window.py
lib/wallet.py

index b8dccc7..c83a6f7 100644 (file)
@@ -765,7 +765,7 @@ class ElectrumWindow(QMainWindow):
         self.receive_requests = self.wallet.storage.get('receive_requests',{}) 
         domain = self.wallet.get_account_addresses(self.current_account, include_change=False)
         for addr in domain:
-            if not self.wallet.address_is_old(addr) and addr not in self.receive_requests.keys():
+            if not self.wallet.history.get(addr) and addr not in self.receive_requests.keys():
                 break
         else:
             addr = ''
index 2d2ba93..f476cdd 100644 (file)
@@ -1252,7 +1252,7 @@ class Deterministic_Wallet(Abstract_Wallet):
             return False
         prev_addresses = prev_addresses[max(0, i - limit):]
         for addr in prev_addresses:
-            if self.address_is_old(addr):
+            if self.history.get(addr):
                 return False
         return True