|
|
|
@ -1889,8 +1889,15 @@ namespace tools
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (req.account_index >= m_wallet->get_num_subaddress_accounts())
|
|
|
|
|
{
|
|
|
|
|
er.code = WALLET_RPC_ERROR_CODE_ACCOUNT_INDEX_OUT_OF_BOUNDS;
|
|
|
|
|
er.message = "Account index is out of bound";
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments;
|
|
|
|
|
m_wallet->get_payments(payments, 0);
|
|
|
|
|
m_wallet->get_payments(payments, 0, (uint64_t)-1, req.account_index);
|
|
|
|
|
for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) {
|
|
|
|
|
if (i->second.m_tx_hash == txid)
|
|
|
|
|
{
|
|
|
|
@ -1900,7 +1907,7 @@ namespace tools
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::list<std::pair<crypto::hash, tools::wallet2::confirmed_transfer_details>> payments_out;
|
|
|
|
|
m_wallet->get_payments_out(payments_out, 0);
|
|
|
|
|
m_wallet->get_payments_out(payments_out, 0, (uint64_t)-1, req.account_index);
|
|
|
|
|
for (std::list<std::pair<crypto::hash, tools::wallet2::confirmed_transfer_details>>::const_iterator i = payments_out.begin(); i != payments_out.end(); ++i) {
|
|
|
|
|
if (i->first == txid)
|
|
|
|
|
{
|
|
|
|
@ -1910,7 +1917,7 @@ namespace tools
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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, req.account_index);
|
|
|
|
|
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)
|
|
|
|
|
{
|
|
|
|
@ -1922,7 +1929,7 @@ namespace tools
|
|
|
|
|
m_wallet->update_pool_state();
|
|
|
|
|
|
|
|
|
|
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, req.account_index);
|
|
|
|
|
for (std::list<std::pair<crypto::hash, tools::wallet2::pool_payment_details>>::const_iterator i = pool_payments.begin(); i != pool_payments.end(); ++i) {
|
|
|
|
|
if (i->second.m_pd.m_tx_hash == txid)
|
|
|
|
|
{
|
|
|
|
|