diff options
| author | stoffu <stoffu@protonmail.ch> | 2017-09-12 10:05:41 +0900 |
|---|---|---|
| committer | stoffu <stoffu@protonmail.ch> | 2017-11-18 20:44:27 +0900 |
| commit | 998777ecd71fee25636f6ef40f05f88251d03e96 (patch) | |
| tree | d3cc8cf38b70cd10678e9ef1d3a36f2ac7e8386d /src/wallet/wallet2.h | |
| parent | Merge pull request #2818 (diff) | |
| download | monero-998777ecd71fee25636f6ef40f05f88251d03e96.tar.xz | |
Tx proof (revised):
- refactoring: proof generation/checking code was moved from simplewallet.cpp to wallet2.cpp
- allow an arbitrary message to be signed together with txid
- introduce two types (outbound & inbound) of tx proofs; with the same syntax, inbound is selected when <address> belongs to this wallet, outbound otherwise. see GitHub thread for more discussion
- wallet RPC: added get_tx_key, check_tx_key, get_tx_proof, check_tx_proof
- wallet API: moved WalletManagerImpl::checkPayment to Wallet::checkTxKey, added Wallet::getTxProof/checkTxProof
- get_tx_key/check_tx_key: handle additional tx keys by concatenating them into a single string
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 6e01d4e28..cff10fa11 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -684,6 +684,10 @@ namespace tools uint32_t get_confirm_backlog_threshold() const { return m_confirm_backlog_threshold; }; bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys) const; + void check_tx_key(const crypto::hash &txid, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, const cryptonote::account_public_address &address, uint64_t &received, bool &in_pool, uint64_t &confirmations); + void check_tx_key_helper(const crypto::hash &txid, const crypto::key_derivation &derivation, const std::vector<crypto::key_derivation> &additional_derivations, const cryptonote::account_public_address &address, uint64_t &received, bool &in_pool, uint64_t &confirmations); + std::string get_tx_proof(const crypto::hash &txid, const cryptonote::account_public_address &address, bool is_subaddress, const std::string &message, std::string &error_str); + bool check_tx_proof(const crypto::hash &txid, const cryptonote::account_public_address &address, bool is_subaddress, const std::string &message, const std::string &sig_str, uint64_t &received, bool &in_pool, uint64_t &confirmations); /*! * \brief GUI Address book get/store |