diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-04-29 10:42:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-04-29 10:42:39 +0200 |
| commit | aee3214d866fc38f364cf252045c489c5e761b16 (patch) | |
| tree | 464171665dd35b332fe8680a96140a3599196107 | |
| parent | Merge pull request #823 (diff) | |
| parent | wallet: add a filter_by_height field to get_transfers (diff) | |
| download | monero-aee3214d866fc38f364cf252045c489c5e761b16.tar.xz | |
Merge pull request #824
09dddf2 wallet: add a filter_by_height field to get_transfers (moneromooo-monero)
| -rw-r--r-- | src/wallet/wallet_rpc_server.cpp | 11 | ||||
| -rw-r--r-- | src/wallet/wallet_rpc_server_commands_defs.h | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 5b678fa38..a082f731b 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -842,10 +842,17 @@ namespace tools return false; } + uint64_t min_height = 0, max_height = (uint64_t)-1; + if (req.filter_by_height) + { + min_height = req.min_height; + max_height = req.max_height; + } + if (req.in) { std::list<std::pair<crypto::hash, tools::wallet2::payment_details>> payments; - m_wallet.get_payments(payments, req.min_height, req.max_height); + m_wallet.get_payments(payments, min_height, max_height); for (std::list<std::pair<crypto::hash, tools::wallet2::payment_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) { res.in.push_back(wallet_rpc::COMMAND_RPC_GET_TRANSFERS::entry()); wallet_rpc::COMMAND_RPC_GET_TRANSFERS::entry &entry = res.in.back(); @@ -866,7 +873,7 @@ namespace tools if (req.out) { std::list<std::pair<crypto::hash, tools::wallet2::confirmed_transfer_details>> payments; - m_wallet.get_payments_out(payments, req.min_height, req.max_height); + m_wallet.get_payments_out(payments, min_height, max_height); for (std::list<std::pair<crypto::hash, tools::wallet2::confirmed_transfer_details>>::const_iterator i = payments.begin(); i != payments.end(); ++i) { res.in.push_back(wallet_rpc::COMMAND_RPC_GET_TRANSFERS::entry()); wallet_rpc::COMMAND_RPC_GET_TRANSFERS::entry &entry = res.in.back(); diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h index 9fe85dfc1..f8c04c007 100644 --- a/src/wallet/wallet_rpc_server_commands_defs.h +++ b/src/wallet/wallet_rpc_server_commands_defs.h @@ -496,6 +496,8 @@ namespace wallet_rpc bool out; bool pending; bool failed; + + bool filter_by_height; uint64_t min_height; uint64_t max_height; @@ -504,6 +506,7 @@ namespace wallet_rpc KV_SERIALIZE(out); KV_SERIALIZE(pending); KV_SERIALIZE(failed); + KV_SERIALIZE(filter_by_height); KV_SERIALIZE(min_height); KV_SERIALIZE(max_height); END_KV_SERIALIZE_MAP() |