nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockchain_blackball: use is_output_spent instead of ringdb.blackballed for spentness test

Browse Source
This commit is contained in:
stoffu 2019-08-13 15:25:53 +09:00
parent 9f68669503
commit 2425f27acd
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/blockchain_utilities/blockchain_blackball.cpp
View File

@ -1317,6 +1317,13 @@ int main(int argc, char* argv[])
MINFO("Spent outputs database is empty. Either you haven't run the analysis mode yet, or there is really no output marked as spent."); MINFO("Spent outputs database is empty. Either you haven't run the analysis mode yet, or there is really no output marked as spent.");
goto skip_secondary_passes; goto skip_secondary_passes;
} }
MDB_txn *txn;
int dbr = mdb_txn_begin(env, NULL, 0, &txn);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to create LMDB transaction: " + std::string(mdb_strerror(dbr)));
MDB_cursor *cur;
dbr = mdb_cursor_open(txn, dbi_spent, &cur);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open LMDB cursor: " + std::string(mdb_strerror(dbr)));
const uint64_t STAT_WINDOW = 10000; const uint64_t STAT_WINDOW = 10000;
uint64_t outs_total = 0; uint64_t outs_total = 0;
uint64_t outs_spent = 0; uint64_t outs_spent = 0;
@ -1342,7 +1349,7 @@ int main(int argc, char* argv[])
++outs_total; ++outs_total;
CHECK_AND_ASSERT_THROW_MES(out.target.type() == typeid(txout_to_key), "Out target type is not txout_to_key: height=" + std::to_string(height)); CHECK_AND_ASSERT_THROW_MES(out.target.type() == typeid(txout_to_key), "Out target type is not txout_to_key: height=" + std::to_string(height));
uint64_t out_global_index = outs_per_amount[out.amount]++; uint64_t out_global_index = outs_per_amount[out.amount]++;
if (ringdb.blackballed({out.amount, out_global_index})) if (is_output_spent(cur, output_data(out.amount, out_global_index)))
++outs_spent; ++outs_spent;
} }
if (last_tx) if (last_tx)
@ -1358,6 +1365,9 @@ int main(int argc, char* argv[])
} }
return true; return true;
}); });
mdb_cursor_close(cur);
dbr = mdb_txn_commit(txn);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to commit txn creating/opening database: " + std::string(mdb_strerror(dbr)));
goto skip_secondary_passes; goto skip_secondary_passes;
} }