midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2026-05-07 06:52:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: ltc, deduplicate MWEB wallet creation

Browse Source
This commit is contained in:
tecnovert
2026-05-03 18:56:57 +02:00
parent 9caae399d2
commit c4e7de2873
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basicswap/interface/ltc.py
+9 -24
View File
@@ -228,23 +228,24 @@ class LTCInterfaceMWEB(LTCInterface):
def init_wallet(self, password=None): def init_wallet(self, password=None):
# If system is encrypted mweb wallet will be created at first unlock # If system is encrypted mweb wallet will be created at first unlock
self._log.info("init_wallet - {}".format(self.ticker())) wallet_name: str = self._rpc_wallet
self._log.info(f"init_wallet - {self.ticker()}")
wallets = self.rpc("listwallets") wallets = self.rpc("listwallets")
if self._rpc_wallet not in wallets: if wallet_name not in wallets:
try: try:
self.rpc("loadwallet", [self._rpc_wallet]) self.rpc("loadwallet", [wallet_name])
self._log.debug(f'Loaded existing wallet "{self._rpc_wallet}".') self._log.debug(f'Loaded existing wallet "{wallet_name}".')
except Exception as e: except Exception as e:
if "does not exist" in str(e) or "Path does not exist" in str(e): if "does not exist" in str(e) or "Path does not exist" in str(e):
self._log.info( self._log.info(
f'Creating wallet "{self._rpc_wallet}" for {self.coin_name()}.' f'Creating wallet "{wallet_name}" for {self.coin_name()}.'
) )
# wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors # wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors
self.rpc( self.rpc(
"createwallet", "createwallet",
[ [
self._rpc_wallet, wallet_name,
False, False,
True, True,
password, password,
@@ -255,22 +256,6 @@ class LTCInterfaceMWEB(LTCInterface):
else: else:
raise raise
wallets = self.rpc("listwallets")
if "mweb" not in wallets:
try:
self.rpc("loadwallet", ["mweb"])
self._log.debug("Loaded existing MWEB wallet.")
except Exception as e:
if "does not exist" in str(e) or "Path does not exist" in str(e):
self._log.info(f"Creating MWEB wallet for {self.coin_name()}.")
# wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors, load_on_startup
self.rpc(
"createwallet",
["mweb", False, True, password, False, False, True],
)
else:
raise
if password is not None: if password is not None:
# Max timeout value, ~3 years # Max timeout value, ~3 years
self.rpc_wallet("walletpassphrase", [password, 100000000], timeout=120) self.rpc_wallet("walletpassphrase", [password, 100000000], timeout=120)
@@ -279,8 +264,8 @@ class LTCInterfaceMWEB(LTCInterface):
self._sc.initialiseWallet(self.interface_type()) self._sc.initialiseWallet(self.interface_type())
# Workaround to trigger mweb_spk_man->LoadMWEBKeychain() # Workaround to trigger mweb_spk_man->LoadMWEBKeychain()
self.rpc("unloadwallet", ["mweb"]) self.rpc("unloadwallet", [wallet_name])
self.rpc("loadwallet", ["mweb"]) self.rpc("loadwallet", [wallet_name])
if password is not None: if password is not None:
self.rpc_wallet("walletpassphrase", [password, 100000000], timeout=120) self.rpc_wallet("walletpassphrase", [password, 100000000], timeout=120)
self.rpc_wallet("keypoolrefill") self.rpc_wallet("keypoolrefill")