monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 20:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2916

Browse source 
a9217641 wallet-rpc: added receiving address to res of get(_bulk)_payments; selective addresses for getaddress (stoffu)
This commit is contained in:
Riccardo Spagni 2017-12-25 21:17:15 +02:00
commit 8b40bc27a2
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/wallet/wallet_rpc_server.cpp
View file

@ -356,13 +356,24 @@ namespace tools
if (!m_wallet) return not_open(er); if (!m_wallet) return not_open(er);
try try
{ {
res.addresses.resize(m_wallet->get_num_subaddresses(req.account_index)); res.addresses.clear();
std::vector<uint32_t> req_address_index;
if (req.address_index.empty())
{
for (uint32_t i = 0; i < m_wallet->get_num_subaddresses(req.account_index); ++i)
req_address_index.push_back(i);
}
else
{
req_address_index = req.address_index;
}
tools::wallet2::transfer_container transfers; tools::wallet2::transfer_container transfers;
m_wallet->get_transfers(transfers); m_wallet->get_transfers(transfers);
cryptonote::subaddress_index index = {req.account_index, 0}; for (uint32_t i : req_address_index)
for (; index.minor < m_wallet->get_num_subaddresses(req.account_index); ++index.minor)
{ {
auto& info = res.addresses[index.minor]; res.addresses.resize(res.addresses.size() + 1);
auto& info = res.addresses.back();
const cryptonote::subaddress_index index = {req.account_index, i};
info.address = m_wallet->get_subaddress_as_str(index); info.address = m_wallet->get_subaddress_as_str(index);
info.label = m_wallet->get_subaddress_label(index); info.label = m_wallet->get_subaddress_label(index);
info.address_index = index.minor; info.address_index = index.minor;
@ -1254,6 +1265,7 @@ namespace tools
rpc_payment.block_height = payment.m_block_height; rpc_payment.block_height = payment.m_block_height;
rpc_payment.unlock_time = payment.m_unlock_time; rpc_payment.unlock_time = payment.m_unlock_time;
rpc_payment.subaddr_index = payment.m_subaddr_index; rpc_payment.subaddr_index = payment.m_subaddr_index;
rpc_payment.address = m_wallet->get_subaddress_as_str(payment.m_subaddr_index);
res.payments.push_back(rpc_payment); res.payments.push_back(rpc_payment);
} }
@ -1281,6 +1293,7 @@ namespace tools
rpc_payment.block_height = payment.second.m_block_height; rpc_payment.block_height = payment.second.m_block_height;
rpc_payment.unlock_time = payment.second.m_unlock_time; rpc_payment.unlock_time = payment.second.m_unlock_time;
rpc_payment.subaddr_index = payment.second.m_subaddr_index; rpc_payment.subaddr_index = payment.second.m_subaddr_index;
rpc_payment.address = m_wallet->get_subaddress_as_str(payment.second.m_subaddr_index);
res.payments.push_back(std::move(rpc_payment)); res.payments.push_back(std::move(rpc_payment));
} }
@ -1331,6 +1344,7 @@ namespace tools
rpc_payment.block_height = payment.m_block_height; rpc_payment.block_height = payment.m_block_height;
rpc_payment.unlock_time = payment.m_unlock_time; rpc_payment.unlock_time = payment.m_unlock_time;
rpc_payment.subaddr_index = payment.m_subaddr_index; rpc_payment.subaddr_index = payment.m_subaddr_index;
rpc_payment.address = m_wallet->get_subaddress_as_str(payment.m_subaddr_index);
res.payments.push_back(std::move(rpc_payment)); res.payments.push_back(std::move(rpc_payment));
} }
} }

4
src/wallet/wallet_rpc_server_commands_defs.h
View file

@ -95,8 +95,10 @@ namespace wallet_rpc
struct request struct request
{ {
uint32_t account_index; uint32_t account_index;
std::vector<uint32_t> address_index;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(account_index) KV_SERIALIZE(account_index)
KV_SERIALIZE(address_index)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
@ -601,6 +603,7 @@ namespace wallet_rpc
uint64_t block_height; uint64_t block_height;
uint64_t unlock_time; uint64_t unlock_time;
cryptonote::subaddress_index subaddr_index; cryptonote::subaddress_index subaddr_index;
std::string address;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(payment_id) KV_SERIALIZE(payment_id)
@ -609,6 +612,7 @@ namespace wallet_rpc
KV_SERIALIZE(block_height) KV_SERIALIZE(block_height)
KV_SERIALIZE(unlock_time) KV_SERIALIZE(unlock_time)
KV_SERIALIZE(subaddr_index) KV_SERIALIZE(subaddr_index)
KV_SERIALIZE(address)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };