kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1346

Browse source 
4eb7347 wallet: return fee in transfer RPC (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-11-17 16:40:37 +02:00
parent 5df6f0be80 4eb7347fdd
commit dbf2ab56c5
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet_rpc_server.cpp
View file

@ -263,6 +263,7 @@ namespace tools
{ {
res.tx_key = epee::string_tools::pod_to_hex(ptx_vector.back().tx_key); res.tx_key = epee::string_tools::pod_to_hex(ptx_vector.back().tx_key);
} }
res.fee = ptx_vector.back().fee;
return true; return true;
} }
catch (const tools::error::daemon_busy& e) catch (const tools::error::daemon_busy& e)
@ -325,6 +326,7 @@ 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));
} }
res.fee_list.push_back(ptx.fee);
} }
return true; return true;
@ -373,6 +375,7 @@ 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));
} }
res.fee_list.push_back(ptx.fee);
} }
return true; return true;
@ -434,6 +437,7 @@ 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));
} }
res.fee_list.push_back(ptx.fee);
} }
return true; return true;

8
src/wallet/wallet_rpc_server_commands_defs.h
View file

@ -133,11 +133,13 @@ namespace wallet_rpc
std::string tx_hash; std::string tx_hash;
std::string tx_key; std::string tx_key;
std::list<std::string> amount_keys; std::list<std::string> amount_keys;
uint64_t fee;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(tx_hash) KV_SERIALIZE(tx_hash)
KV_SERIALIZE(tx_key) KV_SERIALIZE(tx_key)
KV_SERIALIZE(amount_keys) KV_SERIALIZE(amount_keys)
KV_SERIALIZE(fee)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };
@ -178,10 +180,12 @@ 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> 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(fee_list)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };
@ -212,10 +216,12 @@ 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> 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(fee_list)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };
@ -256,10 +262,12 @@ 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> 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(fee_list)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };