Merge pull request #4666

cf75ee72 blockchain: move two new verification errors to the verify category (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-20 20:38:37 +02:00
commit a38299801f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -2364,7 +2364,7 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
const bool bulletproof = rct::is_rct_bulletproof(tx.rct_signatures.type); const bool bulletproof = rct::is_rct_bulletproof(tx.rct_signatures.type);
if (bulletproof || !tx.rct_signatures.p.bulletproofs.empty()) if (bulletproof || !tx.rct_signatures.p.bulletproofs.empty())
{ {
MERROR("Bulletproofs are not allowed before v8"); MERROR_VER("Bulletproofs are not allowed before v8");
tvc.m_invalid_output = true; tvc.m_invalid_output = true;
return false; return false;
} }
@ -2377,7 +2377,7 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context
const bool borromean = rct::is_rct_borromean(tx.rct_signatures.type); const bool borromean = rct::is_rct_borromean(tx.rct_signatures.type);
if (borromean) if (borromean)
{ {
MERROR("Borromean range proofs are not allowed after v8"); MERROR_VER("Borromean range proofs are not allowed after v8");
tvc.m_invalid_output = true; tvc.m_invalid_output = true;
return false; return false;
} }