Merge JoinMarket-Org/joinmarket-clientserver#1624: Don't validate cache during initial sync.

f2ae8abac1 Don't validate cache during initial sync. (Adam Gibson)

Pull request description:

  Prior to this commit, the calls to get_new_addr in the functions in the initial sync algo used for recovery, used the default value of the argument validate_cache, which is True (because in normal running, get_new_addr is used to derive addresses as destinations, for which it's safer to not use the cache, and as one-off calls, are not performance-sensitive). This caused initial sync to be very slow in recovery, especially if using large gap limits (which is common). After this commit, we set the argument validate_cache to False, as is intended during initial sync. This allows the optimised performance from caching to be in effect. See earlier PRs #1594 and #1614 for context.

Top commit has no ACKs.

Tree-SHA512: 2e16642dbb071f3f4e8c3bcfc6cfb71b63865acfb576be6f31b2a8945795b9e9a5de5c93bc2ed534db8ee9ac12cbddef180c303ed6e3c30c89f6f67d49a2d834

src/jmclient/wallet_service.py

@@ -982,7 +982,8 @@ class WalletService(Service):
                 for index in range(next_unused):
                     addresses.add(self.get_addr(md, address_type, index))
                 for index in range(self.gap_limit):
-                    addresses.add(self.get_new_addr(md, address_type))
+                    addresses.add(self.get_new_addr(md, address_type,
+                                                    validate_cache=False))
                 # reset the indices to the value we had before the
                 # new address calls:
                 self.set_next_index(md, address_type, next_unused)
@@ -990,27 +991,24 @@ class WalletService(Service):
             # include any imported addresses
             for path in self.yield_imported_paths(md):
                 addresses.add(self.get_address_from_path(path))
-
         if isinstance(self.wallet, FidelityBondMixin):
             md = FidelityBondMixin.FIDELITY_BOND_MIXDEPTH
             address_type = FidelityBondMixin.BIP32_TIMELOCK_ID
             for timenumber in range(FidelityBondMixin.TIMENUMBER_COUNT):
                 addresses.add(self.get_addr(md, address_type, timenumber))
-
         return addresses, saved_indices
 
     def collect_addresses_gap(self, gap_limit=None):
         gap_limit = gap_limit or self.gap_limit
         addresses = set()
-
         for md in range(self.max_mixdepth + 1):
             for address_type in (BaseWallet.ADDRESS_TYPE_INTERNAL,
                                  BaseWallet.ADDRESS_TYPE_EXTERNAL):
                 old_next = self.get_next_unused_index(md, address_type)
                 for index in range(gap_limit):
-                    addresses.add(self.get_new_addr(md, address_type))
+                    addresses.add(self.get_new_addr(md, address_type,
+                                                    validate_cache=False))
                 self.set_next_index(md, address_type, old_next)
-
         return addresses
 
     def get_external_addr(self, mixdepth):