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

copy output request in getOutputs()

Browse Source
This commit is contained in:
woodser
2019-07-30 10:20:41 -04:00
parent 068e4e8f97
commit dd8bd302a0
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+18 -4
View File
@@ -1525,9 +1525,23 @@ namespace monero {
else MTRACE("Output request's tx request rooted at [block]: " << (*(*request.txRequest)->block)->serialize());
}
// normalize request
// TODO **: this will modify original request, construct copy? add test
MoneroTxRequest txReq = *(request.txRequest != boost::none ? *request.txRequest : make_shared<MoneroTxRequest>());
// copy and normalize request
shared_ptr<MoneroOutputRequest> req;
if (request.txRequest == boost::none) req = request.copy(make_shared<MoneroOutputRequest>(request), make_shared<MoneroOutputRequest>());
else {
shared_ptr<MoneroTxRequest> txReq = request.txRequest.get()->copy(request.txRequest.get(), make_shared<MoneroTxRequest>());
if (request.txRequest.get()->outputRequest != boost::none && request.txRequest.get()->outputRequest.get().get() == &request) {
req = txReq->outputRequest.get();
} else {
if (request.txRequest.get()->outputRequest != boost::none) throw new runtime_error("Output request's tx request must be a circular reference or null");
shared_ptr<MoneroOutputRequest> requestSp = make_shared<MoneroOutputRequest>(request); // convert request to shared pointer for copy
req = requestSp->copy(requestSp, make_shared<MoneroOutputRequest>());
req->txRequest = txReq;
}
}
if (req->txRequest == boost::none) req->txRequest = make_shared<MoneroTxRequest>();
shared_ptr<MoneroTxRequest> txReq = req->txRequest.get();
txReq->outputRequest = boost::none; // break circular link for meetsCriteria()
// get output data from wallet2
tools::wallet2::transfer_container outputsW2;
@@ -1549,7 +1563,7 @@ namespace monero {
vector<shared_ptr<MoneroOutput>>::iterator voutIter = tx->vouts.begin();
while (voutIter != tx->vouts.end()) {
shared_ptr<MoneroOutputWallet> voutWallet = static_pointer_cast<MoneroOutputWallet>(*voutIter);
if (request.meetsCriteria(voutWallet.get())) {
if (req->meetsCriteria(voutWallet.get())) {
vouts.push_back(voutWallet);
voutIter++;
} else {