github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-17 15:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.3.0_18_output_min_max

Browse Source
This commit is contained in:
woodser
2020-04-20 09:50:53 -04:00
parent 554527118e 1b43015602
commit 806108f91e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/monero_wallet_model.cpp
+11
View File
@@ -935,6 +935,11 @@ namespace monero {
// set sub-arrays
if (!m_subaddress_indices.empty()) root.AddMember("subaddressIndices", monero_utils::to_rapidjson_val(allocator, m_subaddress_indices), allocator);
// set num values
rapidjson::Value value_num(rapidjson::kNumberType);
if (m_min_amount != boost::none) monero_utils::addJsonMember("minAmount", m_min_amount.get(), allocator, root, value_num);
if (m_max_amount != boost::none) monero_utils::addJsonMember("maxAmount", m_max_amount.get(), allocator, root, value_num);
// return root
return root;
}
@@ -946,6 +951,8 @@ namespace monero {
for (boost::property_tree::ptree::const_iterator it = node.begin(); it != node.end(); ++it) {
string key = it->first;
if (key == string("subaddressIndices")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) output_query->m_subaddress_indices.push_back(it2->second.get_value<uint32_t>());
else if (key == string("minAmount")) output_query->m_min_amount = it->second.get_value<uint64_t>();
else if (key == string("maxAmount")) output_query->m_max_amount = it->second.get_value<uint64_t>();
else if (key == string("txQuery")) {} // ignored
}
}
@@ -1000,6 +1007,8 @@ namespace monero {
// copy extensions
if (!src->m_subaddress_indices.empty()) tgt->m_subaddress_indices = vector<uint32_t>(src->m_subaddress_indices);
tgt->m_min_amount = src->m_min_amount;
tgt->m_max_amount = src->m_max_amount;
return tgt;
};
@@ -1020,6 +1029,8 @@ namespace monero {
// filter on extensions
if (!m_subaddress_indices.empty() && find(m_subaddress_indices.begin(), m_subaddress_indices.end(), *output->m_subaddress_index) == m_subaddress_indices.end()) return false;
if (m_min_amount != boost::none && (output->m_amount == boost::none || output->m_amount.get() < m_min_amount.get())) return false;
if (m_max_amount != boost::none && (output->m_amount == boost::none || output->m_amount.get() > m_max_amount.get())) return false;
// filter with tx query
if (m_tx_query != boost::none && !(*m_tx_query)->meets_criteria(static_pointer_cast<monero_tx_wallet>(output->m_tx).get())) return false;
src/wallet/monero_wallet_model.h
+2
View File
@@ -224,6 +224,8 @@ namespace monero {
*/
struct monero_output_query : public monero_output_wallet {
vector<uint32_t> m_subaddress_indices;
boost::optional<uint64_t> m_min_amount;
boost::optional<uint64_t> m_max_amount;
boost::optional<shared_ptr<monero_tx_query>> m_tx_query;
//boost::property_tree::ptree to_property_tree() const;