diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-24 22:41:40 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-24 22:41:40 +0200 |
| commit | 581994b61c9b8b530629b2dbc2e7ddd3b30b12b4 (patch) | |
| tree | 7e7fbd57c6fafa4176f975b85727ab94d14e2d09 /src | |
| parent | Merge pull request #5485 (diff) | |
| parent | tx_sanity_check: relax uniqueness check a bit (diff) | |
| download | monero-581994b61c9b8b530629b2dbc2e7ddd3b30b12b4.tar.xz | |
Merge pull request #5486
4be18df3 tx_sanity_check: relax uniqueness check a bit (moneromooo-monero)
b386ae57 wallet2: add missing "sanity check failed" reason message (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/tx_sanity_check.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptonote_core/tx_sanity_check.cpp b/src/cryptonote_core/tx_sanity_check.cpp index d3b225f1c..10198a3d3 100644 --- a/src/cryptonote_core/tx_sanity_check.cpp +++ b/src/cryptonote_core/tx_sanity_check.cpp @@ -34,7 +34,7 @@ #include "tx_sanity_check.h" #undef MONERO_DEFAULT_LOG_CATEGORY -#define MONERO_DEFAULT_LOG_CATEGORY "txsanity" +#define MONERO_DEFAULT_LOG_CATEGORY "verify" namespace cryptonote { @@ -80,7 +80,7 @@ bool tx_sanity_check(Blockchain &blockchain, const cryptonote::blobdata &tx_blob if (n_available < 10000) return true; - if (rct_indices.size() < n_indices * 9 / 10) + if (rct_indices.size() < n_indices * 8 / 10) { MERROR("unique indices is only " << rct_indices.size() << "/" << n_indices); return false; diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 3d5f1bd0f..6554ef7d5 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -221,6 +221,8 @@ namespace add_reason(reason, "fee too low"); if (res.not_rct) add_reason(reason, "tx is not ringct"); + if (res.sanity_check_failed) + add_reason(reason, "tx sanity check failed"); if (res.not_relayed) add_reason(reason, "tx was not relayed"); return reason; |