Merge pull request #365

e63b854 blockchain_db: match tx addition semantics to original code (moneromooo-monero)
83bbea4 Add a is_key_image_spent daemon command and RPC call (moneromooo-monero)
35abef1 blockchain: remove dead code (moneromooo-monero)

4 files changed, 24 insertions, 61 deletions

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 648b77b2f..efac2d3d9 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -81,6 +81,8 @@ m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false), m_max_prepare_
 template<class archive_t>
 void Blockchain::serialize(archive_t & ar, const unsigned int version)
 {
+    key_images_container dummy_key_images_container;
+
     LOG_PRINT_L3("Blockchain::" << __func__);
     if(version < 11)
         return;
@@ -88,7 +90,7 @@ void Blockchain::serialize(archive_t & ar, const unsigned int version)
     ar & m_blocks;
     ar & m_blocks_index;
     ar & m_transactions;
-    ar & m_spent_keys;
+    ar & dummy_key_images_container;
     ar & m_alternative_chains;
     ar & m_outputs;
     ar & m_invalid_blocks;
@@ -96,7 +98,7 @@ void Blockchain::serialize(archive_t & ar, const unsigned int version)
     /*serialization bug workaround*/
     if(version > 11)
     {
-        uint64_t total_check_count = m_db->height() + m_blocks_index.size() + m_transactions.size() + m_spent_keys.size() + m_alternative_chains.size() + m_outputs.size() + m_invalid_blocks.size() + m_current_block_cumul_sz_limit;
+        uint64_t total_check_count = m_db->height() + m_blocks_index.size() + m_transactions.size() + dummy_key_images_container.size() + m_alternative_chains.size() + m_outputs.size() + m_invalid_blocks.size() + m_current_block_cumul_sz_limit;
         if(archive_t::is_saving::value)
         {
             ar & total_check_count;
@@ -109,14 +111,14 @@ void Blockchain::serialize(archive_t & ar, const unsigned int version)
             {
                 LOG_ERROR("Blockchain storage data corruption detected. total_count loaded from file = " << total_check_count_loaded << ", expected = " << total_check_count);
 
-                LOG_PRINT_L0("Blockchain storage:" << std::endl << "m_blocks: " << m_db->height() << std::endl << "m_blocks_index: " << m_blocks_index.size() << std::endl << "m_transactions: " << m_transactions.size() << std::endl << "m_spent_keys: " << m_spent_keys.size() << std::endl << "m_alternative_chains: " << m_alternative_chains.size() << std::endl << "m_outputs: " << m_outputs.size() << std::endl << "m_invalid_blocks: " << m_invalid_blocks.size() << std::endl << "m_current_block_cumul_sz_limit: " << m_current_block_cumul_sz_limit);
+                LOG_PRINT_L0("Blockchain storage:" << std::endl << "m_blocks: " << m_db->height() << std::endl << "m_blocks_index: " << m_blocks_index.size() << std::endl << "m_transactions: " << m_transactions.size() << std::endl << "dummy_key_images_container: " << dummy_key_images_container.size() << std::endl << "m_alternative_chains: " << m_alternative_chains.size() << std::endl << "m_outputs: " << m_outputs.size() << std::endl << "m_invalid_blocks: " << m_invalid_blocks.size() << std::endl << "m_current_block_cumul_sz_limit: " << m_current_block_cumul_sz_limit);
 
                 throw std::runtime_error("Blockchain data corruption");
             }
         }
     }
 
-    LOG_PRINT_L3("Blockchain storage:" << std::endl << "m_blocks: " << m_db->height() << std::endl << "m_blocks_index: " << m_blocks_index.size() << std::endl << "m_transactions: " << m_transactions.size() << std::endl << "m_spent_keys: " << m_spent_keys.size() << std::endl << "m_alternative_chains: " << m_alternative_chains.size() << std::endl << "m_outputs: " << m_outputs.size() << std::endl << "m_invalid_blocks: " << m_invalid_blocks.size() << std::endl << "m_current_block_cumul_sz_limit: " << m_current_block_cumul_sz_limit);
+    LOG_PRINT_L3("Blockchain storage:" << std::endl << "m_blocks: " << m_db->height() << std::endl << "m_blocks_index: " << m_blocks_index.size() << std::endl << "m_transactions: " << m_transactions.size() << std::endl << "dummy_key_images_container: " << dummy_key_images_container.size() << std::endl << "m_alternative_chains: " << m_alternative_chains.size() << std::endl << "m_outputs: " << m_outputs.size() << std::endl << "m_invalid_blocks: " << m_invalid_blocks.size() << std::endl << "m_current_block_cumul_sz_limit: " << m_current_block_cumul_sz_limit);
 }
 //------------------------------------------------------------------
 bool Blockchain::have_tx(const crypto::hash &id) const
@@ -470,7 +472,6 @@ bool Blockchain::reset_and_set_genesis_block(const block& b)
     LOG_PRINT_L3("Blockchain::" << __func__);
     CRITICAL_REGION_LOCAL(m_blockchain_lock);
     m_transactions.clear();
-    m_spent_keys.clear();
     m_blocks.clear();
     m_blocks_index.clear();
     m_alternative_chains.clear();
@@ -482,57 +483,6 @@ bool Blockchain::reset_and_set_genesis_block(const block& b)
     return bvc.m_added_to_main_chain && !bvc.m_verifivation_failed;
 }
 //------------------------------------------------------------------
