diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-06-24 14:32:49 +0200 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-06-24 14:36:29 +0200 |
| commit | 57f19be240a40e15e6f58d4b3945ea75bdc61279 (patch) | |
| tree | eb4e5194a05e479b79e3d6a5ee43a323be4608fb /patches/monero | |
| parent | 45e26e7f64484a07504c385eb73e3d40ec96e16c (diff) | |
return error code instead of just crashing :)
Diffstat (limited to 'patches/monero')
| -rw-r--r-- | patches/monero/0014-use-proper-error-handling-in-get_seed.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/patches/monero/0014-use-proper-error-handling-in-get_seed.patch b/patches/monero/0014-use-proper-error-handling-in-get_seed.patch deleted file mode 100644 index 05f64e6..0000000 --- a/patches/monero/0014-use-proper-error-handling-in-get_seed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 16966fc29e6f75e1d88cd8c5a6307a1ccf85794f Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto <cyjan@mrcyjanek.net> -Date: Mon, 24 Jun 2024 10:49:12 +0200 -Subject: [PATCH] use proper error handling in get_seed - ---- - src/wallet/wallet2.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index 23b56810e..f7bdf2429 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 - |
