change fork settings to allow pre-rct txes for one more fork cycle

2 files changed, 8 insertions, 3 deletions

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 9972b25e5..547f2d4c2 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2285,7 +2285,7 @@ bool Blockchain::check_tx_inputs(const transaction& tx, tx_verification_context
     }
 
     // for v3, we force txes with all mixable inputs to be rct
-    if (m_hardfork->get_current_version() >= 3)
+    if (m_hardfork->get_current_version() >= 4)
     {
       if (n_unmixable == 0 && tx.version == 1)
       {
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;
     }