diff options
| author | cyan <cyjan@mrcyjanek.net> | 2025-02-20 15:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-20 15:12:58 +0100 |
| commit | 991a0d0c97bce6ae8671dc763dd03876dfa9ea8a (patch) | |
| tree | dd3ea422437bab03a774676868afb2216e13d5f3 /patches/monero/0005-use-proper-error-handling-in-get_seed.patch | |
| parent | 65608c09e9093f1cd42c6afd8e9131016c82574b (diff) | |
[monero] update to latest v0.18 (#122)v0.18.4.0-RC1
* monero update
* update checksum
Diffstat (limited to 'patches/monero/0005-use-proper-error-handling-in-get_seed.patch')
| -rw-r--r-- | patches/monero/0005-use-proper-error-handling-in-get_seed.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/patches/monero/0005-use-proper-error-handling-in-get_seed.patch b/patches/monero/0005-use-proper-error-handling-in-get_seed.patch deleted file mode 100644 index 3562b7b..0000000 --- a/patches/monero/0005-use-proper-error-handling-in-get_seed.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 6be87b2c75ea663e205f468c986809755839afa3 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto <cyjan@mrcyjanek.net> -Date: Mon, 24 Jun 2024 10:49:12 +0200 -Subject: [PATCH 05/14] use proper error handling in get_seed - ---- - src/wallet/api/wallet.cpp | 17 ++++++++++++----- - src/wallet/wallet2.cpp | 5 ++++- - 2 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp -index 0d85cf3..dfbf4fd 100644 ---- a/src/wallet/api/wallet.cpp -+++ b/src/wallet/api/wallet.cpp -@@ -826,12 +826,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(); -+ } - } - - std::string WalletImpl::getSeedLanguage() const -diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 7913d55..debc0c2 100644 ---- a/src/wallet/wallet2.cpp -+++ b/src/wallet/wallet2.cpp -@@ -1440,11 +1440,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; - } -@@ -1454,8 +1456,9 @@ 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 << std::endl; -- return false; -+ crypto::ElectrumWords::bytes_to_words(key, electrum_words, "English"); - } - - return true; --- -2.39.5 (Apple Git-154) - |