-//TODO: move to BlockchainDB subclass
-bool Blockchain::purge_transaction_keyimages_from_blockchain(const transaction& tx, bool strict_check)
-{
-    LOG_PRINT_L3("Blockchain::" << __func__);
-    CRITICAL_REGION_LOCAL(m_blockchain_lock);
-    struct purge_transaction_visitor: public boost::static_visitor<bool>
-    {
-        key_images_container& m_spent_keys;
-        bool m_strict_check;
-        purge_transaction_visitor(key_images_container& spent_keys, bool strict_check) :
-            m_spent_keys(spent_keys), m_strict_check(strict_check)
-        {
-        }
-
-        bool operator()(const txin_to_key& inp) const
-        {
-            //const crypto::key_image& ki = inp.k_image;
-            auto r = m_spent_keys.find(inp.k_image);
-            if(r != m_spent_keys.end())
-            {
-                m_spent_keys.erase(r);
-            }
-            else
-            {
-                CHECK_AND_ASSERT_MES(!m_strict_check, false, "purge_block_data_from_blockchain: key image in transaction not found");
-            }
-            return true;
-        }
-        bool operator()(const txin_gen& inp) const
-        {
-            return true;
-        }
-        bool operator()(const txin_to_script& tx) const
-        {
-            return false;
-        }
-
-        bool operator()(const txin_to_scripthash& tx) const
-        {
-            return false;
-        }
-    };
-
-    BOOST_FOREACH(const txin_v& in, tx.vin)
-    {
-        bool r = boost::apply_visitor(purge_transaction_visitor(m_spent_keys, strict_check), in);
-        CHECK_AND_ASSERT_MES(!strict_check || r, false, "failed to process purge_transaction_visitor");
-    }
-    return true;
-}
-//------------------------------------------------------------------
 crypto::hash Blockchain::get_tail_id(uint64_t& height) const
 {
     LOG_PRINT_L3("Blockchain::" << __func__);
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
index 1c6f58dbf..57763f6ca 100644
--- a/src/cryptonote_core/blockchain.h
+++ b/src/cryptonote_core/blockchain.h
@@ -185,7 +185,6 @@ namespace cryptonote
     blocks_container m_blocks;               // height  -> block_extended_info
     blocks_by_id_index m_blocks_index;       // crypto::hash -> height
     transactions_container m_transactions;
-    key_images_container m_spent_keys;
     size_t m_current_block_cumul_sz_limit;
 
     std::unordered_map<crypto::hash, std::unordered_map<crypto::key_image, std::vector<output_data_t>>> m_scan_table;
@@ -233,8 +232,6 @@ namespace cryptonote
 
     bool switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::iterator>& alt_chain, bool discard_disconnected_chain);
     block pop_block_from_blockchain();
-    bool purge_transaction_from_blockchain(const crypto::hash& tx_id);
-    bool purge_transaction_keyimages_from_blockchain(const transaction& tx, bool strict_check);
 
     bool handle_block_to_main_chain(const block& bl, block_verification_context& bvc);
     bool handle_block_to_main_chain(const block& bl, const crypto::hash& id, block_verification_context& bvc);
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 31e46b534..4d90eec1e 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -515,6 +515,21 @@ namespace cryptonote
     return true;
   }
   //-----------------------------------------------------------------------------------------------
+  bool core::is_key_image_spent(const crypto::key_image &key_image)
+  {
+    return m_blockchain_storage.have_tx_keyimg_as_spent(key_image);
+  }
+  //-----------------------------------------------------------------------------------------------
+  bool core::are_key_images_spent(const std::vector<crypto::key_image>& key_im, std::vector<bool> &spent)
+  {
+    spent.clear();
+    BOOST_FOREACH(auto& ki, key_im)
+    {
+      spent.push_back(m_blockchain_storage.have_tx_keyimg_as_spent(ki));
+    }
+    return true;
+  }
+  //-----------------------------------------------------------------------------------------------
   bool core::check_tx_inputs_keyimages_diff(const transaction& tx)
   {
     std::unordered_set<crypto::key_image> ki;
diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h
index de953da07..d700b3b47 100644
--- a/src/cryptonote_core/cryptonote_core.h
+++ b/src/cryptonote_core/cryptonote_core.h
@@ -145,6 +145,9 @@ namespace cryptonote
 
      void stop();
 
+     bool is_key_image_spent(const crypto::key_image& key_im);
+     bool are_key_images_spent(const std::vector<crypto::key_image>& key_im, std::vector<bool> &spent);
+
    private:
      bool add_new_tx(const transaction& tx, const crypto::hash& tx_hash, const crypto::hash& tx_prefix_hash, size_t blob_size, tx_verification_context& tvc, bool keeped_by_block);
      bool add_new_tx(const transaction& tx, tx_verification_context& tvc, bool keeped_by_block);
@@ -157,8 +160,6 @@ namespace cryptonote
      bool check_tx_semantic(const transaction& tx, bool keeped_by_block);
      //check if tx already in memory pool or in main blockchain
 
-     bool is_key_image_spent(const crypto::key_image& key_im);
-
      bool check_tx_ring_signature(const txin_to_key& tx, const crypto::hash& tx_prefix_hash, const std::vector<crypto::signature>& sig);
      bool is_tx_spendtime_unlocked(uint64_t unlock_time);
      bool update_miner_block_template();