Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 20:06:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4735

Browse Source 
73e504c1 rpc: adjust ring size error message now that too high is also possible (moneromooo-monero)
a5ca7f4f core: fix unmixable special case allowing ring size below 11 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-06 21:31:14 +02:00
commit 299d75b209
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/blockchain.cpp
View File

@ -2530,7 +2530,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
} }
} }
if (hf_version >= HF_VERSION_MIN_MIXIN_10 && mixin != 10) if (((hf_version == HF_VERSION_MIN_MIXIN_10 || hf_version == HF_VERSION_MIN_MIXIN_10+1) && mixin != 10) || (hf_version >= HF_VERSION_MIN_MIXIN_10+2 && mixin > 10))
{ {
MERROR_VER("Tx " << get_transaction_hash(tx) << " has invalid ring size (" << (mixin + 1) << "), it should be 11"); MERROR_VER("Tx " << get_transaction_hash(tx) << " has invalid ring size (" << (mixin + 1) << "), it should be 11");
tvc.m_low_mixin = true; tvc.m_low_mixin = true;

2
src/rpc/core_rpc_server.cpp
View File

@ -701,7 +701,7 @@ namespace cryptonote
res.status = "Failed"; res.status = "Failed";
res.reason = ""; res.reason = "";
if ((res.low_mixin = tvc.m_low_mixin)) if ((res.low_mixin = tvc.m_low_mixin))
add_reason(res.reason, "ring size too small"); add_reason(res.reason, "bad ring size");
if ((res.double_spend = tvc.m_double_spend)) if ((res.double_spend = tvc.m_double_spend))
add_reason(res.reason, "double spend"); add_reason(res.reason, "double spend");
if ((res.invalid_input = tvc.m_invalid_input)) if ((res.invalid_input = tvc.m_invalid_input))