diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-04-17 08:47:13 +0200 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-04-17 08:47:29 +0200 |
| commit | dc26758a923b98f2ceb0c2e2e14e9792fff8ca15 (patch) | |
| tree | 948b32530852e35a981128a9abe851624eae1871 /patches/monero/0004-use-proper-error-handling-in-get_seed.patch | |
| parent | ab6a4ebb8be0e5a71da5d3705f6eff782b651699 (diff) | |
wip: initial FCMP
Diffstat (limited to 'patches/monero/0004-use-proper-error-handling-in-get_seed.patch')
| -rw-r--r-- | patches/monero/0004-use-proper-error-handling-in-get_seed.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/monero/0004-use-proper-error-handling-in-get_seed.patch b/patches/monero/0004-use-proper-error-handling-in-get_seed.patch index 154fa90..465cc60 100644 --- a/patches/monero/0004-use-proper-error-handling-in-get_seed.patch +++ b/patches/monero/0004-use-proper-error-handling-in-get_seed.patch @@ -1,7 +1,7 @@ -From 9174c5ab87a00d16e2930616686de5e57f3e7539 Mon Sep 17 00:00:00 2001 +From beeda121f0457f5f6aeeedd55e07e0b3485e936e Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto <cyjan@mrcyjanek.net> Date: Mon, 24 Jun 2024 10:49:12 +0200 -Subject: [PATCH 04/20] use proper error handling in get_seed +Subject: [PATCH 04/17] use proper error handling in get_seed --- src/wallet/api/wallet.cpp | 17 ++++++++++++----- @@ -9,10 +9,10 @@ Subject: [PATCH 04/20] use proper error handling in get_seed 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp -index c2f4176e2..6301bd1ef 100644 +index 4d72455b6..b6ce7b05a 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp -@@ -826,12 +826,19 @@ bool WalletImpl::close(bool store) +@@ -803,12 +803,19 @@ bool WalletImpl::close(bool store) std::string WalletImpl::seed(const std::string& seed_offset) const { @@ -38,10 +38,10 @@ index c2f4176e2..6301bd1ef 100644 std::string WalletImpl::getSeedLanguage() const diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index af876c9f3..ac2a1fec3 100644 +index d04bbe0da..2c2268f7a 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 +@@ -1459,11 +1459,13 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab bool keys_deterministic = is_deterministic(); if (!keys_deterministic) { @@ -55,7 +55,7 @@ index af876c9f3..ac2a1fec3 100644 std::cout << "seed_language not set" << std::endl; return false; } -@@ -1466,8 +1468,9 @@ bool wallet2::get_seed(epee::wipeable_string& electrum_words, const epee::wipeab +@@ -1473,8 +1475,9 @@ 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)) { @@ -67,5 +67,5 @@ index af876c9f3..ac2a1fec3 100644 return true; -- -2.50.1 (Apple Git-155) +2.51.0 |