Relative lock - consensus code (proof of concept)

Author: tevador

src/cryptonote_core/blockchain.cpp

@@ -102,8 +102,14 @@ static bool get_fcmp_tx_tree_root(const BlockchainDB *db, const cryptonote::tran
     return true;
   CHECK_AND_ASSERT_MES(!tx.pruned, false, "can't get root for pruned FCMP txs");
 
-  // Make sure reference block exists in the chain
-  CHECK_AND_NO_ASSERT_MES_L1(tx.rct_signatures.p.reference_block < db->height(), false,
+  uint64_t unlock_height = db->height();
+  if (tx.unlock_time == 1) //relative lock
+  {
+    unlock_height -= 720;
+  }
+
+  // Make sure reference block exists in the chain and is unlocked
+  CHECK_AND_NO_ASSERT_MES_L1(tx.rct_signatures.p.reference_block < unlock_height, false,
       "tx " << get_transaction_hash(tx) << " included reference block that was too high");
 
   // Get the tree root and n tree layers at provided block

src/cryptonote_core/tx_verification_utils.cpp

@@ -346,7 +346,8 @@ static bool ver_non_input_consensus_templated(TxForwardIt tx_begin,
         }
 
         // Rule 8
-        if (hf_version >= HF_VERSION_REJECT_UNLOCK_TIME && tx.unlock_time != 0)
+        // Allow unlock_time 0 (no lock) or 1 (relative lock)
+        if (hf_version >= HF_VERSION_REJECT_UNLOCK_TIME && tx.unlock_time > 1)
         {
             tvc.m_verifivation_failed = true;
             tvc.m_nonzero_unlock_time = true;