Skip to content
Permalink
Browse files

Merge pull request #5532

46244dd wallet_rpc_server: use original addresses in destinations in get_transfers (moneromooo-monero)
  • Loading branch information...
luigi1111 committed May 14, 2019
2 parents 14723fc + 46244dd commit eedf5106f5639dd58259380aaddcb9403625c9d4
Showing with 9 additions and 1 deletion.
  1. +9 −1 src/wallet/wallet_rpc_server.cpp
@@ -394,7 +394,7 @@ namespace tools
entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount;
td.address = get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr);
td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original;
}

entry.type = "out";
@@ -419,6 +419,14 @@ namespace tools
entry.amount = pd.m_amount_in - pd.m_change - entry.fee;
entry.unlock_time = pd.m_tx.unlock_time;
entry.note = m_wallet->get_tx_note(txid);

for (const auto &d: pd.m_dests) {
entry.destinations.push_back(wallet_rpc::transfer_destination());
wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount;
td.address = d.original.empty() ? get_account_address_as_str(m_wallet->nettype(), d.is_subaddress, d.addr) : d.original;
}

entry.type = is_failed ? "failed" : "pending";
entry.subaddr_index = { pd.m_subaddr_account, 0 };
for (uint32_t i: pd.m_subaddr_indices)

0 comments on commit eedf510

Please sign in to comment.
You can’t perform that action at this time.