Fixed key check to support assets in HD wallets. Format cleanup in wa…

…lletdb (no code changes). (Raptor3um#387)
CodeIsTheKey · Aug 2, 2024 · f877c16 · f877c16
1 parent ad2be27
commit f877c16
Show file tree

Hide file tree

Showing 2 changed files with 372 additions and 431 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4796,7 +4796,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
                     std::string m = atx.MakeSignString(passetsCache.get());
                     // lets prove we own the root asset
                     CKey key;
-                    if (!CCryptoKeyStore::GetKey(assetData.ownerAddress, key)) {
+                    if (!GetKey(assetData.ownerAddress, key)) {
                         strFailReason = _("Root asset key not in wallet");
                         return false;
                     }
@@ -4820,7 +4820,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
                 std::string m = mtx.MakeSignString(passetsCache.get());
                 // lets prove we own the asset
                 CKey key;
-                if (!CCryptoKeyStore::GetKey(assetData.ownerAddress, key)) {
+                if (!GetKey(assetData.ownerAddress, key)) {
                     strFailReason = _("Asset owner key not in wallet");
                     return false;
                 }
@@ -4843,7 +4843,7 @@ bool CWallet::CreateTransaction(const std::vector <CRecipient> &vecSend, CTransa
                 std::string m = uptx.MakeSignString(passetsCache.get());
                 // lets prove we own the asset
                 CKey key;
-                if (!CCryptoKeyStore::GetKey(assetData.ownerAddress, key)) {
+                if (!GetKey(assetData.ownerAddress, key)) {
                     strFailReason = _("Asset owner key not in wallet");
                     return false;
                 }