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

support tx request height

Browse Source 
uint32_t -> uin64_t
This commit is contained in:
woodser
2019-07-14 10:29:47 -04:00
parent 5bfc98f0f4
commit ee367cc5f2
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/MoneroUtils.cpp
+3 -2
View File
@@ -243,8 +243,9 @@ shared_ptr<MoneroTxRequest> nodeToTxRequest(const boost::property_tree::ptree& n
else if (key == string("txIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) txRequest->txIds.push_back(it2->second.data());
else if (key == string("hasPaymentId")) txRequest->hasPaymentId = stringToBool(it->second.data());
else if (key == string("paymentIds")) for (boost::property_tree::ptree::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) txRequest->paymentIds.push_back(it2->second.data());
else if (key == string("minHeight")) txRequest->minHeight = it->second.get_value<uint32_t>();
else if (key == string("maxHeight")) txRequest->maxHeight = it->second.get_value<uint32_t>();
else if (key == string("height")) txRequest->height = it->second.get_value<uint64_t>();
else if (key == string("minHeight")) txRequest->minHeight = it->second.get_value<uint64_t>();
else if (key == string("maxHeight")) txRequest->maxHeight = it->second.get_value<uint64_t>();
else if (key == string("includeOutputs")) txRequest->includeOutputs = stringToBool(it->second.data());
else if (key == string("transferRequest")) txRequest->transferRequest = nodeToTransferRequest(it->second);
else if (key == string("outputRequest")) txRequest->outputRequest = nodeToOutputRequest(it->second);
src/wallet/MoneroWalletModel.cpp
+2 -1
View File
@@ -179,6 +179,7 @@ namespace monero {
if (!txIds.empty()) node.add_child("txIds", MoneroUtils::toPropertyTree(txIds));
if (hasPaymentId != boost::none) node.put("hasPaymentId", *hasPaymentId);
if (!paymentIds.empty()) node.add_child("paymentIds", MoneroUtils::toPropertyTree(paymentIds));
if (height != boost::none) node.put("height", *height);
if (minHeight != boost::none) node.put("minHeight", *minHeight);
if (maxHeight != boost::none) node.put("maxHeight", *maxHeight);
if (includeOutputs != boost::none) node.put("includeOutputs", *includeOutputs);
@@ -243,7 +244,7 @@ namespace monero {
boost::optional<uint64_t> txHeight = tx->getHeight();
if (!txIds.empty() && find(txIds.begin(), txIds.end(), *tx->id) == txIds.end()) return false;
if (!paymentIds.empty() && (tx->paymentId == boost::none || find(paymentIds.begin(), paymentIds.end(), *tx->paymentId) == paymentIds.end())) return false;
if (getHeight() != boost::none && (txHeight == boost::none || *txHeight != *getHeight())) return false;
if (height != boost::none && (txHeight == boost::none || *txHeight != *height)) return false;
if (minHeight != boost::none && (txHeight == boost::none || *txHeight < *minHeight)) return false;
if (maxHeight != boost::none && (txHeight == boost::none || *txHeight > *maxHeight)) return false;
src/wallet/MoneroWalletModel.h
+1
View File
@@ -257,6 +257,7 @@ namespace monero {
vector<string> txIds;
boost::optional<bool> hasPaymentId;
vector<string> paymentIds;
boost::optional<uint64_t> height;
boost::optional<uint64_t> minHeight;
boost::optional<uint64_t> maxHeight;
boost::optional<uint64_t> includeOutputs;
submodules/monero-core
+1 -1
Submodule submodules/monero-core updated: 6335509727...9d7107c870