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 #4361 

26971d46 WalletAPI: 'hasMultisigPartialKeyImages' function added (naughtyfox)
This commit is contained in:
Riccardo Spagni 2018-09-18 17:58:53 +02:00
parent 08f0c60ffc 26971d46fc
commit 535bd0eb7e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1244,6 +1244,20 @@ size_t WalletImpl::importMultisigImages(const vector<string>& images) {
return 0; return 0;
} }
bool WalletImpl::hasMultisigPartialKeyImages() const {
try {
clearStatus();
checkMultisigWalletReady(m_wallet);
return m_wallet->has_multisig_partial_key_images();
} catch (const exception& e) {
LOG_ERROR("Error on checking for partial multisig key images: ") << e.what();
setStatusError(string(tr("Failed to check for partial multisig key images: ")) + e.what());
}
return false;
}
PendingTransaction* WalletImpl::restoreMultisigTransaction(const string& signData) { PendingTransaction* WalletImpl::restoreMultisigTransaction(const string& signData) {
try { try {
clearStatus(); clearStatus();

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

@ -139,6 +139,7 @@ public:
bool finalizeMultisig(const std::vector<std::string>& extraMultisigInfo) override; bool finalizeMultisig(const std::vector<std::string>& extraMultisigInfo) override;
bool exportMultisigImages(std::string& images) override; bool exportMultisigImages(std::string& images) override;
size_t importMultisigImages(const std::vector<std::string>& images) override; size_t importMultisigImages(const std::vector<std::string>& images) override;
bool hasMultisigPartialKeyImages() const override;
PendingTransaction* restoreMultisigTransaction(const std::string& signData) override; PendingTransaction* restoreMultisigTransaction(const std::string& signData) override;
PendingTransaction * createTransaction(const std::string &dst_addr, const std::string &payment_id, PendingTransaction * createTransaction(const std::string &dst_addr, const std::string &payment_id,

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

@ -720,6 +720,11 @@ struct Wallet
* @return number of imported images * @return number of imported images
*/ */
virtual size_t importMultisigImages(const std::vector<std::string>& images) = 0; virtual size_t importMultisigImages(const std::vector<std::string>& images) = 0;
/**
* @brief hasMultisigPartialKeyImages - checks if wallet needs to import multisig key images from other participants
* @return true if there are partial key images
*/
virtual bool hasMultisigPartialKeyImages() const = 0;
/** /**
* @brief restoreMultisigTransaction creates PendingTransaction from signData * @brief restoreMultisigTransaction creates PendingTransaction from signData