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

finish tx.merge() impl less merging collection fields

Browse Source
This commit is contained in:
woodser
2019-06-13 07:54:43 -04:00
parent 18a50fa59e
commit 8cbd262ee4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemon.cpp
+10 -1
View File
@@ -257,7 +257,16 @@ namespace monero {
}
}
throw runtime_error("Not implemented");
// handle unrelayed -> relayed -> confirmed
if (*isConfirmed) {
inTxPool = false;
receivedTimestamp = boost::none;
lastRelayedTimestamp = boost::none;
} else {
inTxPool = MoneroUtils::reconcile(inTxPool, tx.inTxPool, boost::none, true, boost::none); // unrelayed -> tx pool
receivedTimestamp = MoneroUtils::reconcile(receivedTimestamp, tx.receivedTimestamp, boost::none, boost::none, false); // take earliest receive time
lastRelayedTimestamp = MoneroUtils::reconcile(lastRelayedTimestamp, tx.lastRelayedTimestamp, boost::none, boost::none, true); // take latest relay time
}
}
void MoneroKeyImage::merge(const MoneroKeyImage& keyImage) {