From 5db1cd536098885e1d2f9c9dc33a7fc817377c81 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 25 Mar 2018 01:32:12 +0100 Subject: [PATCH] Removed code --- .../cryptonote_format_utils.cpp | 20 +++++++++---------- src/cryptonote_core/cryptonote_format_utils.h | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index 98897c2..db09ad9 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -55,7 +55,7 @@ namespace cryptonote return true; } //--------------------------------------------------------------- - bool construct_miner_tx(size_t height, size_t median_size, uint64_t already_generated_coins, size_t current_block_size, uint64_t fee, const account_public_address &miner_address, transaction& tx, const blobdata& extra_nonce, size_t max_outs) { + /*bool construct_miner_tx(size_t height, size_t median_size, uint64_t already_generated_coins, size_t current_block_size, uint64_t fee, const account_public_address &miner_address, transaction& tx, const blobdata& extra_nonce, size_t max_outs) { tx.vin.clear(); tx.vout.clear(); tx.extra.clear(); @@ -123,7 +123,7 @@ namespace cryptonote //LOG_PRINT("MINER_TX generated ok, block_reward=" << print_money(block_reward) << "(" << print_money(block_reward - fee) << "+" << print_money(fee) // << "), current_block_size=" << current_block_size << ", already_generated_coins=" << already_generated_coins << ", tx_id=" << get_transaction_hash(tx), LOG_LEVEL_2); return true; - } + }*/ //--------------------------------------------------------------- bool generate_key_image_helper(const account_keys& ack, const crypto::public_key& tx_public_key, size_t real_output_index, keypair& in_ephemeral, crypto::key_image& ki) { @@ -317,7 +317,7 @@ namespace cryptonote return true; } //--------------------------------------------------------------- - bool construct_tx(const account_keys& sender_account_keys, const std::vector& sources, const std::vector& destinations, std::vector extra, transaction& tx, uint64_t unlock_time) + /*bool construct_tx(const account_keys& sender_account_keys, const std::vector& sources, const std::vector& destinations, std::vector extra, transaction& tx, uint64_t unlock_time) { tx.vin.clear(); tx.vout.clear(); @@ -443,7 +443,7 @@ namespace cryptonote LOG_PRINT2("construct_tx.log", "transaction_created: " << get_transaction_hash(tx) << ENDL << obj_to_json_str(tx) << ENDL << ss_ring_s.str() , LOG_LEVEL_3); return true; - } + }*/ //--------------------------------------------------------------- bool get_inputs_money_amount(const transaction& tx, uint64_t& money) { @@ -736,7 +736,7 @@ namespace cryptonote return get_object_hash(blob, res); } //--------------------------------------------------------------- - bool generate_genesis_block(block& bl) + /*bool generate_genesis_block(block& bl) { //genesis block bl = boost::value_initialized(); @@ -759,9 +759,9 @@ namespace cryptonote bl.nonce = 10000; miner::find_nonce_for_given_block(bl, 1, 0); return true; - } + }*/ //--------------------------------------------------------------- - bool get_genesis_block_hash(crypto::hash& h) + /*bool get_genesis_block_hash(crypto::hash& h) { static std::atomic cached(false); static crypto::hash genesis_block_hash; @@ -784,7 +784,7 @@ namespace cryptonote h = genesis_block_hash; return true; - } + }*/ //--------------------------------------------------------------- bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height) { @@ -904,7 +904,7 @@ namespace cryptonote return get_tx_tree_hash(txs_ids); } //--------------------------------------------------------------- - bool check_proof_of_work_v1(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work) + /*bool check_proof_of_work_v1(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work) { if (BLOCK_MAJOR_VERSION_1 != bl.major_version) return false; @@ -960,6 +960,6 @@ namespace cryptonote } CHECK_AND_ASSERT_MES(false, false, "unknown block major version: " << bl.major_version << "." << bl.minor_version); - } + }*/ //--------------------------------------------------------------- } diff --git a/src/cryptonote_core/cryptonote_format_utils.h b/src/cryptonote_core/cryptonote_format_utils.h index b9e5dc5..16baed7 100644 --- a/src/cryptonote_core/cryptonote_format_utils.h +++ b/src/cryptonote_core/cryptonote_format_utils.h @@ -19,7 +19,7 @@ namespace cryptonote crypto::hash get_transaction_prefix_hash(const transaction_prefix& tx); bool parse_and_validate_tx_from_blob(const blobdata& tx_blob, transaction& tx, crypto::hash& tx_hash, crypto::hash& tx_prefix_hash); bool parse_and_validate_tx_from_blob(const blobdata& tx_blob, transaction& tx); - bool construct_miner_tx(size_t height, size_t median_size, uint64_t already_generated_coins, size_t current_block_size, uint64_t fee, const account_public_address &miner_address, transaction& tx, const blobdata& extra_nonce = blobdata(), size_t max_outs = 1); + //bool construct_miner_tx(size_t height, size_t median_size, uint64_t already_generated_coins, size_t current_block_size, uint64_t fee, const account_public_address &miner_address, transaction& tx, const blobdata& extra_nonce = blobdata(), size_t max_outs = 1); struct tx_source_entry { @@ -42,7 +42,7 @@ namespace cryptonote }; //--------------------------------------------------------------- - bool construct_tx(const account_keys& sender_account_keys, const std::vector& sources, const std::vector& destinations, std::vector extra, transaction& tx, uint64_t unlock_time); + //bool construct_tx(const account_keys& sender_account_keys, const std::vector& sources, const std::vector& destinations, std::vector extra, transaction& tx, uint64_t unlock_time); template bool find_tx_extra_field_by_type(const std::vector& tx_extra_fields, T& field) @@ -87,8 +87,8 @@ namespace cryptonote bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height); crypto::hash get_block_longhash(const block& b, uint64_t height); bool get_bytecoin_block_longhash(const block& blk, crypto::hash& res); - bool generate_genesis_block(block& bl); - bool get_genesis_block_hash(crypto::hash& h); + //bool generate_genesis_block(block& bl); + //bool get_genesis_block_hash(crypto::hash& h); bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b); bool parse_and_validate_block_from_blob(const blobdata& b_blob, bb_block& b); bool get_inputs_money_amount(const transaction& tx, uint64_t& money); @@ -207,9 +207,9 @@ namespace cryptonote crypto::hash get_tx_tree_hash(const block& b); crypto::hash get_tx_tree_hash(const bb_block& b); - bool check_proof_of_work_v1(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); - bool check_proof_of_work_v2(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); - bool check_proof_of_work(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); + //bool check_proof_of_work_v1(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); + //bool check_proof_of_work_v2(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); + //bool check_proof_of_work(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work); #define CHECKED_GET_SPECIFIC_VARIANT(variant_var, specific_type, variable_name, fail_return_val) \ CHECK_AND_ASSERT_MES(variant_var.type() == typeid(specific_type), fail_return_val, "wrong variant type: " << variant_var.type().name() << ", expected " << typeid(specific_type).name()); \