aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/tx_pool.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-07-24 18:30:27 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-08-28 21:29:50 +0100
commit37bdf6ebe3e0339fb195efb4083022dba8813e85 (patch)
tree198890173c57a019ea4e61a9af2af05c86aba672 /src/cryptonote_core/tx_pool.cpp
parentsimplewallet: better check_tx_key feedback (diff)
downloadmonero-37bdf6ebe3e0339fb195efb4083022dba8813e85.tar.xz
change fork settings to allow pre-rct txes for one more fork cycle
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
-rw-r--r--src/cryptonote_core/tx_pool.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index c2414f581..3666088f1 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -85,10 +85,15 @@ namespace cryptonote
return false;
}
- const size_t max_tx_version = version == 1 ? 1 : 2;
+ const size_t max_tx_version = (version <= 3) ? 1 : 2;
if (tx.version > max_tx_version)
{
- // v2 is the latest one we know
+ tvc.m_verifivation_failed = true;
+ return false;
+ }
+ const size_t min_tx_version = (version >= 5) ? 2 : 1;
+ if (tx.version < min_tx_version)
+ {
tvc.m_verifivation_failed = true;
return false;
}