|
|
|
@ -7747,7 +7747,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
|
|
|
|
|
uint64_t fee = pd.m_amount_in - pd.m_amount_out;
|
|
|
|
|
std::vector<std::pair<std::string, uint64_t>> destinations;
|
|
|
|
|
for (const auto &d: pd.m_dests) {
|
|
|
|
|
destinations.push_back({get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr), d.amount});
|
|
|
|
|
destinations.push_back({d.address(m_wallet->nettype(), pd.m_payment_id), d.amount});
|
|
|
|
|
}
|
|
|
|
|
std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id);
|
|
|
|
|
if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
|
|
|
|
@ -7823,7 +7823,7 @@ bool simple_wallet::get_transfers(std::vector<std::string>& local_args, std::vec
|
|
|
|
|
uint64_t fee = amount - pd.m_amount_out;
|
|
|
|
|
std::vector<std::pair<std::string, uint64_t>> destinations;
|
|
|
|
|
for (const auto &d: pd.m_dests) {
|
|
|
|
|
destinations.push_back({get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr), d.amount});
|
|
|
|
|
destinations.push_back({d.address(m_wallet->nettype(), pd.m_payment_id), d.amount});
|
|
|
|
|
}
|
|
|
|
|
std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id);
|
|
|
|
|
if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
|
|
|
|
@ -9236,7 +9236,7 @@ bool simple_wallet::show_transfer(const std::vector<std::string> &args)
|
|
|
|
|
for (const auto &d: pd.m_dests) {
|
|
|
|
|
if (!dests.empty())
|
|
|
|
|
dests += ", ";
|
|
|
|
|
dests += get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) + ": " + print_money(d.amount);
|
|
|
|
|
dests += d.address(m_wallet->nettype(), pd.m_payment_id) + ": " + print_money(d.amount);
|
|
|
|
|
}
|
|
|
|
|
std::string payment_id = string_tools::pod_to_hex(i->second.m_payment_id);
|
|
|
|
|
if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)
|
|
|
|
|