From 9c252323be28956658c4a1fbbba21ae7218b41cc Mon Sep 17 00:00:00 2001 From: tecnovert Date: Mon, 31 Mar 2025 00:12:51 +0200 Subject: [PATCH] Set expect_seed after creation. BCH must be reseeded manually as sethdseed is disabled during IBD. --- basicswap/basicswap.py | 4 +++- tests/basicswap/test_bch_xmr.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py index de2e852..39b3b35 100644 --- a/basicswap/basicswap.py +++ b/basicswap/basicswap.py @@ -2665,7 +2665,8 @@ class BasicSwap(BaseApp): self.log.warning(msg) return False - expect_seedid = self.getStringKV("main_wallet_seedid_" + ci.coin_name().lower()) + seed_key: str = "main_wallet_seedid_" + ci.coin_name().lower() + expect_seedid: str = self.getStringKV(seed_key) if expect_seedid is None: self.log.warning( f"Can't find expected wallet seed id for coin {ci.coin_name()}." @@ -2677,6 +2678,7 @@ class BasicSwap(BaseApp): ) root_key = self.getWalletKey(c, 1) self.storeSeedIDForCoin(root_key, c) + expect_seedid: str = self.getStringKV(seed_key) else: self.log.warning("Node is locked.") return False diff --git a/tests/basicswap/test_bch_xmr.py b/tests/basicswap/test_bch_xmr.py index 8b526a6..d45c438 100644 --- a/tests/basicswap/test_bch_xmr.py +++ b/tests/basicswap/test_bch_xmr.py @@ -488,6 +488,10 @@ class TestBCH(BasicSwapTest): new_wallet_name = random.randbytes(10).hex() self.callnoderpc("createwallet", [new_wallet_name]) self.callnoderpc("sethdseed", [True, test_wif], wallet=new_wallet_name) + + wi = self.callnoderpc("getwalletinfo", wallet=new_wallet_name) + assert wi["hdseedid"] == "3da5c0af91879e8ce97d9a843874601c08688078" + addr = self.callnoderpc("getnewaddress", wallet=new_wallet_name) self.callnoderpc("unloadwallet", [new_wallet_name]) assert addr == "bchreg:qqxr67wf5ltty5jvm44zryywmpt7ntdaa50carjt59"