rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 22:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7538

Browse Source 
1851f26 wallet_api: add seed_offset param to seed() (tobtoht)
This commit is contained in:
luigi1111 2021-03-29 21:47:40 -04:00
commit 0607a10696
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/api/wallet.cpp
View File

@ -791,11 +791,11 @@ bool WalletImpl::close(bool store)
return result; return result;
} }
std::string WalletImpl::seed() const std::string WalletImpl::seed(const std::string& seed_offset) const
{ {
epee::wipeable_string seed; epee::wipeable_string seed;
if (m_wallet) if (m_wallet)
m_wallet->get_seed(seed); m_wallet->get_seed(seed, seed_offset);
return std::string(seed.data(), seed.size()); // TODO return std::string(seed.data(), seed.size()); // TODO
} }

2
src/wallet/api/wallet.h
View File

@ -81,7 +81,7 @@ public:
const std::string &device_name); const std::string &device_name);
Device getDeviceType() const override; Device getDeviceType() const override;
bool close(bool store = true); 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; std::string getSeedLanguage() const override;
void setSeedLanguage(const std::string &arg) override; void setSeedLanguage(const std::string &arg) override;
// void setListener(Listener *) {} // void setListener(Listener *) {}

2
src/wallet/api/wallet2_api.h
View File

@ -446,7 +446,7 @@ struct Wallet
}; };
virtual ~Wallet() = 0; 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 std::string getSeedLanguage() const = 0;
virtual void setSeedLanguage(const std::string &arg) = 0; virtual void setSeedLanguage(const std::string &arg) = 0;
//! returns wallet status (Status_Ok | Status_Error) //! returns wallet status (Status_Ok | Status_Error)