LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 09:45:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make wallet.get_address_index faster by storing an addr->index dict

Browse source
This commit is contained in:
SomberNight 2018-01-27 17:33:26 +01:00
parent 7ab9fa5be4
commit 7f3b627aa4
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/qt/main_window.py
View file

@ -62,6 +62,7 @@ from .fee_slider import FeeSlider
from .util import * from .util import *
from electrum.util import profiler
class StatusBarButton(QPushButton): class StatusBarButton(QPushButton):
def __init__(self, icon, tooltip, func): def __init__(self, icon, tooltip, func):
@ -325,6 +326,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.print_error('close_wallet', self.wallet.storage.path) self.print_error('close_wallet', self.wallet.storage.path)
run_hook('close_wallet', self.wallet) run_hook('close_wallet', self.wallet)
@profiler
def load_wallet(self, wallet): def load_wallet(self, wallet):
wallet.thread = TaskThread(self, self.on_error) wallet.thread = TaskThread(self, self.on_error)
self.wallet = wallet self.wallet = wallet

22
lib/wallet.py
View file

@ -340,6 +340,8 @@ class Abstract_Wallet(PrintError):
return address in self.change_addresses return address in self.change_addresses
def get_address_index(self, address): def get_address_index(self, address):
if hasattr(self, '_addr_to_addr_index'):
return self._addr_to_addr_index[address]
if address in self.receiving_addresses: if address in self.receiving_addresses:
return False, self.receiving_addresses.index(address) return False, self.receiving_addresses.index(address)
if address in self.change_addresses: if address in self.change_addresses:
@ -1029,8 +1031,10 @@ class Abstract_Wallet(PrintError):
def is_used(self, address): def is_used(self, address):
h = self.history.get(address,[]) h = self.history.get(address,[])
if len(h) == 0:
return False
c, u, x = self.get_addr_balance(address) c, u, x = self.get_addr_balance(address)
return len(h) > 0 and c + u + x == 0 return c + u + x == 0
def is_empty(self, address): def is_empty(self, address):
c, u, x = self.get_addr_balance(address) c, u, x = self.get_addr_balance(address)
@ -1647,6 +1651,14 @@ class Deterministic_Wallet(Abstract_Wallet):
if n > nmax: nmax = n if n > nmax: nmax = n
return nmax + 1 return nmax + 1
def load_addresses(self):
super().load_addresses()
self._addr_to_addr_index = {} # key: address, value: (is_change, index)
for i, addr in enumerate(self.receiving_addresses):
self._addr_to_addr_index[addr] = (False, i)
for i, addr in enumerate(self.change_addresses):
self._addr_to_addr_index[addr] = (True, i)
def create_new_address(self, for_change=False): def create_new_address(self, for_change=False):
assert type(for_change) is bool assert type(for_change) is bool
addr_list = self.change_addresses if for_change else self.receiving_addresses addr_list = self.change_addresses if for_change else self.receiving_addresses
@ -1654,6 +1666,7 @@ class Deterministic_Wallet(Abstract_Wallet):
x = self.derive_pubkeys(for_change, n) x = self.derive_pubkeys(for_change, n)
address = self.pubkeys_to_address(x) address = self.pubkeys_to_address(x)
addr_list.append(address) addr_list.append(address)
self._addr_to_addr_index[address] = (for_change, n)
self.save_addresses() self.save_addresses()
self.add_address(address) self.add_address(address)
return address return address
@ -1685,12 +1698,11 @@ class Deterministic_Wallet(Abstract_Wallet):
def is_beyond_limit(self, address, is_change): def is_beyond_limit(self, address, is_change):
addr_list = self.get_change_addresses() if is_change else self.get_receiving_addresses() addr_list = self.get_change_addresses() if is_change else self.get_receiving_addresses()
i = addr_list.index(address) i = self.get_address_index(address)[1]
prev_addresses = addr_list[:max(0, i)]
limit = self.gap_limit_for_change if is_change else self.gap_limit limit = self.gap_limit_for_change if is_change else self.gap_limit
if len(prev_addresses) < limit: if i < limit:
return False return False
prev_addresses = prev_addresses[max(0, i - limit):] prev_addresses = addr_list[max(0, i - limit):max(0, i)]
for addr in prev_addresses: for addr in prev_addresses:
if self.history.get(addr): if self.history.get(addr):
return False return False