Remove temporary mining diagnostics
This commit is contained in:
@@ -1552,7 +1552,6 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl
|
||||
case HF_VERSION_AUDIT2_PAUSE:
|
||||
case HF_VERSION_CARROT:
|
||||
case HF_VERSION_ENABLE_TOKENS:
|
||||
MERROR("validate_miner_transaction: height=" << height << ", hf=" << static_cast<unsigned>(version) << ", already_generated_coins=" << already_generated_coins << ", has_active_stakes=" << has_active_stakes << ", miner_amount_burnt=" << b.miner_tx.amount_burnt << ", money_in_use_before_burn=" << money_in_use);
|
||||
if (b.miner_tx.amount_burnt > 0) {
|
||||
CHECK_AND_ASSERT_MES(money_in_use + b.miner_tx.amount_burnt > money_in_use, false, "miner transaction is overflowed by amount_burnt");
|
||||
money_in_use += b.miner_tx.amount_burnt;
|
||||
|
||||
@@ -543,7 +543,6 @@ namespace cryptonote
|
||||
tx = carrot::store_carrot_to_coinbase_transaction_v1(enotes, extra_nonce, cryptonote::transaction_type::MINER, height);
|
||||
tx.version = (hard_fork_version >= HF_VERSION_ENABLE_TOKENS) ? TRANSACTION_VERSION_ENABLE_TOKENS : TRANSACTION_VERSION_CARROT;
|
||||
tx.amount_burnt = stake_reward;
|
||||
MERROR("construct_miner_tx: carrot branch final height=" << height << ", has_active_stakes=" << has_active_stakes << ", block_reward=" << block_reward << ", amount_burnt=" << tx.amount_burnt << ", miner_amount=" << payment_proposal.amount);
|
||||
tx.invalidate_hashes();
|
||||
}
|
||||
catch (const std::exception &e)
|
||||
@@ -587,8 +586,6 @@ namespace cryptonote
|
||||
|
||||
// Should we award some of the block reward to the stakers?
|
||||
if (height != 0) {
|
||||
MERROR("construct_miner_tx: height=" << height << ", hf=" << static_cast<unsigned>(hard_fork_version) << ", has_active_stakes=" << has_active_stakes << ", block_reward=" << block_reward << ", initial_amount=" << amount);
|
||||
|
||||
if (has_active_stakes) {
|
||||
// Different forks take a different proportion of the block_reward for stakers
|
||||
switch (hard_fork_version) {
|
||||
@@ -607,7 +604,6 @@ namespace cryptonote
|
||||
CHECK_AND_ASSERT_MES(tx.amount_burnt == 0, false, "while creating outs: amount_burnt is nonzero");
|
||||
tx.amount_burnt = amount / 5;
|
||||
amount -= tx.amount_burnt;
|
||||
MERROR("construct_miner_tx: staking burn applied, amount_burnt=" << tx.amount_burnt << ", miner_amount=" << amount);
|
||||
break;
|
||||
default:
|
||||
assert(false);
|
||||
@@ -620,8 +616,6 @@ namespace cryptonote
|
||||
asset_type = "PEY";
|
||||
cryptonote::set_tx_out(amount, asset_type, CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW, out_eph_public_key, use_view_tags, view_tag, out);
|
||||
tx.vout.push_back(out);
|
||||
MERROR("construct_miner_tx: final amount_burnt=" << tx.amount_burnt << ", vout_amount=" << amount);
|
||||
|
||||
} else {
|
||||
|
||||
// Genesis TX - create the necessary distribution for Salvium seed funds
|
||||
|
||||
Reference in New Issue
Block a user