aboutsummaryrefslogtreecommitdiff
path: root/src/blockchain_db/lmdb
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-08-30 00:10:06 +0200
committerRiccardo Spagni <ric@spagni.net>2016-08-30 00:10:06 +0200
commitc3ba844f03a88bbf6b2624f719f5cb9184a07445 (patch)
treed2708a34e6e2fab057163de728d281a5d85cf955 /src/blockchain_db/lmdb
parentMerge pull request #1011 (diff)
parentdb_lmdb: fix reorg with "halfway rct" coinbase outputs (diff)
downloadmonero-c3ba844f03a88bbf6b2624f719f5cb9184a07445.tar.xz
Merge pull request #1014
1cdba42 db_lmdb: fix reorg with "halfway rct" coinbase outputs (moneromooo-monero)
Diffstat (limited to 'src/blockchain_db/lmdb')
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index a0a0a041d..c0cf28dda 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -877,10 +877,12 @@ void BlockchainLMDB::remove_tx_outputs(const uint64_t tx_id, const transaction&
throw0(DB_ERROR("tx has outputs, but no output indices found"));
}
+ bool is_miner_tx = tx.vin.size() == 1 && tx.vin[0].type() == typeid(txin_gen);
for (uint64_t i = tx.vout.size(); i > 0; --i)
{
const tx_out tx_output = tx.vout[i-1];
- remove_output(tx_output.amount, amount_output_indices[i-1]);
+ uint64_t amount = is_miner_tx && tx.version >= 2 ? 0 : tx_output.amount;
+ remove_output(amount, amount_output_indices[i-1]);
}
}