Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-23 03:49:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

basicswap: remove extra xmr wallet open

Browse source
This commit is contained in:
nahuhh 2024-11-14 22:45:28 +00:00
parent 893fc87b28
commit 5bf20370eb
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
basicswap/basicswap.py
View file

@ -1055,18 +1055,6 @@ class BasicSwap(BaseApp):
except Exception as e: except Exception as e:
self.log.error("Sanity checks failed: %s", str(e)) self.log.error("Sanity checks failed: %s", str(e))
elif c == Coins.XMR:
try:
ci.ensureWalletExists()
except Exception as e: # noqa: F841
self.log.warning("Can't open XMR wallet, could be locked.")
continue
elif c == Coins.WOW:
try:
ci.ensureWalletExists()
except Exception as e: # noqa: F841
self.log.warning("Can't open WOW wallet, could be locked.")
continue
elif c == Coins.LTC: elif c == Coins.LTC:
ci_mweb = self.ci(Coins.LTC_MWEB) ci_mweb = self.ci(Coins.LTC_MWEB)
is_encrypted, _ = self.getLockedState() is_encrypted, _ = self.getLockedState()

16
basicswap/interface/xmr.py
View file

@ -182,11 +182,23 @@ class XMRInterface(CoinInterface):
params["password"] = self._wallet_password params["password"] = self._wallet_password
try: try:
# Can't reopen the same wallet in windows, !is_keys_file_locked() self.rpc_wallet("open_wallet", params)
self.rpc_wallet("close_wallet") # TODO Remove `refresh` after upstream fix to refresh on open_wallet
self.rpc_wallet("refresh")
except Exception: except Exception:
self._log.debug(f"Failed to open {self.coin_name()} wallet")
try:
# TODO Remove `store` after upstream fix to autosave on close_wallet
self.rpc_wallet("store")
self.rpc_wallet("close_wallet")
self._log.debug(f"Attempt to save and close {self.coin_name()} wallet")
except Exception as e:
self._log.debug(f"{self.coin_name()}: {e}")
pass pass
self.rpc_wallet("open_wallet", params) self.rpc_wallet("open_wallet", params)
# TODO Remove `refresh` after upstream fix to refresh on open_wallet
self.rpc_wallet("refresh")
self._log.debug(f"Reattempt to open {self.coin_name()} wallet")
def initialiseWallet( def initialiseWallet(
self, key_view: bytes, key_spend: bytes, restore_height=None self, key_view: bytes, key_spend: bytes, restore_height=None