Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplewallet: fix in show_transfer passing wrong arg to wallet2::get_payments etc

Browse Source
This commit is contained in:
stoffu 2017-11-06 11:49:20 +09:00
parent f48aeab5c4
commit fc85d7a998
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -5469,7 +5469,7 @@ bool simple_wallet::show_transfer(const std::vector<std::string> &args)
const uint64_t last_block_height = m_wallet->get_blockchain_current_height(); const uint64_t last_block_height = m_wallet->get_blockchain_current_height();
std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments; std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments;
m_wallet->get_payments(payments, 0, m_current_subaddress_account); m_wallet->get_payments(payments, 0, (uint64_t)-1, m_current_subaddress_account);
for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) { for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) {
const tools::wallet2::payment_details &pd = i->second; const tools::wallet2::payment_details &pd = i->second;
if (pd.m_tx_hash == txid) { if (pd.m_tx_hash == txid) {
@ -5540,7 +5540,7 @@ bool simple_wallet::show_transfer(const std::vector<std::string> &args)
{ {
m_wallet->update_pool_state(); m_wallet->update_pool_state();
std::list<std::pair<crypto::hash, tools::wallet2::pool_payment_details>> pool_payments; std::list<std::pair<crypto::hash, tools::wallet2::pool_payment_details>> pool_payments;
m_wallet->get_unconfirmed_payments(pool_payments); m_wallet->get_unconfirmed_payments(pool_payments, m_current_subaddress_account);
for (std::list<std::pair<crypto::hash, tools::wallet2::pool_payment_details>>::const_iterator i = pool_payments.begin(); i != pool_payments.end(); ++i) { for (std::list<std::pair<crypto::hash, tools::wallet2::pool_payment_details>>::const_iterator i = pool_payments.begin(); i != pool_payments.end(); ++i) {
const tools::wallet2::payment_details &pd = i->second.m_pd; const tools::wallet2::payment_details &pd = i->second.m_pd;
if (pd.m_tx_hash == txid) if (pd.m_tx_hash == txid)
@ -5567,7 +5567,7 @@ bool simple_wallet::show_transfer(const std::vector<std::string> &args)
} }
std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>> upayments; std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>> upayments;
m_wallet->get_unconfirmed_payments_out(upayments); m_wallet->get_unconfirmed_payments_out(upayments, m_current_subaddress_account);
for (std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) { for (std::list<std::pair<crypto::hash, tools::wallet2::unconfirmed_transfer_details>>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) {
if (i->first == txid) if (i->first == txid)
{ {