d7a38301ec
* updated monero dependency * update patches for v0.18.3.4 * update generate checksum to include version of submodule as well
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From 6e7a9770e4f18f931f5caca7dec2a197e779afbc Mon Sep 17 00:00:00 2001
|
|
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
|
|
Date: Mon, 24 Jun 2024 10:49:12 +0200
|
|
Subject: [PATCH 15/16] use proper error handling in get_seed
|
|
|
|
---
|
|
src/wallet/api/wallet.cpp | 17 ++++++++++++-----
|
|
src/wallet/wallet2.cpp | 3 +++
|
|
2 files changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
|
|
index 5ca190c7d..a307d35a7 100644
|
|
--- a/src/wallet/api/wallet.cpp
|
|
+++ b/src/wallet/api/wallet.cpp
|
|
@@ -880,12 +880,19 @@ bool WalletImpl::close(bool store)
|
|
|
|
std::string WalletImpl::seed(const std::string& seed_offset) const
|
|
{
|
|
- if (checkBackgroundSync("cannot get seed"))
|
|
+ if (checkBackgroundSync("cannot get seed")) {
|
|
+ setStatusError("cannot get seed");
|
|
return std::string();
|
|
- epee::wipeable_string seed;
|
|
- if (m_wallet)
|
|
- m_wallet->get_seed(seed, seed_offset);
|
|
- return std::string(seed.data(), seed.size()); // TODO
|
|
+ }
|
|
+ try {
|
|
+ epee::wipeable_string seed;
|
|
+ if (m_wallet)
|
|
+ m_wallet->get_seed(seed, seed_offset);
|
|
+ return std::string(seed.data(), seed.size()); // TODO
|
|
+ } catch (const std::exception &e) {
|
|
+ setStatusError(e.what());
|
|
+ return std::string();
|
|
+ }
|
|
}
|
|
|
|
bool WalletImpl::getPolyseed(std::string &seed_words, std::string &passphrase) const
|
|
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
|
|
index 7d97e683b..8e44806fc 100644
|
|
--- a/src/wallet/wallet2.cpp
|
|
+++ b/src/wallet/wallet2.cpp
|
|
@@ -1452,11 +1452,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
|
|
bool keys_deterministic = is_deterministic();
|
|
if (!keys_deterministic)
|
|
{
|
|
+ THROW_WALLET_EXCEPTION(error::wallet_internal_error, "This is not a deterministic wallet");
|
|
std::cout << "This is not a deterministic wallet" << std::endl;
|
|
return false;
|
|
}
|
|
if (seed_language.empty())
|
|
{
|
|
+ THROW_WALLET_EXCEPTION(error::wallet_internal_error, "seed_language not set");
|
|
std::cout << "seed_language not set" << std::endl;
|
|
return false;
|
|
}
|
|
@@ -1466,6 +1468,7 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
|
|
key = cryptonote::encrypt_key(key, passphrase);
|
|
if (!crypto::ElectrumWords::bytes_to_words(key, electrum_words, seed_language))
|
|
{
|
|
+ THROW_WALLET_EXCEPTION(error::wallet_internal_error, "Failed to create seed from key for language: "+seed_language+", falling back to English.");
|
|
std::cout << "Failed to create seed from key for language: " << seed_language << ", falling back to English." << std::endl;
|
|
crypto::ElectrumWords::bytes_to_words(key, electrum_words, "English");
|
|
}
|
|
--
|
|
2.39.2
|
|
|