d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

wallet: provide original address for outgoing transfers

Browse source
This commit is contained in:
xiphon 2019-07-07 17:45:13 +03:00
parent 6335509727
commit 884df82db3
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cryptonote_core/cryptonote_tx_utils.h
View file

@ -83,6 +83,21 @@ namespace cryptonote
tx_destination_entry(uint64_t a, const account_public_address &ad, bool is_subaddress) : amount(a), addr(ad), is_subaddress(is_subaddress), is_integrated(false) { } tx_destination_entry(uint64_t a, const account_public_address &ad, bool is_subaddress) : amount(a), addr(ad), is_subaddress(is_subaddress), is_integrated(false) { }
tx_destination_entry(const std::string &o, uint64_t a, const account_public_address &ad, bool is_subaddress) : original(o), amount(a), addr(ad), is_subaddress(is_subaddress), is_integrated(false) { } tx_destination_entry(const std::string &o, uint64_t a, const account_public_address &ad, bool is_subaddress) : original(o), amount(a), addr(ad), is_subaddress(is_subaddress), is_integrated(false) { }
std::string address(network_type nettype, const crypto::hash &payment_id) const
{
if (!original.empty())
{
return original;
}
if (is_integrated)
{
return get_account_integrated_address_as_str(nettype, addr, reinterpret_cast<const crypto::hash8 &>(payment_id));
}
return get_account_address_as_str(nettype, is_subaddress, addr);
}
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
FIELD(original) FIELD(original)
VARINT_FIELD(amount) VARINT_FIELD(amount)

6
src/simplewallet/simplewallet.cpp
View file

@ -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; uint64_t fee = pd.m_amount_in - pd.m_amount_out;
std::vector<std::pair<std::string, uint64_t>> destinations; std::vector<std::pair<std::string, uint64_t>> destinations;
for (const auto &d: pd.m_dests) { 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); 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) 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; uint64_t fee = amount - pd.m_amount_out;
std::vector<std::pair<std::string, uint64_t>> destinations; std::vector<std::pair<std::string, uint64_t>> destinations;
for (const auto &d: pd.m_dests) { 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); 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) 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) { for (const auto &d: pd.m_dests) {
if (!dests.empty()) if (!dests.empty())
dests += ", "; 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); 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) if (payment_id.substr(16).find_first_not_of('0') == std::string::npos)

2
src/wallet/api/transaction_history.cpp
View file

@ -181,7 +181,7 @@ void TransactionHistoryImpl::refresh()
// single output transaction might contain multiple transfers // single output transaction might contain multiple transfers
for (const auto &d: pd.m_dests) { for (const auto &d: pd.m_dests) {
ti->m_transfers.push_back({d.amount, get_account_address_as_str(m_wallet->m_wallet->nettype(), d.is_subaddress, d.addr)}); ti->m_transfers.push_back({d.amount, d.address(m_wallet->m_wallet->nettype(), pd.m_payment_id)});
} }
m_history.push_back(ti); m_history.push_back(ti);
} }

4
src/wallet/wallet_rpc_server.cpp
View file

@ -350,7 +350,7 @@ namespace tools
entry.destinations.push_back(wallet_rpc::transfer_destination()); entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back(); wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount; td.amount = d.amount;
td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original; td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
} }
entry.type = "out"; entry.type = "out";
@ -380,7 +380,7 @@ namespace tools
entry.destinations.push_back(wallet_rpc::transfer_destination()); entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back(); wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount; td.amount = d.amount;
td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original; td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
} }
entry.type = is_failed ? "failed" : "pending"; entry.type = is_failed ? "failed" : "pending";