From 57f19be240a40e15e6f58d4b3945ea75bdc61279 Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Mon, 24 Jun 2024 14:32:49 +0200
Subject: [PATCH] return error code instead of just crashing :)

---
 ...se-proper-error-handling-in-get_seed.patch | 38 -----------------
 ...se-proper-error-handling-in-get_seed.patch | 42 ++++++++++++++++---
 2 files changed, 36 insertions(+), 44 deletions(-)
 delete mode 100644 patches/monero/0014-use-proper-error-handling-in-get_seed.patch

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
-
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
index 1ec6996..892a827 100644
--- a/patches/wownero/0013-use-proper-error-handling-in-get_seed.patch
+++ b/patches/wownero/0013-use-proper-error-handling-in-get_seed.patch
@@ -1,17 +1,47 @@
-From 5854ceb70da0677ab74abc5153549c965780b445 Mon Sep 17 00:00:00 2001
+From 50e09195fcb79debf5951c69717b9d4f239ed8e1 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(+)
+ 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 ac3e6d51e..8bdd75a5a 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 2b3eaad2e..4073974d9 100644
+index 23b56810e..f7bdf2429 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
+@@ -1452,11 +1452,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab
    bool keys_deterministic = is_deterministic();
    if (!keys_deterministic)
    {
@@ -25,7 +55,7 @@ index 2b3eaad2e..4073974d9 100644
      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
+@@ -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))
    {