summaryrefslogtreecommitdiff
path: root/patches/monero/0015-use-proper-error-handling-in-get_seed.patch
diff options
context:
space:
mode:
authorcyan <cyjan@mrcyjanek.net>2024-12-04 10:22:48 -0500
committerGitHub <noreply@github.com>2024-12-04 10:22:48 -0500
commit2a38bf29618a8ce163f9d6f83b7ae86924752e32 (patch)
tree585af02d98d0d042d7b873c5af96b80ddf776b08 /patches/monero/0015-use-proper-error-handling-in-get_seed.patch
parent40c1a1bda4b6f125c702f5a37ecc48a6ebec24b8 (diff)
cleanup patches (and other stuff) (#79)
* cleanup patches * fix polyseed patch * Fix iOS builds * fix polyseed dependencies * fix polyseed patch for macOS * update ledger patch * update wownero patches and version * update checksums * wip" * update gitmodules * update boost build script * update build_single.sh * vix verbosey_copy * fix __clear_cache bug on wownero * update randomwow * migrate build system * fix cross compilation issues * some more build issue * update polyseed * cleanup cmakelists * fix toolchain.cmake.in * add ssp * another attempt at building windows on CI * fix package name * migrate mirror to my own hosting * change download mirror priority (fallback first) * link ssp in monero module as well by using CMAKE_{C,CXX}_FLAGS * fix android builds * update polyseed source * 13 -> trixie * fix package name conflicts, update runner to sid * update boost to 1_84_0, disable patch that's no longer needed * switch to ubuntu:24.04 * add POLYSEED_STATIC to toolchain.cmake.in in order to properly link * drop patches * fixes to darwin * link missing wowner-seed library * a litte bit more of experiments * build locale only on windows * update iconv * update definitions * update ci builds * update my progress * ios fix, update depends, ci * multithread build system * fix android, mingw and linux build issues * remove dependency check * update Dockerfile to include pigz * show a message when pigz is missing * fix devcontainer mingw setup (missing ENV) * update android build runner * sailfishos dropped (you better go behave yourself and run actual linux programs) * fiz pigz issues * install llvm-ranlib for android * fix iOS build issues * fix dummy ledger patch * fix macos and darwin * fix macos ci * fix macos build command * install autoconf * add automake * add libtool * macos fixes, wownero fixes, idk what else, please help me * fix wownero iOS build * Cleanup patches * add try-catch into monero code * fix error handling * update checksums
Diffstat (limited to 'patches/monero/0015-use-proper-error-handling-in-get_seed.patch')
-rw-r--r--patches/monero/0015-use-proper-error-handling-in-get_seed.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/patches/monero/0015-use-proper-error-handling-in-get_seed.patch b/patches/monero/0015-use-proper-error-handling-in-get_seed.patch
deleted file mode 100644
index aef7dcf..0000000
--- a/patches/monero/0015-use-proper-error-handling-in-get_seed.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
-