zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use DoS level constants and parameters for ZIP 213 rejections

This commit is contained in:
Jack Grigg 2020-03-06 12:03:57 +13:00
parent 3b3382bb48
commit 743a5f437f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@ -893,8 +893,10 @@ bool ContextualCheckTransaction(
if (tx.IsCoinBase()) { if (tx.IsCoinBase()) {
// A coinbase transaction cannot have output descriptions // A coinbase transaction cannot have output descriptions
if (tx.vShieldedOutput.size() > 0) if (tx.vShieldedOutput.size() > 0)
return state.DoS(100, error("CheckTransaction(): coinbase has output descriptions"), return state.DoS(
REJECT_INVALID, "bad-cb-has-output-description"); dosLevelPotentiallyRelaxing,
error("CheckTransaction(): coinbase has output descriptions"),
REJECT_INVALID, "bad-cb-has-output-description");
} }
} }
@ -910,7 +912,7 @@ bool ContextualCheckTransaction(
output.outCiphertext, ovk, output.cv, output.cmu, output.ephemeralKey); output.outCiphertext, ovk, output.cv, output.cmu, output.ephemeralKey);
if (!outPlaintext) { if (!outPlaintext) {
return state.DoS( return state.DoS(
100, DOS_LEVEL_BLOCK,
error("CheckTransaction(): coinbase output description has invalid outCiphertext"), error("CheckTransaction(): coinbase output description has invalid outCiphertext"),
REJECT_INVALID, REJECT_INVALID,
"bad-cb-output-desc-invalid-outct"); "bad-cb-output-desc-invalid-outct");
@ -925,7 +927,7 @@ bool ContextualCheckTransaction(
output.cmu) output.cmu)
) { ) {
return state.DoS( return state.DoS(
100, DOS_LEVEL_BLOCK,
error("CheckTransaction(): coinbase output description has invalid encCiphertext"), error("CheckTransaction(): coinbase output description has invalid encCiphertext"),
REJECT_INVALID, REJECT_INVALID,
"bad-cb-output-desc-invalid-encct"); "bad-cb-output-desc-invalid-encct");