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 new file mode 100644 index 00000000..05f64e67 --- /dev/null +++ b/patches/monero/0014-use-proper-error-handling-in-get_seed.patch @@ -0,0 +1,38 @@ +From 16966fc29e6f75e1d88cd8c5a6307a1ccf85794f Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +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 + diff --git a/patches/wownero/0013-use-proper-error-handling-in-get_seed.patch b/patches/wownero/0013-use-proper-error-handling-in-get_seed.patch new file mode 100644 index 00000000..1ec69963 --- /dev/null +++ b/patches/wownero/0013-use-proper-error-handling-in-get_seed.patch @@ -0,0 +1,38 @@ +From 5854ceb70da0677ab74abc5153549c965780b445 Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +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 2b3eaad2e..4073974d9 100644 +--- a/src/wallet/wallet2.cpp ++++ b/src/wallet/wallet2.cpp +@@ -1445,11 +1445,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; + } +@@ -1459,6 +1461,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 +