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

sort txs by block height unless overriden by requesting tx ids

Browse Source
This commit is contained in:
woodser
2019-07-09 16:16:53 -04:00
parent 77df41f929
commit 8724f7e90b
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+19 -2
View File
@@ -382,6 +382,16 @@ namespace monero {
}
}
/**
* Returns true iff tx1's height is known to be less than tx2's height for sorting.
*/
bool txHeightLessThan(const shared_ptr<MoneroTxWallet>& tx1, const shared_ptr<MoneroTxWallet>& tx2) {
if (tx1->block != boost::none && tx2->block != boost::none) return tx1->getHeight() < tx2->getHeight();
else if (tx1->block == boost::none) return false;
else return true;
}
/**
* ---------------- DUPLICATED WALLET RPC TRANSFER CODE ---------------------
*
@@ -1367,10 +1377,16 @@ namespace monero {
//cout << "8" << endl;
// sort txs by block height
vector<shared_ptr<MoneroTxWallet>> txs ;
for (map<string, shared_ptr<MoneroTxWallet>>::const_iterator txIter = txMap.begin(); txIter != txMap.end(); txIter++) {
txs.push_back(txIter->second);
}
sort(txs.begin(), txs.end(), txHeightLessThan);
// filter and return transfers
vector<shared_ptr<MoneroTransfer>> transfers;
for (map<string, shared_ptr<MoneroTxWallet>>::const_iterator txIter = txMap.begin(); txIter != txMap.end(); txIter++) {
shared_ptr<MoneroTxWallet> tx = txIter->second;
for (const shared_ptr<MoneroTxWallet>& tx : txs) {
// collect outgoing transfer, erase if filtered TODO: java/js do not erase filtered transfers
if (tx->outgoingTransfer != boost::none && request.meetsCriteria(tx->outgoingTransfer.get().get())) transfers.push_back(tx->outgoingTransfer.get());
@@ -1394,6 +1410,7 @@ namespace monero {
}
//cout << "9" << endl;
cout << "MoneroWallet.cpp getTransfers() returning " << transfers.size() << " transfers" << endl;
return transfers;
}