rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 21:03:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2121

Browse Source 
5a09d79c Fix #2120: return per-tx amount in transfer_split RPC call. (binaryFate)
This commit is contained in:
Riccardo Spagni 2017-07-03 12:28:56 +02:00
commit 645c898e2d
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet_rpc_server.cpp
View File

@ -509,6 +509,7 @@ namespace tools
try try
{ {
uint64_t mixin = req.mixin; uint64_t mixin = req.mixin;
uint64_t ptx_amount;
if (mixin < 2 && m_wallet->use_fork_rules(2, 10)) { if (mixin < 2 && m_wallet->use_fork_rules(2, 10)) {
LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2"); LOG_PRINT_L1("Requested mixin " << req.mixin << " too low for hard fork 2, using 2");
mixin = 2; mixin = 2;
@ -530,6 +531,12 @@ namespace tools
{ {
res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key)); res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key));
} }
// Compute amount leaving wallet in tx. By convention dests does not include change outputs
ptx_amount = 0;
for(auto & dt: ptx.dests)
ptx_amount += dt.amount;
res.amount_list.push_back(ptx_amount);
res.fee_list.push_back(ptx.fee); res.fee_list.push_back(ptx.fee);
} }

2
src/wallet/wallet_rpc_server_commands_defs.h
View File

@ -180,11 +180,13 @@ namespace wallet_rpc
{ {
std::list<std::string> tx_hash_list; std::list<std::string> tx_hash_list;
std::list<std::string> tx_key_list; std::list<std::string> tx_key_list;
std::list<uint64_t> amount_list;
std::list<uint64_t> fee_list; std::list<uint64_t> fee_list;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(tx_hash_list) KV_SERIALIZE(tx_hash_list)
KV_SERIALIZE(tx_key_list) KV_SERIALIZE(tx_key_list)
KV_SERIALIZE(amount_list)
KV_SERIALIZE(fee_list) KV_SERIALIZE(fee_list)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };