Fix issue when trying to add existing key to wallet

1200wd · May 29, 2024 · 7fc61a3 · 7fc61a3
1 parent 3c4bd3b
commit 7fc61a3
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/bitcoinlib/wallets.py b/bitcoinlib/wallets.py
@@ -390,14 +390,14 @@ def from_key(name, wallet_id, session, key, account_id=0, network=None, change=0
                     path = "M"
             address = k.address(encoding=encoding, script_type=script_type)
 
-            if commit:
-                keyexists = session.query(DbKey).\
-                    filter(DbKey.wallet_id == wallet_id,
-                           DbKey.wif == k.wif(witness_type=witness_type, multisig=multisig, is_private=True)).first()
-                if keyexists:
-                    _logger.warning("Key already exists in this wallet. Key ID: %d" % keyexists.id)
-                    return WalletKey(keyexists.id, session, k)
+            keyexists = session.query(DbKey).\
+                filter(DbKey.wallet_id == wallet_id,
+                       DbKey.wif == k.wif(witness_type=witness_type, multisig=multisig, is_private=True)).first()
+            if keyexists:
+                _logger.warning("Key already exists in this wallet. Key ID: %d" % keyexists.id)
+                return WalletKey(keyexists.id, session, k)
 
+            if commit:
                 wk = session.query(DbKey).filter(
                     DbKey.wallet_id == wallet_id,
                     or_(DbKey.public == k.public_byte,