AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: min_acceptable_gap should mimic wallet.synchronize

Browse Source 
if wallet.synchronize uses address_is_old, so should min_acceptable_gap
This commit is contained in:
SomberNight
2020-03-02 18:53:04 +01:00
parent f90d96b346
commit ac6a5a3c5f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/wallet.py
View File

@@ -1187,7 +1187,9 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
return not self.is_watching_only() and hasattr(self.keystore, 'get_private_key') return not self.is_watching_only() and hasattr(self.keystore, 'get_private_key')
def address_is_old(self, address: str, *, req_conf: int = 3) -> bool: def address_is_old(self, address: str, *, req_conf: int = 3) -> bool:
"""Returns whether address has any history that is deeply confirmed.""" """Returns whether address has any history that is deeply confirmed.
Used for reorg-safe(ish) gap limit roll-forward.
"""
max_conf = -1 max_conf = -1
h = self.db.get_addr_history(address) h = self.db.get_addr_history(address)
needs_spv_check = not self.config.get("skipmerklecheck", False) needs_spv_check = not self.config.get("skipmerklecheck", False)
@@ -2155,6 +2157,7 @@ class Deterministic_Wallet(Abstract_Wallet):
def change_gap_limit(self, value): def change_gap_limit(self, value):
'''This method is not called in the code, it is kept for console use''' '''This method is not called in the code, it is kept for console use'''
value = int(value)
if value >= self.min_acceptable_gap(): if value >= self.min_acceptable_gap():
self.gap_limit = value self.gap_limit = value
self.db.put('gap_limit', self.gap_limit) self.db.put('gap_limit', self.gap_limit)
@@ -2171,14 +2174,14 @@ class Deterministic_Wallet(Abstract_Wallet):
k += 1 k += 1
return k return k
def min_acceptable_gap(self): def min_acceptable_gap(self) -> int:
# fixme: this assumes wallet is synchronized # fixme: this assumes wallet is synchronized
n = 0 n = 0
nmax = 0 nmax = 0
addresses = self.get_receiving_addresses() addresses = self.get_receiving_addresses()
k = self.num_unused_trailing_addresses(addresses) k = self.num_unused_trailing_addresses(addresses)
for addr in addresses[0:-k]: for addr in addresses[0:-k]:
if self.db.get_addr_history(addr): if self.address_is_old(addr):
n = 0 n = 0
else: else:
n += 1 n += 1