diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:40:37 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-17 16:40:37 +0200 |
| commit | dbf2ab56c54b8be3d0f704f067c9bff79e90ed7e (patch) | |
| tree | b5479dc491d87800fdbf0bc6668bec431f402e02 /src/wallet | |
| parent | Merge pull request #1318 (diff) | |
| parent | wallet: return fee in transfer RPC (diff) | |
| download | monero-dbf2ab56c54b8be3d0f704f067c9bff79e90ed7e.tar.xz | |
Merge pull request #1346
4eb7347 wallet: return fee in transfer RPC (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server_commands_defs.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 92ad65c5b..f1c3faa3e 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -263,6 +263,7 @@ namespace tools { res.tx_key = epee::string_tools::pod_to_hex(ptx_vector.back().tx_key); } + res.fee = ptx_vector.back().fee; return true; } 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.fee_list.push_back(ptx.fee); } return true; @@ -373,6 +375,7 @@ namespace tools { res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key)); } + res.fee_list.push_back(ptx.fee); } return true; @@ -434,6 +437,7 @@ namespace tools { res.tx_key_list.push_back(epee::string_tools::pod_to_hex(ptx.tx_key)); } + res.fee_list.push_back(ptx.fee); } return true; diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h index cde9863a2..76de7bc9d 100644 --- a/src/wallet/wallet_rpc_server_commands_defs.h +++ b/src/wallet/wallet_rpc_server_commands_defs.h @@ -133,11 +133,13 @@ namespace wallet_rpc std::string tx_hash; std::string tx_key; std::list<std::string> amount_keys; + uint64_t fee; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(tx_hash) KV_SERIALIZE(tx_key) KV_SERIALIZE(amount_keys) + KV_SERIALIZE(fee) END_KV_SERIALIZE_MAP() }; }; @@ -178,10 +180,12 @@ namespace wallet_rpc { std::list<std::string> tx_hash_list; std::list<std::string> tx_key_list; + std::list<uint64_t> fee_list; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(tx_hash_list) KV_SERIALIZE(tx_key_list) + KV_SERIALIZE(fee_list) END_KV_SERIALIZE_MAP() }; }; @@ -212,10 +216,12 @@ namespace wallet_rpc { std::list<std::string> tx_hash_list; std::list<std::string> tx_key_list; + std::list<uint64_t> fee_list; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(tx_hash_list) KV_SERIALIZE(tx_key_list) + KV_SERIALIZE(fee_list) END_KV_SERIALIZE_MAP() }; }; @@ -256,10 +262,12 @@ namespace wallet_rpc { std::list<std::string> tx_hash_list; std::list<std::string> tx_key_list; + std::list<uint64_t> fee_list; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(tx_hash_list) KV_SERIALIZE(tx_key_list) + KV_SERIALIZE(fee_list) END_KV_SERIALIZE_MAP() }; }; |