mixable transactions must be rct for v3

4 files changed, 33 insertions, 6 deletions

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index f46de9ca8..bef880627 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -2262,17 +2262,39 @@ bool Blockchain::check_tx_inputs(const transaction& tx, tx_verification_context
       if (txin.type() == typeid(txin_to_key))
       {
         const txin_to_key& in_to_key = boost::get<txin_to_key>(txin);
-        uint64_t n_outputs = m_db->get_num_outputs(in_to_key.amount);
-        LOG_PRINT_L2("output size " << print_money(in_to_key.amount) << ": " << n_outputs << " available");
-        // n_outputs includes the output we're considering
-        if (n_outputs <= 2)
-          ++n_unmixable;
-        else
+        if (in_to_key.amount == 0)
+        {
+          // always consider rct inputs mixable. Even if there's not enough rct
+          // inputs on the chain to mix with, this is going to be the case for
+          // just a few blocks right after the fork at most
           ++n_mixable;
+        }
+        else
+        {
+          uint64_t n_outputs = m_db->get_num_outputs(in_to_key.amount);
+          LOG_PRINT_L2("output size " << print_money(in_to_key.amount) << ": " << n_outputs << " available");
+          // n_outputs includes the output we're considering
+          if (n_outputs <= 2)
+            ++n_unmixable;
+          else
+            ++n_mixable;
+        }
         if (in_to_key.key_offsets.size() - 1 < mixin)
           mixin = in_to_key.key_offsets.size() - 1;
       }
     }
+
+    // for v3, we force txes with all mixable inputs to be rct
+    if (m_hardfork->get_current_version() >= 3)
+    {
+      if (n_unmixable == 0 && tx.version == 1)
+      {
+        LOG_PRINT_L1("Tx " << get_transaction_hash(tx) << " is not rct and does not have unmixable inputs");
+        tvc.m_not_rct = true;
+        return false;
+      }
+    }
+
     if (mixin < 2)
     {
       if (n_unmixable == 0)
diff --git a/src/cryptonote_core/verification_context.h b/src/cryptonote_core/verification_context.h
index e58291ea9..0bb635e84 100644
--- a/src/cryptonote_core/verification_context.h
+++ b/src/cryptonote_core/verification_context.h
@@ -47,6 +47,7 @@ namespace cryptonote
     bool m_too_big;
     bool m_overspend;
     bool m_fee_too_low;
+    bool m_not_rct;
   };
 
   struct block_verification_context
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 586b09179..cef53b5ce 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -483,6 +483,8 @@ namespace cryptonote
         res.reason = "overspend";
       if ((res.fee_too_low = tvc.m_fee_too_low))
         res.reason = "fee too low";
+      if ((res.not_rct = tvc.m_not_rct))
+        res.reason = "tx is not ringct";
       return true;
     }
 
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 5dd9de8d5..780de8682 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -376,6 +376,7 @@ namespace cryptonote
       bool too_big;
       bool overspend;
       bool fee_too_low;
+      bool not_rct;
 
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(status)
@@ -388,6 +389,7 @@ namespace cryptonote
         KV_SERIALIZE(too_big)
         KV_SERIALIZE(overspend)
         KV_SERIALIZE(fee_too_low)
+        KV_SERIALIZE(not_rct)
       END_KV_SERIALIZE_MAP()
     };
   };