From 12ee5131e86a11ce52a2591be56bdf4d32f6d347 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sun, 25 Mar 2018 09:56:39 +0200 Subject: [PATCH] Trashed some code --- src/cryptonote_core/cryptonote_basic.h | 22 +- .../cryptonote_format_utils.cpp | 304 ------------------ src/main.cc | 11 +- 3 files changed, 16 insertions(+), 321 deletions(-) diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index cb1d3c0..83fb4ae 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -233,7 +233,7 @@ namespace cryptonote } ar.end_array(); } - else + else { ar.tag("rct_signatures"); if (!vin.empty()) @@ -574,18 +574,18 @@ namespace cryptonote }; struct integrated_address { - account_public_address adr; - crypto::hash8 payment_id; + account_public_address adr; + crypto::hash8 payment_id; - BEGIN_SERIALIZE_OBJECT() - FIELD(adr) - FIELD(payment_id) - END_SERIALIZE() + BEGIN_SERIALIZE_OBJECT() + FIELD(adr) + FIELD(payment_id) + END_SERIALIZE() - BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(adr) - KV_SERIALIZE(payment_id) - END_KV_SERIALIZE_MAP() + BEGIN_KV_SERIALIZE_MAP() + KV_SERIALIZE(adr) + KV_SERIALIZE(payment_id) + END_KV_SERIALIZE_MAP() }; struct keypair diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index 7a0c74f..824659f 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -55,75 +55,6 @@ 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) { - tx.vin.clear(); - tx.vout.clear(); - tx.extra.clear(); - - keypair txkey = keypair::generate(); - add_tx_pub_key_to_extra(tx, txkey.pub); - if(!extra_nonce.empty()) - if(!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce)) - return false; - - txin_gen in; - in.height = height; - - uint64_t block_reward; - if(!get_block_reward(median_size, current_block_size, already_generated_coins, block_reward)) - { - LOG_PRINT_L0("Block is too big"); - return false; - } -#if defined(DEBUG_CREATE_BLOCK_TEMPLATE) - LOG_PRINT_L1("Creating block template: reward " << block_reward << - ", fee " << fee) -#endif - block_reward += fee; - - std::vector out_amounts; - decompose_amount_into_digits(block_reward, DEFAULT_FEE, - [&out_amounts](uint64_t a_chunk) { out_amounts.push_back(a_chunk); }, - [&out_amounts](uint64_t a_dust) { out_amounts.push_back(a_dust); }); - - CHECK_AND_ASSERT_MES(1 <= max_outs, false, "max_out must be non-zero"); - while (max_outs < out_amounts.size()) - { - out_amounts[out_amounts.size() - 2] += out_amounts.back(); - out_amounts.resize(out_amounts.size() - 1); - } - - uint64_t summary_amounts = 0; - for (size_t no = 0; no < out_amounts.size(); no++) - { - crypto::key_derivation derivation = AUTO_VAL_INIT(derivation);; - crypto::public_key out_eph_public_key = AUTO_VAL_INIT(out_eph_public_key); - bool r = crypto::generate_key_derivation(miner_address.m_view_public_key, txkey.sec, derivation); - CHECK_AND_ASSERT_MES(r, false, "while creating outs: failed to generate_key_derivation(" << miner_address.m_view_public_key << ", " << txkey.sec << ")"); - - r = crypto::derive_public_key(derivation, no, miner_address.m_spend_public_key, out_eph_public_key); - CHECK_AND_ASSERT_MES(r, false, "while creating outs: failed to derive_public_key(" << derivation << ", " << no << ", "<< miner_address.m_spend_public_key << ")"); - - txout_to_key tk; - tk.key = out_eph_public_key; - - tx_out out; - summary_amounts += out.amount = out_amounts[no]; - out.target = tk; - tx.vout.push_back(out); - } - - CHECK_AND_ASSERT_MES(summary_amounts == block_reward, false, "Failed to construct miner tx, summary_amounts = " << summary_amounts << " not equal block_reward = " << block_reward); - - tx.version = CURRENT_TRANSACTION_VERSION; - //lock - tx.unlock_time = height + CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW; - tx.vin.push_back(in); - //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) { crypto::key_derivation recv_derivation = AUTO_VAL_INIT(recv_derivation); @@ -316,133 +247,6 @@ 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) - { - tx.vin.clear(); - tx.vout.clear(); - tx.signatures.clear(); - - tx.version = CURRENT_TRANSACTION_VERSION; - tx.unlock_time = unlock_time; - - tx.extra = extra; - keypair txkey = keypair::generate(); - add_tx_pub_key_to_extra(tx, txkey.pub); - - struct input_generation_context_data - { - keypair in_ephemeral; - }; - std::vector in_contexts; - - - uint64_t summary_inputs_money = 0; - //fill inputs - BOOST_FOREACH(const tx_source_entry& src_entr, sources) - { - if(src_entr.real_output >= src_entr.outputs.size()) - { - LOG_ERROR("real_output index (" << src_entr.real_output << ")bigger than output_keys.size()=" << src_entr.outputs.size()); - return false; - } - summary_inputs_money += src_entr.amount; - - //key_derivation recv_derivation; - in_contexts.push_back(input_generation_context_data()); - keypair& in_ephemeral = in_contexts.back().in_ephemeral; - crypto::key_image img; - if(!generate_key_image_helper(sender_account_keys, src_entr.real_out_tx_key, src_entr.real_output_in_tx_index, in_ephemeral, img)) - return false; - - //check that derivated key is equal with real output key - if( !(in_ephemeral.pub == src_entr.outputs[src_entr.real_output].second) ) - { - LOG_ERROR("derived public key missmatch with output public key! "<< ENDL << "derived_key:" - << string_tools::pod_to_hex(in_ephemeral.pub) << ENDL << "real output_public_key:" - << string_tools::pod_to_hex(src_entr.outputs[src_entr.real_output].second) ); - return false; - } - - //put key image into tx input - txin_to_key input_to_key; - input_to_key.amount = src_entr.amount; - input_to_key.k_image = img; - - //fill outputs array and use relative offsets - BOOST_FOREACH(const tx_source_entry::output_entry& out_entry, src_entr.outputs) - input_to_key.key_offsets.push_back(out_entry.first); - - input_to_key.key_offsets = absolute_output_offsets_to_relative(input_to_key.key_offsets); - tx.vin.push_back(input_to_key); - } - - // "Shuffle" outs - std::vector shuffled_dsts(destinations); - std::sort(shuffled_dsts.begin(), shuffled_dsts.end(), [](const tx_destination_entry& de1, const tx_destination_entry& de2) { return de1.amount < de2.amount; } ); - - uint64_t summary_outs_money = 0; - //fill outputs - size_t output_index = 0; - BOOST_FOREACH(const tx_destination_entry& dst_entr, shuffled_dsts) - { - CHECK_AND_ASSERT_MES(dst_entr.amount > 0, false, "Destination with wrong amount: " << dst_entr.amount); - crypto::key_derivation derivation; - crypto::public_key out_eph_public_key; - bool r = crypto::generate_key_derivation(dst_entr.addr.m_view_public_key, txkey.sec, derivation); - CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to generate_key_derivation(" << dst_entr.addr.m_view_public_key << ", " << txkey.sec << ")"); - - r = crypto::derive_public_key(derivation, output_index, dst_entr.addr.m_spend_public_key, out_eph_public_key); - CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to derive_public_key(" << derivation << ", " << output_index << ", "<< dst_entr.addr.m_spend_public_key << ")"); - - tx_out out; - out.amount = dst_entr.amount; - txout_to_key tk; - tk.key = out_eph_public_key; - out.target = tk; - tx.vout.push_back(out); - output_index++; - summary_outs_money += dst_entr.amount; - } - - //check money - if(summary_outs_money > summary_inputs_money ) - { - LOG_ERROR("Transaction inputs money ("<< summary_inputs_money << ") less than outputs money (" << summary_outs_money << ")"); - return false; - } - - - //generate ring signatures - crypto::hash tx_prefix_hash; - get_transaction_prefix_hash(tx, tx_prefix_hash); - - std::stringstream ss_ring_s; - size_t i = 0; - BOOST_FOREACH(const tx_source_entry& src_entr, sources) - { - ss_ring_s << "pub_keys:" << ENDL; - std::vector keys_ptrs; - BOOST_FOREACH(const tx_source_entry::output_entry& o, src_entr.outputs) - { - keys_ptrs.push_back(&o.second); - ss_ring_s << o.second << ENDL; - } - - tx.signatures.push_back(std::vector()); - std::vector& sigs = tx.signatures.back(); - sigs.resize(src_entr.outputs.size()); - crypto::generate_ring_signature(tx_prefix_hash, boost::get(tx.vin[i]).k_image, keys_ptrs, in_contexts[i].in_ephemeral.sec, src_entr.real_output, sigs.data()); - ss_ring_s << "signatures:" << ENDL; - std::for_each(sigs.begin(), sigs.end(), [&](const crypto::signature& s){ss_ring_s << s << ENDL;}); - ss_ring_s << "prefix_hash:" << tx_prefix_hash << ENDL << "in_ephemeral_key: " << in_contexts[i].in_ephemeral.sec << ENDL << "real_output: " << src_entr.real_output; - i++; - } - - 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) { money = 0; @@ -734,56 +538,6 @@ namespace cryptonote return get_object_hash(blob, res); } //--------------------------------------------------------------- - /*bool generate_genesis_block(block& bl) - { - //genesis block - bl = boost::value_initialized(); - - - account_public_address ac = boost::value_initialized(); - std::vector sz; - construct_miner_tx(0, 0, 0, 0, 0, ac, bl.miner_tx); // zero fee in genesis - blobdata txb = tx_to_blob(bl.miner_tx); - std::string hex_tx_represent = string_tools::buff_to_hex_nodelimer(txb); - - //hard code coinbase tx in genesis block, because "tru" generating tx use random, but genesis should be always the same - std::string genesis_coinbase_tx_hex = "013c01ff0001ffffffffffff03029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd08807121017767aafcde9be00dcfd098715ebcf7f410daebc582fda69d24a28e9d0bc890d1"; - - blobdata tx_bl; - string_tools::parse_hexstr_to_binbuff(genesis_coinbase_tx_hex, tx_bl); - bool r = parse_and_validate_tx_from_blob(tx_bl, bl.miner_tx); - CHECK_AND_ASSERT_MES(r, false, "failed to parse coinbase tx from hard coded blob"); - bl.timestamp = 0; - bl.nonce = 10000; - miner::find_nonce_for_given_block(bl, 1, 0); - return true; - }*/ - //--------------------------------------------------------------- - /*bool get_genesis_block_hash(crypto::hash& h) - { - static std::atomic cached(false); - static crypto::hash genesis_block_hash; - if (!cached) - { - static std::mutex m; - std::unique_lock lock(m); - if (!cached) - { - block genesis_block; - if (!generate_genesis_block(genesis_block)) - return false; - - if (!get_block_hash(genesis_block, genesis_block_hash)) - return false; - - cached = true; - } - } - - h = genesis_block_hash; - return true; - }*/ - //--------------------------------------------------------------- bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height) { blobdata bd; @@ -902,62 +656,4 @@ 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) - { - if (BLOCK_MAJOR_VERSION_1 != bl.major_version) - return false; - - proof_of_work = get_block_longhash(bl, 0); - return check_hash(proof_of_work, current_diffic); - } - //--------------------------------------------------------------- - bool check_proof_of_work_v2(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work) - { - if (BLOCK_MAJOR_VERSION_2 != bl.major_version && - BLOCK_MAJOR_VERSION_3 != bl.major_version) - return false; - - if (!get_bytecoin_block_longhash(bl, proof_of_work)) - return false; - if (!check_hash(proof_of_work, current_diffic)) - return false; - - tx_extra_merge_mining_tag mm_tag; - if (!get_mm_tag_from_extra(bl.parent_block.miner_tx.extra, mm_tag)) - { - LOG_ERROR("merge mining tag wasn't found in extra of the parent block miner transaction"); - return false; - } - - crypto::hash genesis_block_hash; - if (!get_genesis_block_hash(genesis_block_hash)) - return false; - - if (8 * sizeof(genesis_block_hash) < bl.parent_block.blockchain_branch.size()) - return false; - - crypto::hash aux_block_header_hash; - if (!get_block_header_hash(bl, aux_block_header_hash)) - return false; - - crypto::hash aux_blocks_merkle_root; - crypto::tree_hash_from_branch(bl.parent_block.blockchain_branch.data(), bl.parent_block.blockchain_branch.size(), - aux_block_header_hash, &genesis_block_hash, aux_blocks_merkle_root); - CHECK_AND_NO_ASSERT_MES(aux_blocks_merkle_root == mm_tag.merkle_root, false, "Aux block hash wasn't found in merkle tree"); - - return true; - } - //--------------------------------------------------------------- - bool check_proof_of_work(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work) - { - switch (bl.major_version) - { - case BLOCK_MAJOR_VERSION_1: return check_proof_of_work_v1(bl, current_diffic, proof_of_work); - case BLOCK_MAJOR_VERSION_2: return check_proof_of_work_v2(bl, current_diffic, proof_of_work); - case BLOCK_MAJOR_VERSION_3: return check_proof_of_work_v2(bl, current_diffic, proof_of_work); - } - - CHECK_AND_ASSERT_MES(false, false, "unknown block major version: " << bl.major_version << "." << bl.minor_version); - }*/ - //--------------------------------------------------------------- } diff --git a/src/main.cc b/src/main.cc index 61db6fc..5776b87 100644 --- a/src/main.cc +++ b/src/main.cc @@ -29,8 +29,7 @@ blobdata uint64be_to_blob(uint64_t num) { res[7] = num & 0xff; return res; } - - + static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2) { cryptonote::tx_extra_merge_mining_tag mm_tag; mm_tag.depth = 0; @@ -97,7 +96,7 @@ NAN_METHOD(convert_blob) { info.GetReturnValue().Set(returnValue); } -void get_block_id(const Nan::FunctionCallbackInfo& info) { +NAN_METHOD(get_block_id) { if (info.Length() < 1) return THROW_ERROR_EXCEPTION("You must provide one argument."); Local target = info[0]->ToObject(); @@ -118,7 +117,7 @@ void get_block_id(const Nan::FunctionCallbackInfo& info) { info.GetReturnValue().Set(returnValue); } -void construct_block_blob(const Nan::FunctionCallbackInfo& info) { +NAN_METHOD(construct_block_blob) { if (info.Length() < 2) return THROW_ERROR_EXCEPTION("You must provide two arguments."); Local block_template_buf = info[0]->ToObject(); @@ -151,7 +150,7 @@ void construct_block_blob(const Nan::FunctionCallbackInfo& info) { } -void address_decode(const Nan::FunctionCallbackInfo& info) { +NAN_METHOD(address_decode) { if (info.Length() < 1) return THROW_ERROR_EXCEPTION("You must provide one argument."); Local target = info[0]->ToObject(); @@ -181,7 +180,7 @@ void address_decode(const Nan::FunctionCallbackInfo& info) { } } -void address_decode_integrated(const Nan::FunctionCallbackInfo& info) { +NAN_METHOD(address_decode_integrated) { if (info.Length() < 1) return THROW_ERROR_EXCEPTION("You must provide one argument."); Local target = info[0]->ToObject();