diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 30456d7a..1e113dc7 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -1360,13 +1360,10 @@ bool blockchain_storage::validate_miner_transaction(const block& b, return false; } - if (b.miner_tx.version > TRANSACTION_VERSION_PRE_HF4) + if (!verify_asset_surjection_proof(b.miner_tx, tx_id_for_post_hf4_era)) { - if (!verify_asset_surjection_proof(b.miner_tx, tx_id_for_post_hf4_era)) - { - LOG_ERROR("asset surjection proof verification failed for miner tx"); - return false; - } + LOG_ERROR("asset surjection proof verification failed for miner tx"); + return false; } LOG_PRINT_MAGENTA("Mining tx verification ok, blocks_size_median = " << blocks_size_median, LOG_LEVEL_2); diff --git a/src/currency_core/currency_basic.h b/src/currency_core/currency_basic.h index 26b17a9f..0fbab8a8 100644 --- a/src/currency_core/currency_basic.h +++ b/src/currency_core/currency_basic.h @@ -315,51 +315,6 @@ namespace currency ///////////////////////////////////////////////////////////////////////////// // Zarcanum structures // - //#pragma pack(push, 1) - /* - struct zarcanum_input : public referring_input - { - zarcanum_input() {} - // Boost's Assignable concept - zarcanum_input(const zarcanum_input&) = default; - zarcanum_input& operator=(const zarcanum_input&)= default; - - crypto::key_image k_image; - - BEGIN_SERIALIZE_OBJECT() - FIELD(k_image) - FIELD(key_offsets) // referring_input - END_SERIALIZE() - - BEGIN_BOOST_SERIALIZATION() - BOOST_SERIALIZE(k_image) - BOOST_SERIALIZE(key_offsets) // referring_input - END_BOOST_SERIALIZATION() - }; - - // txin_zarcanum_inputs contains several zarcanum_input instances and corresponds to one ZC_sig - struct txin_zarcanum_inputs - { - txin_zarcanum_inputs() {} - - // Boost's Assignable concept - txin_zarcanum_inputs(const txin_zarcanum_inputs&) = default; - txin_zarcanum_inputs& operator=(const txin_zarcanum_inputs&) = default; - - std::vector elements; - std::vector etc_details; - - BEGIN_SERIALIZE_OBJECT() - FIELD(elements) - FIELD(etc_details) - END_SERIALIZE() - - BEGIN_BOOST_SERIALIZATION() - BOOST_SERIALIZE(elements) - BOOST_SERIALIZE(etc_details) - END_BOOST_SERIALIZATION() - }; - */ struct txin_zc_input : public referring_input {