AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: load lnworker earlier

Browse Source
This commit is contained in:
ThomasV
2022-08-11 18:42:21 +02:00
parent 7b8e257ebb
commit 2c53af1664
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/wallet.py
View File

@@ -339,6 +339,8 @@ class Abstract_Wallet(ABC, Logger, EventListener):
self._freeze_lock = threading.RLock() # for mutating/iterating frozen_{addresses,coins} self._freeze_lock = threading.RLock() # for mutating/iterating frozen_{addresses,coins}
self.load_keystore()
self._init_lnworker()
self._init_requests_rhash_index() self._init_requests_rhash_index()
self._prepare_onchain_invoice_paid_detection() self._prepare_onchain_invoice_paid_detection()
self.calc_unused_change_addresses() self.calc_unused_change_addresses()
@@ -352,11 +354,12 @@ class Abstract_Wallet(ABC, Logger, EventListener):
# to-be-generated (HD) addresses are also considered here (gap-limit-roll-forward) # to-be-generated (HD) addresses are also considered here (gap-limit-roll-forward)
self._up_to_date = False self._up_to_date = False
self.lnworker = None
self.load_keystore()
self.test_addresses_sanity() self.test_addresses_sanity()
self.register_callbacks() self.register_callbacks()
def _init_lnworker(self):
self.lnworker = None
@ignore_exceptions # don't kill outer taskgroup @ignore_exceptions # don't kill outer taskgroup
async def main_loop(self): async def main_loop(self):
self.logger.info("starting taskgroup.") self.logger.info("starting taskgroup.")
@@ -3170,6 +3173,8 @@ class Deterministic_Wallet(Abstract_Wallet):
# generate addresses now. note that without libsecp this might block # generate addresses now. note that without libsecp this might block
# for a few seconds! # for a few seconds!
self.synchronize() self.synchronize()
def _init_lnworker(self):
# lightning_privkey2 is not deterministic (legacy wallets, bip39) # lightning_privkey2 is not deterministic (legacy wallets, bip39)
ln_xprv = self.db.get('lightning_xprv') or self.db.get('lightning_privkey2') ln_xprv = self.db.get('lightning_xprv') or self.db.get('lightning_privkey2')
# lnworker can only be initialized once receiving addresses are available # lnworker can only be initialized once receiving addresses are available