aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/blockchain_utilities/blockchain_blackball.cpp96
1 files changed, 95 insertions, 1 deletions
diff --git a/src/blockchain_utilities/blockchain_blackball.cpp b/src/blockchain_utilities/blockchain_blackball.cpp
index d2ce5cf76..73819bd25 100644
--- a/src/blockchain_utilities/blockchain_blackball.cpp
+++ b/src/blockchain_utilities/blockchain_blackball.cpp
@@ -59,6 +59,7 @@ static MDB_dbi dbi_relative_rings;
static MDB_dbi dbi_outputs;
static MDB_dbi dbi_processed_txidx;
static MDB_dbi dbi_spent;
+static MDB_dbi dbi_per_amount;
static MDB_dbi dbi_ring_instances;
static MDB_dbi dbi_stats;
static MDB_env *env = NULL;
@@ -238,7 +239,7 @@ static void init(std::string cache_filename)
dbr = mdb_env_create(&env);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to create LDMB environment: " + std::string(mdb_strerror(dbr)));
- dbr = mdb_env_set_maxdbs(env, 6);
+ dbr = mdb_env_set_maxdbs(env, 7);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to set max env dbs: " + std::string(mdb_strerror(dbr)));
const std::string actual_filename = get_cache_filename(cache_filename);
dbr = mdb_env_open(env, actual_filename.c_str(), flags, 0664);
@@ -265,6 +266,10 @@ static void init(std::string cache_filename)
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open LMDB dbi: " + std::string(mdb_strerror(dbr)));
mdb_set_dupsort(txn, dbi_spent, compare_uint64);
+ dbr = mdb_dbi_open(txn, "per_amount", MDB_CREATE | MDB_INTEGERKEY, &dbi_per_amount);
+ CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open LMDB dbi: " + std::string(mdb_strerror(dbr)));
+ mdb_set_compare(txn, dbi_per_amount, compare_uint64);
+
dbr = mdb_dbi_open(txn, "ring_instances", MDB_CREATE, &dbi_ring_instances);
CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open LMDB dbi: " + std::string(mdb_strerror(dbr)));
@@ -283,6 +288,7 @@ static void close()
mdb_dbi_close(env, dbi_relative_rings);
mdb_dbi_close(env, dbi_outputs);
mdb_dbi_close(env, dbi_processed_txidx);
+ mdb_dbi_close(env, dbi_per_amount);
mdb_dbi_close(env, dbi_spent);
mdb_dbi_close(env, dbi_ring_instances);
mdb_dbi_close(env, dbi_stats);
@@ -585,6 +591,55 @@ static std::vector<output_data> get_spent_outputs(MDB_txn *txn)
return outs;
}
+static void get_per_amount_outputs(MDB_txn *txn, uint64_t amount, uint64_t &total, uint64_t &spent)
+{
+ MDB_cursor *cur;
+ int dbr = mdb_cursor_open(txn, dbi_per_amount, &cur);
+ CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open cursor for per amount outputs: " + std::string(mdb_strerror(dbr)));
+ MDB_val k, v;
+ mdb_size_t count = 0;
+ k.mv_size = sizeof(uint64_t);
+ k.mv_data = (void*)&amount;
+ dbr = mdb_cursor_get(cur, &k, &v, MDB_SET);
+ if (dbr == MDB_NOTFOUND)
+ {
+ total = spent = 0;
+ }
+ else
+ {
+ CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to get per amount outputs: " + std::string(mdb_strerror(dbr)));
+ total = ((const uint64_t*)v.mv_data)[0];
+ spent = ((const uint64_t*)v.mv_data)[1];
+ }
+ mdb_cursor_close(cur);
+}
+
+static void inc_per_amount_outputs(MDB_txn *txn, uint64_t amount, uint64_t total, uint64_t spent)
+{
+ MDB_cursor *cur;
+ int dbr = mdb_cursor_open(txn, dbi_per_amount, &cur);
+ CHECK_AND_ASSERT_THROW_MES(!dbr, "Failed to open cursor for per amount outputs: " + std::string(mdb_strerror(dbr)));
+ MDB_val k, v;
+ mdb_size_t count = 0;
+ k.mv_size = sizeof(uint64_t);
+ k.mv_data = (void*)&amount;
+ dbr = mdb_cursor_get(cur, &k, &v, MDB_SET);
+ if (dbr == 0)
+ {
+ total += ((const uint64_t*)v.mv_data)[0];
+ spent += ((const uint64_t*)v.mv_data)[1];
+ }
+ else
+ {
+ CHECK_AND_ASSERT_THROW_MES(dbr == MDB_NOTFOUND, "Failed to get per amount outputs: " + std::string(mdb_strerror(dbr)));
+ }
+ uint64_t data[2] = {total, spent};
+ v.mv_size = 2 * sizeof(uint64_t);
+ v.mv_data = (void*)data;
+ dbr = mdb_cursor_put(cur, &k, &v, 0);
+ mdb_cursor_close(cur);
+}
+
static uint64_t get_processed_txidx(const std::string &name)
{
MDB_txn *txn;
@@ -1193,6 +1248,7 @@ int main(int argc, char* argv[])
for_all_transactions(filename, start_idx, n_txes, [&](const cryptonote::transaction_prefix &tx)->bool
{
std::cout << "\r" << start_idx << "/" << n_txes << " \r" << std::flush;
+ const bool miner_tx = tx.vin.size() == 1 && tx.vin[0].type() == typeid(txin_gen);
for (const auto &in: tx.vin)
{
if (in.type() != typeid(txin_to_key))
@@ -1210,6 +1266,9 @@ int main(int argc, char* argv[])
std::vector<uint64_t> new_ring = canonicalize(txin.key_offsets);
const uint32_t ring_size = txin.key_offsets.size();
const uint64_t instances = inc_ring_instances(txn, txin.amount, new_ring);
+ uint64_t pa_total = 0, pa_spent = 0;
+ if (!opt_rct_only)
+ get_per_amount_outputs(txn, txin.amount, pa_total, pa_spent);
if (n == 0 && ring_size == 1)
{
const std::pair<uint64_t, uint64_t> output = std::make_pair(txin.amount, absolute[0]);
@@ -1237,6 +1296,21 @@ int main(int argc, char* argv[])
inc_stat(txn, txin.amount ? "pre-rct-duplicate-rings" : "rct-duplicate-rings");
}
}
+ else if (n == 0 && !opt_rct_only && pa_spent + 1 == pa_total)
+ {
+ for (size_t o = 0; o < pa_total; ++o)
+ {
+ const std::pair<uint64_t, uint64_t> output = std::make_pair(txin.amount, o);
+ if (opt_verbose)
+ {
+ MINFO("Marking output " << output.first << "/" << output.second << " as spent, due to as many outputs of that amount being spent as exist so far");
+ std::cout << "\r" << start_idx << "/" << n_txes << " \r" << std::flush;
+ }
+ blackballs.push_back(output);
+ if (add_spent_output(cur, output_data(txin.amount, o)))
+ inc_stat(txn, txin.amount ? "pre-rct-full-count" : "rct-full-count");
+ }
+ }
else if (n == 0 && opt_check_subsets && get_ring_subset_instances(txn, txin.amount, new_ring) >= new_ring.size())
{
for (size_t o = 0; o < new_ring.size(); ++o)
@@ -1299,9 +1373,28 @@ int main(int argc, char* argv[])
}
}
if (n == 0)
+ {
set_relative_ring(txn, txin.k_image, new_ring);
+ if (!opt_rct_only)
+ inc_per_amount_outputs(txn, txin.amount, 0, 1);
+ }
}
set_processed_txidx(txn, canonical, start_idx+1);
+ if (!opt_rct_only)
+ {
+ for (const auto &out: tx.vout)
+ {
+ uint64_t amount = out.amount;
+ if (miner_tx && tx.version >= 2)
+ amount = 0;
+
+ if (opt_rct_only && amount != 0)
+ continue;
+ if (out.target.type() != typeid(txout_to_key))
+ continue;
+ inc_per_amount_outputs(txn, amount, 1, 0);
+ }
+ }
++records;
if (records >= records_per_sync)
@@ -1433,6 +1526,7 @@ skip_secondary_passes:
{ "pre-rct-ring-size-1", pre_rct }, { "rct-ring-size-1", rct },
{ "pre-rct-duplicate-rings", pre_rct }, { "rct-duplicate-rings", rct },
{ "pre-rct-subset-rings", pre_rct }, { "rct-subset-rings", rct },
+ { "pre-rct-full-count", pre_rct }, { "rct-full-count", rct },
{ "pre-rct-key-image-attack", pre_rct }, { "rct-key-image-attack", rct },
{ "pre-rct-extra", pre_rct }, { "rct-ring-extra", rct },
{ "pre-rct-chain-reaction", pre_rct }, { "rct-chain-reaction", rct },
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 13:59:14 +0000