monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7746

Browse source 
1aa1850 wallet_api: signMessage: add sign with subaddress (tobtoht)
This commit is contained in:
luigi1111 2021-06-24 14:06:13 -05:00
commit 99aa45fd34
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/wallet/api/wallet.cpp
View file

@ -2058,11 +2058,26 @@ bool WalletImpl::checkReserveProof(const std::string &address, const std::string
} }
} }
std::string WalletImpl::signMessage(const std::string &message) std::string WalletImpl::signMessage(const std::string &message, const std::string &address)
{ {
if (address.empty()) {
return m_wallet->sign(message, tools::wallet2::sign_with_spend_key); return m_wallet->sign(message, tools::wallet2::sign_with_spend_key);
} }
cryptonote::address_parse_info info;
if (!cryptonote::get_account_address_from_str(info, m_wallet->nettype(), address)) {
setStatusError(tr("Failed to parse address"));
return "";
}
auto index = m_wallet->get_subaddress_index(info.address);
if (!index) {
setStatusError(tr("Address doesn't belong to the wallet"));
return "";
}
return m_wallet->sign(message, tools::wallet2::sign_with_spend_key, *index);
}
bool WalletImpl::verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const bool WalletImpl::verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const
{ {
cryptonote::address_parse_info info; cryptonote::address_parse_info info;

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

@ -196,7 +196,7 @@ public:
virtual bool checkSpendProof(const std::string &txid, const std::string &message, const std::string &signature, bool &good) const override; virtual bool checkSpendProof(const std::string &txid, const std::string &message, const std::string &signature, bool &good) const override;
virtual std::string getReserveProof(bool all, uint32_t account_index, uint64_t amount, const std::string &message) const override; virtual std::string getReserveProof(bool all, uint32_t account_index, uint64_t amount, const std::string &message) const override;
virtual bool checkReserveProof(const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &total, uint64_t &spent) const override; virtual bool checkReserveProof(const std::string &address, const std::string &message, const std::string &signature, bool &good, uint64_t &total, uint64_t &spent) const override;
virtual std::string signMessage(const std::string &message) override; virtual std::string signMessage(const std::string &message, const std::string &address) override;
virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const override; virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const override;
virtual std::string signMultisigParticipant(const std::string &message) const override; virtual std::string signMultisigParticipant(const std::string &message) const override;
virtual bool verifyMessageWithPublicKey(const std::string &message, const std::string &publicKey, const std::string &signature) const override; virtual bool verifyMessageWithPublicKey(const std::string &message, const std::string &publicKey, const std::string &signature) const override;

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

@ -993,7 +993,7 @@ struct Wallet
* \param message - the message to sign (arbitrary byte data) * \param message - the message to sign (arbitrary byte data)
* \return the signature * \return the signature
*/ */
virtual std::string signMessage(const std::string &message) = 0; virtual std::string signMessage(const std::string &message, const std::string &address = "") = 0;
/*! /*!
* \brief verifySignedMessage - verify a signature matches a given message * \brief verifySignedMessage - verify a signature matches a given message
* \param message - the message (arbitrary byte data) * \param message - the message (arbitrary byte data)