tiamak/monero_c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use-proper-error-handling-in-get_seed.patch

Browse Source
This commit is contained in:
Czarek Nakamoto
2024-06-24 10:55:16 +02:00
parent 7d1950dbd5
commit 45e26e7f64
2 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/wownero/0013-use-proper-error-handling-in-get_seed.patch Normal file
View File

@@ -0,0 +1,38 @@
From 5854ceb70da0677ab74abc5153549c965780b445 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 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