summaryrefslogtreecommitdiff
path: root/patches/monero/0009-Add-recoverDeterministicWalletFromSpendKey.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/0009-Add-recoverDeterministicWalletFromSpendKey.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/0009-Add-recoverDeterministicWalletFromSpendKey.patch')
-rw-r--r--patches/monero/0009-Add-recoverDeterministicWalletFromSpendKey.patch153
1 files changed, 0 insertions, 153 deletions
diff --git a/patches/monero/0009-Add-recoverDeterministicWalletFromSpendKey.patch b/patches/monero/0009-Add-recoverDeterministicWalletFromSpendKey.patch
deleted file mode 100644
index 0ef9900..0000000
--- a/patches/monero/0009-Add-recoverDeterministicWalletFromSpendKey.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From ff4d7f9500e6aca57a78d94599a70b7823ea6ecd Mon Sep 17 00:00:00 2001
-From: Konstantin Ullrich <konstantinullrich12@gmail.com>
-Date: Wed, 11 Oct 2023 16:47:59 +0200
-Subject: [PATCH 09/16] Add recoverDeterministicWalletFromSpendKey
-
-This function is used by Cake Wallet to enable polyseed (dart implementation)
-support.
-
-Sourced from the following commit:
-https://github.com/cake-tech/monero/commit/cb6fb5ab218878702ed151c0e3d5d68eb2732788
-
-Co-authored-by: Godwin Asuquo <godilite@gmail.com>
----
- src/wallet/api/wallet.cpp | 29 +++++++++++++++++++++++++++++
- src/wallet/api/wallet.h | 4 ++++
- src/wallet/api/wallet2_api.h | 19 +++++++++++++++++++
- src/wallet/api/wallet_manager.cpp | 16 ++++++++++++++++
- src/wallet/api/wallet_manager.h | 7 +++++++
- 5 files changed, 75 insertions(+)
-
-diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
-index 2106dbd07..ec4ae51ff 100644
---- a/src/wallet/api/wallet.cpp
-+++ b/src/wallet/api/wallet.cpp
-@@ -820,6 +820,35 @@ bool WalletImpl::recover(const std::string &path, const std::string &password, c
- return status() == Status_Ok;
- }
-
-+bool WalletImpl::recoverDeterministicWalletFromSpendKey(const std::string &path, const std::string &password, const std::string &language, const std::string &spendkey_string)
-+{
-+ clearStatus();
-+ m_errorString.clear();
-+
-+ m_recoveringFromSeed = true;
-+ m_recoveringFromDevice = false;
-+
-+ // parse spend key
-+ crypto::secret_key spendkey;
-+ if (!spendkey_string.empty()) {
-+ cryptonote::blobdata spendkey_data;
-+ if(!epee::string_tools::parse_hexstr_to_binbuff(spendkey_string, spendkey_data) || spendkey_data.size() != sizeof(crypto::secret_key))
-+ {
-+ setStatusError(tr("failed to parse secret spend key"));
-+ return false;
-+ }
-+ spendkey = *reinterpret_cast<const crypto::secret_key*>(spendkey_data.data());
-+ }
-+
-+ try {
-+ m_wallet->generate(path, password, spendkey, true, false);
-+ setSeedLanguage(language);
-+ } catch (const std::exception &e) {
-+ setStatusCritical(e.what());
-+ }
-+ return status() == Status_Ok;
-+}
-+
- bool WalletImpl::close(bool store)
- {
-
-diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
-index 4a16ca028..d0f443abc 100644
---- a/src/wallet/api/wallet.h
-+++ b/src/wallet/api/wallet.h
-@@ -77,6 +77,10 @@ public:
- const std::string &address_string,
- const std::string &viewkey_string,
- const std::string &spendkey_string = "");
-+ bool recoverDeterministicWalletFromSpendKey(const std::string &path,
-+ const std::string &password,
-+ const std::string &language,
-+ const std::string &spendkey_string);
- bool recoverFromDevice(const std::string &path,
- const std::string &password,
- const std::string &device_name);
-diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
-index 8a5c4135e..a585c8212 100644
---- a/src/wallet/api/wallet2_api.h
-+++ b/src/wallet/api/wallet2_api.h
-@@ -1302,6 +1302,25 @@ struct WalletManager
- return createWalletFromKeys(path, password, language, testnet ? TESTNET : MAINNET, restoreHeight, addressString, viewKeyString, spendKeyString);
- }
-
-+ /*!
-+ * \brief recover deterministic wallet from spend key.
-+ * \param path Name of wallet file to be created
-+ * \param password Password of wallet file
-+ * \param language language
-+ * \param nettype Network type
-+ * \param restoreHeight restore from start height
-+ * \param spendKeyString spend key
-+ * \param kdf_rounds Number of rounds for key derivation function
-+ * \return Wallet instance (Wallet::status() needs to be called to check if recovered successfully)
-+ */
-+ virtual Wallet * createDeterministicWalletFromSpendKey(const std::string &path,
-+ const std::string &password,
-+ const std::string &language,
-+ NetworkType nettype,
-+ uint64_t restoreHeight,
-+ const std::string &spendKeyString,
-+ uint64_t kdf_rounds = 1) = 0;
-+
- /*!
- * \deprecated this method creates a wallet WITHOUT a passphrase, use createWalletFromKeys(..., password, ...) instead
- * \brief recovers existing wallet using keys. Creates a view only wallet if spend key is omitted
-diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
-index c79fe25d6..f88bd9e64 100644
---- a/src/wallet/api/wallet_manager.cpp
-+++ b/src/wallet/api/wallet_manager.cpp
-@@ -127,6 +127,22 @@ Wallet *WalletManagerImpl::createWalletFromKeys(const std::string &path,
- return wallet;
- }
-
-+Wallet *WalletManagerImpl::createDeterministicWalletFromSpendKey(const std::string &path,
-+ const std::string &password,
-+ const std::string &language,
-+ NetworkType nettype,
-+ uint64_t restoreHeight,
-+ const std::string &spendkey_string,
-+ uint64_t kdf_rounds)
-+{
-+ WalletImpl * wallet = new WalletImpl(nettype, kdf_rounds);
-+ if(restoreHeight > 0){
-+ wallet->setRefreshFromBlockHeight(restoreHeight);
-+ }
-+ wallet->recoverDeterministicWalletFromSpendKey(path, password, language, spendkey_string);
-+ return wallet;
-+}
-+
- Wallet *WalletManagerImpl::createWalletFromDevice(const std::string &path,
- const std::string &password,
- NetworkType nettype,
-diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h
-index 28fcd36c9..be3ff8184 100644
---- a/src/wallet/api/wallet_manager.h
-+++ b/src/wallet/api/wallet_manager.h
-@@ -67,6 +67,13 @@ public:
- const std::string &addressString,
- const std::string &viewKeyString,
- const std::string &spendKeyString = "") override;
-+ virtual Wallet * createDeterministicWalletFromSpendKey(const std::string &path,
-+ const std::string &password,
-+ const std::string &language,
-+ NetworkType nettype,
-+ uint64_t restoreHeight,
-+ const std::string &spendkey_string,
-+ uint64_t kdf_rounds) override;
- virtual Wallet * createWalletFromDevice(const std::string &path,
- const std::string &password,
- NetworkType nettype,
---
-2.39.2
-