Merge pull request #1014

1cdba42 db_lmdb: fix reorg with "halfway rct" coinbase outputs (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-08-30 00:10:06 +02:00
commit c3ba844f03
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -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")); 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) for (uint64_t i = tx.vout.size(); i > 0; --i)
{ {
const tx_out tx_output = tx.vout[i-1]; 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]);
} }
} }