diff options
author | luigi1111 <luigi1111w@gmail.com> | 2021-03-29 21:47:40 -0400 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2021-03-29 21:47:40 -0400 |
commit | 0607a106964b794199118c4ac2a267d05c1ecc45 (patch) | |
tree | bea6e44666761917aeae06e1a99bc030357f6dcf | |
parent | Merge pull request #7520 (diff) | |
parent | wallet_api: add seed_offset param to seed() (diff) | |
download | monero-0607a106964b794199118c4ac2a267d05c1ecc45.tar.xz |
Merge pull request #7538
1851f26 wallet_api: add seed_offset param to seed() (tobtoht)
-rw-r--r-- | src/wallet/api/wallet.cpp | 4 | ||||
-rw-r--r-- | src/wallet/api/wallet.h | 2 | ||||
-rw-r--r-- | src/wallet/api/wallet2_api.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 4f923ce54..71f0891ca 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -791,11 +791,11 @@ bool WalletImpl::close(bool store) return result; } -std::string WalletImpl::seed() const +std::string WalletImpl::seed(const std::string& seed_offset) const { epee::wipeable_string seed; if (m_wallet) - m_wallet->get_seed(seed); + m_wallet->get_seed(seed, seed_offset); return std::string(seed.data(), seed.size()); // TODO } diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index e501d3943..917f512e5 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -81,7 +81,7 @@ public: const std::string &device_name); Device getDeviceType() const override; bool close(bool store = true); - std::string seed() const override; + std::string seed(const std::string& seed_offset = "") const override; std::string getSeedLanguage() const override; void setSeedLanguage(const std::string &arg) override; // void setListener(Listener *) {} diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h index b40b6763f..47a75ad43 100644 --- a/src/wallet/api/wallet2_api.h +++ b/src/wallet/api/wallet2_api.h @@ -446,7 +446,7 @@ struct Wallet }; virtual ~Wallet() = 0; - virtual std::string seed() const = 0; + virtual std::string seed(const std::string& seed_offset = "") const = 0; virtual std::string getSeedLanguage() const = 0; virtual void setSeedLanguage(const std::string &arg) = 0; //! returns wallet status (Status_Ok | Status_Error) |