diff --git a/electrum/plugins/joinmarket/jm_main.py b/electrum/plugins/joinmarket/jm_main.py index 2e3da1b8e..4f5a122af 100644 --- a/electrum/plugins/joinmarket/jm_main.py +++ b/electrum/plugins/joinmarket/jm_main.py @@ -25,12 +25,8 @@ class JMManager(Logger): self.wallet = wallet self.network = None self.loop = None - Logger.__init__(self) self.config = config = wallet.config - self.jmw = JMWallet(self) - self.jmconf = JMConf(self) - self.jmw.jmconf = self.jmconf - + Logger.__init__(self) self.log_handler = JMGUILogHandler(self) self.logger = logging.LoggerAdapter(self.logger, {'jmman_id': id(self)}) @@ -38,6 +34,10 @@ class JMManager(Logger): self.tumble_logsdir = logsdir = pathlib.Path(config.path) / "logs" self.tumble_log = get_tumble_log(self, logsdir, config) + self.jmw = JMWallet(self) + self.jmconf = JMConf(self) + self.jmw.jmconf = self.jmconf + self.states = JMStates self.state_lock = threading.Lock() diff --git a/electrum/plugins/joinmarket/jm_wallet.py b/electrum/plugins/joinmarket/jm_wallet.py index 88fcb34ca..1cc0e2feb 100644 --- a/electrum/plugins/joinmarket/jm_wallet.py +++ b/electrum/plugins/joinmarket/jm_wallet.py @@ -495,7 +495,6 @@ class JMWallet(KeyPairsMixin, WalletDBMixin, JMBaseCodeMixin, EventListener): @ignore_exceptions # don't kill outer taskgroup async def main_loop(self): - self.logger.info("starting taskgroup.") try: async with self.taskgroup as group: await group.spawn(self.do_synchronize_loop()) diff --git a/electrum/plugins/joinmarket/notes.txt b/electrum/plugins/joinmarket/notes.txt index e3c1a1650..e4278265f 100644 --- a/electrum/plugins/joinmarket/notes.txt +++ b/electrum/plugins/joinmarket/notes.txt @@ -1,12 +1,10 @@ ------------------------------------------------------------------------------- plugin: - check onion/IRC single/multiple password/no passdword join - - make_keypairs_cache logger.info not shown in Qt log - - jm_qt_obwatch: sorting by columns, filter by text - - remove addrask from scheule? - save last shedule tx as done to wallet schedule when confirmed + - jm_qt_obwatch: advanced sorting by columns, filter by text - потрібно якось документувати - irc reconnect interval 5 sec -> change to progressive interval