DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix bug where some addresses are lost in sorting by using a vector instead of set and avoiding custom comparison function

Browse Source
This commit is contained in:
Duke Leto
2018-07-20 03:58:05 +00:00
parent 20ba439d05
commit c4a73444de
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/txdb.cpp
View File

@@ -405,6 +405,7 @@ extern UniValue CBlockTreeDB::Snapshot()
int64_t utxos = 0; int64_t utxos = 0;
boost::scoped_ptr<leveldb::Iterator> iter(NewIterator()); boost::scoped_ptr<leveldb::Iterator> iter(NewIterator());
std::map <std::string, CAmount> addressAmounts; std::map <std::string, CAmount> addressAmounts;
std::vector <std::pair<CAmount, std::string>> vaddr;
UniValue result(UniValue::VOBJ); UniValue result(UniValue::VOBJ);
result.push_back(Pair("start_time", time(NULL))); result.push_back(Pair("start_time", time(NULL)));
@@ -461,22 +462,18 @@ extern UniValue CBlockTreeDB::Snapshot()
UniValue addresses(UniValue::VARR); UniValue addresses(UniValue::VARR);
fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li\n", (double) total / COIN, totalAddresses, utxos); fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li\n", (double) total / COIN, totalAddresses, utxos);
typedef std::function<bool(std::pair<std::string, CAmount>, std::pair<std::string, CAmount>)> Comparator; for (std::pair<std::string, CAmount> element : addressAmounts) {
Comparator compFunctor = [](std::pair<std::string, CAmount> elem1 ,std::pair<std::string, CAmount> elem2) { vaddr.push_back( make_pair(element.second, element.first) );
return elem1.second > elem2.second; /* descending */ }
}; std::sort(vaddr.begin(), vaddr.end());
// This is our intermediate data structure that allows us to calculate addressSorted
std::set<std::pair<std::string, CAmount>, Comparator> sortedSnapshot(addressAmounts.begin(), addressAmounts.end(), compFunctor);
//fprintf(stderr, "sortedSnapshot.size=%li\n", sortedSnapshot.size() );
UniValue obj(UniValue::VOBJ); UniValue obj(UniValue::VOBJ);
UniValue addressesSorted(UniValue::VARR); UniValue addressesSorted(UniValue::VARR);
for (std::pair<std::string, CAmount> element : sortedSnapshot) { for (std::vector<std::pair<CAmount, std::string>>::iterator it = vaddr.begin(); it!=vaddr.end(); ++it) {
UniValue obj(UniValue::VOBJ); UniValue obj(UniValue::VOBJ);
obj.push_back( make_pair("addr", element.first.c_str() ) ); obj.push_back( make_pair("addr", it->second.c_str() ) );
char amount[32]; char amount[32];
sprintf(amount, "%.8f", (double) element.second / COIN); sprintf(amount, "%.8f", (double) it->first / COIN);
obj.push_back( make_pair("amount", amount) ); obj.push_back( make_pair("amount", amount) );
addressesSorted.push_back(obj); addressesSorted.push_back(obj);
} }