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

600353e2 fix wallet callback signatures (m2049r)
This commit is contained in:
Riccardo Spagni 2017-08-07 15:13:30 +02:00
parent ea46a5527a 600353e2b2
commit 15e895399c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ struct Wallet2CallbackImpl : public tools::i_wallet2_callback
} }
} }
virtual void on_money_received(uint64_t height, const crypto::hash &txid, uint64_t amount) virtual void on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t amount)
{ {
std::string tx_hash = epee::string_tools::pod_to_hex(txid); std::string tx_hash = epee::string_tools::pod_to_hex(txid);
@ -114,7 +114,7 @@ struct Wallet2CallbackImpl : public tools::i_wallet2_callback
} }
} }
virtual void on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, uint64_t amount) virtual void on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t amount)
{ {
std::string tx_hash = epee::string_tools::pod_to_hex(txid); std::string tx_hash = epee::string_tools::pod_to_hex(txid);
@ -129,8 +129,8 @@ struct Wallet2CallbackImpl : public tools::i_wallet2_callback
} }
} }
virtual void on_money_spent(uint64_t height, const crypto::hash &txid, uint64_t amount, virtual void on_money_spent(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& in_tx,
const cryptonote::transaction& spend_tx) uint64_t amount, const cryptonote::transaction& spend_tx)
{ {
// TODO; // TODO;
std::string tx_hash = epee::string_tools::pod_to_hex(txid); std::string tx_hash = epee::string_tools::pod_to_hex(txid);