From 020487b6a0847021cac34f1a77857f77dababcd5 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Mon, 1 Aug 2022 09:40:40 -0400 Subject: [PATCH] account merge bug fix from upstream --- lbry/extras/daemon/daemon.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index 66cec7c1b..33ef1271d 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -1431,8 +1431,8 @@ class Daemon(metaclass=JSONRPCServerType): print("passwordless use is not implemented yet") else: wallet = self.wallet_manager.get_wallet_or_default(wallet_id) - added_accounts = wallet.merge(self.wallet_manager, password, data) - for new_account in added_accounts: + added_accounts, merged_accounts = wallet.merge(self.wallet_manager, password, data) + for new_account in itertools.chain(added_accounts, merged_accounts): await new_account.maybe_migrate_certificates() if added_accounts and self.ledger.network.is_connected: if blocking: