Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7185 

50ff106 wallet api: allow wallet to fetch all key images via api (benevanoff)
This commit is contained in:
luigi1111 2021-02-15 21:42:30 -05:00
parent 4c410a1e3a 50ff1066f5
commit ba76a4d26e
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 5 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

@ -1168,7 +1168,7 @@ bool WalletImpl::submitTransaction(const string &fileName) {
return true; return true;
} }
bool WalletImpl::exportKeyImages(const string &filename) bool WalletImpl::exportKeyImages(const string &filename, bool all)
{ {
if (m_wallet->watch_only()) if (m_wallet->watch_only())
{ {
@ -1178,7 +1178,7 @@ bool WalletImpl::exportKeyImages(const string &filename)
try try
{ {
if (!m_wallet->export_key_images(filename)) if (!m_wallet->export_key_images(filename), all)
{ {
setStatusError(tr("failed to save file ") + filename); setStatusError(tr("failed to save file ") + filename);
return false; return false;

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

@ -164,7 +164,7 @@ public:
virtual PendingTransaction * createSweepUnmixableTransaction() override; virtual PendingTransaction * createSweepUnmixableTransaction() override;
bool submitTransaction(const std::string &fileName) override; bool submitTransaction(const std::string &fileName) override;
virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename) override; virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename) override;
bool exportKeyImages(const std::string &filename) override; bool exportKeyImages(const std::string &filename, bool all = false) override;
bool importKeyImages(const std::string &filename) override; bool importKeyImages(const std::string &filename) override;
virtual void disposeTransaction(PendingTransaction * t) override; virtual void disposeTransaction(PendingTransaction * t) override;

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

@ -901,9 +901,10 @@ struct Wallet
/*! /*!
* \brief exportKeyImages - exports key images to file * \brief exportKeyImages - exports key images to file
* \param filename * \param filename
* \param all - export all key images or only those that have not yet been exported
* \return - true on success * \return - true on success
*/ */
virtual bool exportKeyImages(const std::string &filename) = 0; virtual bool exportKeyImages(const std::string &filename, bool all = false) = 0;
/*! /*!
* \brief importKeyImages - imports key images from file * \brief importKeyImages - imports key images from file