fix loadwallet created from navio-wallet

nav-io · Sep 22, 2024 · 5d905a3 · 5d905a3
1 parent 524d402
commit 5d905a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
@@ -37,7 +37,7 @@ RPCHelpMan getnewaddress()
 
             LOCK(pwallet->cs_wallet);
 
-            if (!pwallet->CanGetAddresses()) {
+            if ((!pwallet->IsWalletFlagSet(WALLET_FLAG_BLSCT) && !pwallet->CanGetAddresses()) || (pwallet->IsWalletFlagSet(WALLET_FLAG_BLSCT) && !pwallet->GetOrCreateBLSCTKeyMan()->CanGenerateKeys())) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error: This wallet has no available keys");
             }
 

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2971,6 +2971,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
     // Load wallet
     bool rescan_required = false;
     DBErrors nLoadWalletRet = walletInstance->LoadWallet();
+
     if (nLoadWalletRet != DBErrors::LOAD_OK) {
         if (nLoadWalletRet == DBErrors::CORRUPT) {
             error = strprintf(_("Error loading %s: Wallet corrupted"), walletFile);
@@ -3012,7 +3013,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
     }
 
     // This wallet is in its first run if there are no ScriptPubKeyMans and it isn't blank or no privkeys
-    const bool fFirstRun = walletInstance->m_spk_managers.empty() &&
+    const bool fFirstRun = ((walletInstance->m_spk_managers.empty() && !walletInstance->IsWalletFlagSet(WALLET_FLAG_BLSCT)) || !walletInstance->GetOrCreateBLSCTKeyMan()->CanGenerateKeys()) &&
                            !walletInstance->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) &&
                            !walletInstance->IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET);
     if (fFirstRun) {

diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
@@ -32,7 +32,6 @@ static void WalletToolReleaseWallet(CWallet* wallet)
 static void WalletCreate(CWallet* wallet_instance, uint64_t wallet_creation_flags, const std::vector<unsigned char>& seed, const blsct::SeedType& type)
 {
     LOCK(wallet_instance->cs_wallet);
-
     wallet_instance->SetMinVersion(FEATURE_LATEST);
     wallet_instance->InitWalletFlags(wallet_creation_flags);