From 1ec4fd5b721cedc2e042ab3267a4eee2fc8cb0b3 Mon Sep 17 00:00:00 2001 From: Campurro Date: Fri, 9 Nov 2018 19:24:17 +0100 Subject: [PATCH 1/5] Merged mining support --- src/main.cc | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/src/main.cc b/src/main.cc index e11989f..5f6c8ca 100644 --- a/src/main.cc +++ b/src/main.cc @@ -17,6 +17,13 @@ using namespace node; using namespace v8; using namespace cryptonote; +const size_t TX_EXTRA_FIELD_TAG_BYTES = 1; +const size_t TX_MM_FIELD_SIZE_BYTES = 1; +const size_t MAX_VARINT_SIZE = 9; +const size_t TX_MM_TAG_MAX_BYTES = MAX_VARINT_SIZE + sizeof(crypto::hash); +const size_t MERGE_MINING_TAG_RESERVED_SIZE = TX_EXTRA_FIELD_TAG_BYTES + TX_MM_FIELD_SIZE_BYTES + TX_MM_TAG_MAX_BYTES; +const size_t POOL_NONCE_SIZE = 19; + blobdata uint64be_to_blob(uint64_t num) { blobdata res = " "; res[0] = num >> 56 & 0xff; @@ -29,7 +36,9 @@ 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; @@ -40,6 +49,55 @@ static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2 return true; } +*/ + + +static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2) +{ + if (block2.timestamp > block1.timestamp) { // get the most recent timestamp (solve duplicated timestamps on child coin) + block1.timestamp = block2.timestamp; + } + + size_t MERGE_MINING_TAG_RESERVED_SIZE_EX = MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE; + std::vector& extra = block1.miner_tx.extra; + std::string extraAsString(reinterpret_cast(extra.data()), extra.size()); + + std::string extraNonceTemplate; + extraNonceTemplate.push_back(TX_EXTRA_NONCE); + extraNonceTemplate.push_back(MERGE_MINING_TAG_RESERVED_SIZE_EX); + extraNonceTemplate.append(MERGE_MINING_TAG_RESERVED_SIZE, '\0'); + + size_t extraNoncePos = extraAsString.find(extraNonceTemplate); + if (std::string::npos == extraNoncePos) { + return false; + } + + cryptonote::tx_extra_merge_mining_tag tag; + tag.depth = 0; + if (!cryptonote::get_block_header_hash(block2, tag.merkle_root)) { + return false; + } + + + std::vector extraNonceReplacement; + if (!cryptonote::append_mm_tag_to_extra(extraNonceReplacement, tag)) { + return false; + } + + if (MERGE_MINING_TAG_RESERVED_SIZE < extraNonceReplacement.size()) { + return false; + } + + size_t diff = (extraNonceTemplate.size() + POOL_NONCE_SIZE) - extraNonceReplacement.size(); + if (0 < diff) { + extraNonceReplacement.push_back(TX_EXTRA_NONCE); + extraNonceReplacement.push_back(static_cast(diff - 2)); + } + + std::copy(extraNonceReplacement.begin(), extraNonceReplacement.end(), extra.begin() + extraNoncePos); + return true; +} + static bool mergeBlocks(const cryptonote::block& block1, cryptonote::block& block2, const std::vector& branch2) { block2.timestamp = block1.timestamp; @@ -70,6 +128,13 @@ static bool construct_parent_block(const cryptonote::block& b, cryptonote::block return fillExtra(parent_block, b); } + +NAN_METHOD(get_merge_mining_tag_reserved_size) { + Local returnValue = Nan::New(static_cast(MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE)); + info.GetReturnValue().Set(returnValue); +} + + NAN_METHOD(convert_blob) { if (info.Length() < 1) return THROW_ERROR_EXCEPTION("You must provide one argument."); @@ -90,11 +155,25 @@ NAN_METHOD(convert_blob) { b.set_blob_type(blob_type); if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); + block b2 = AUTO_VAL_INIT(b2); + if (info.Length() > 2) { // MM + b2.set_blob_type(BLOB_TYPE_FORKNOTE2); // Only forknote 2 blob types support being mm as child coin + Local child_target = info[2]->ToObject(); + blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); + if (!Buffer::HasInstance(child_target)) return THROW_ERROR_EXCEPTION("Argument (Child block) should be a buffer object."); + if (!parse_and_validate_block_from_blob(child_input, b2)) return THROW_ERROR_EXCEPTION("Failed to parse child block"); + } + if (blob_type == BLOB_TYPE_FORKNOTE2) { block parent_block; if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); if (!get_block_hashing_blob(parent_block, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); } else { + if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 2) { // MM + if (!fillExtra(b, b2)) { + return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra (convert_blob)"); + } + } if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); } @@ -152,13 +231,26 @@ NAN_METHOD(construct_block_blob) { b.set_blob_type(blob_type); if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); + block b2 = AUTO_VAL_INIT(b2); + if (info.Length() > 3) { // MM + b2.set_blob_type(BLOB_TYPE_FORKNOTE2); // Only forknote 2 blob types support being mm as child coin + Local child_target = info[3]->ToObject(); + blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); + if (!Buffer::HasInstance(child_target)) return THROW_ERROR_EXCEPTION("Argument (Child block) should be a buffer object."); + if (!parse_and_validate_block_from_blob(child_input, b2)) return THROW_ERROR_EXCEPTION("Failed to parse child block"); + } + b.nonce = nonce; if (blob_type == BLOB_TYPE_FORKNOTE2) { block parent_block; b.parent_block.nonce = nonce; if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); if (!mergeBlocks(parent_block, b, std::vector())) return THROW_ERROR_EXCEPTION("Failed to postprocess mining block"); - } + } else if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 3) { // MM + if (!fillExtra(b, b2)) { + return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra"); + } + } if (!block_to_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to convert block to blob"); @@ -227,12 +319,57 @@ NAN_METHOD(address_decode_integrated) { } } + +/** + * var mmShareBuffer = merge_blocks(shareBuffer, coins, blobtype, "monetaverde"); + */ +NAN_METHOD(merge_blocks) { + + if (info.Length() < 2) + return THROW_ERROR_EXCEPTION("You must provide two arguments (shareBuffer, block2)."); + + Local block_template_buf = info[0]->ToObject(); + Local child_block_template_buf = info[1]->ToObject(); + + if (!Buffer::HasInstance(block_template_buf)) + return THROW_ERROR_EXCEPTION("First argument should be a buffer object."); + + if (!Buffer::HasInstance(child_block_template_buf)) + return THROW_ERROR_EXCEPTION("Second argument should be a buffer object."); + + blobdata block_template_blob = std::string(Buffer::Data(block_template_buf), Buffer::Length(block_template_buf)); + blobdata child_block_template_blob = std::string(Buffer::Data(child_block_template_buf), Buffer::Length(child_block_template_buf)); + blobdata output = ""; + + block b = AUTO_VAL_INIT(b); + b.set_blob_type(BLOB_TYPE_CRYPTONOTE); + if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse parent block (merge_blocks)"); + + block b2 = AUTO_VAL_INIT(b2); + b2.set_blob_type(BLOB_TYPE_FORKNOTE2); + if (!parse_and_validate_block_from_blob(child_block_template_blob, b2)) return THROW_ERROR_EXCEPTION("Failed to parse child block (merge_blocks)"); + + if (!mergeBlocks(b, b2, std::vector())) + return THROW_ERROR_EXCEPTION("mergeBlocks(b,b2): Failed to postprocess mining block"); + + if (!block_to_blob(b2, output)) { + return THROW_ERROR_EXCEPTION("Failed to convert block to blob (merge_blocks)"); + } + + v8::Local returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked(); + info.GetReturnValue().Set(returnValue); +} + + NAN_MODULE_INIT(init) { Nan::Set(target, Nan::New("construct_block_blob").ToLocalChecked(), Nan::GetFunction(Nan::New(construct_block_blob)).ToLocalChecked()); Nan::Set(target, Nan::New("get_block_id").ToLocalChecked(), Nan::GetFunction(Nan::New(get_block_id)).ToLocalChecked()); Nan::Set(target, Nan::New("convert_blob").ToLocalChecked(), Nan::GetFunction(Nan::New(convert_blob)).ToLocalChecked()); Nan::Set(target, Nan::New("address_decode").ToLocalChecked(), Nan::GetFunction(Nan::New(address_decode)).ToLocalChecked()); Nan::Set(target, Nan::New("address_decode_integrated").ToLocalChecked(), Nan::GetFunction(Nan::New(address_decode_integrated)).ToLocalChecked()); + + Nan::Set(target, Nan::New("merge_blocks").ToLocalChecked(), Nan::GetFunction(Nan::New(merge_blocks)).ToLocalChecked()); + Nan::Set(target, Nan::New("get_merge_mining_tag_reserved_size").ToLocalChecked(), Nan::GetFunction(Nan::New(get_merge_mining_tag_reserved_size)).ToLocalChecked()); } NODE_MODULE(cryptoforknote, init) From f4818ad4610858607e0846e16ff08e4f7b9d02cb Mon Sep 17 00:00:00 2001 From: Campurro Date: Mon, 12 Nov 2018 12:01:58 +0100 Subject: [PATCH 2/5] Add fill_extra function (support for xmr-node-proxy) --- src/main.cc | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main.cc b/src/main.cc index 5f6c8ca..e924f6a 100644 --- a/src/main.cc +++ b/src/main.cc @@ -321,7 +321,7 @@ NAN_METHOD(address_decode_integrated) { /** - * var mmShareBuffer = merge_blocks(shareBuffer, coins, blobtype, "monetaverde"); + * var mmShareBuffer = merge_blocks(shareBuffer, childBlockTemplate); */ NAN_METHOD(merge_blocks) { @@ -361,6 +361,39 @@ NAN_METHOD(merge_blocks) { } +NAN_METHOD(fill_extra) { + if (info.Length() < 2) return THROW_ERROR_EXCEPTION("You must provide two arguments (parentBlock, childBlock)."); + + Local target = info[0]->ToObject(); + if (!Buffer::HasInstance(target)) return THROW_ERROR_EXCEPTION("Argument should be a buffer object."); + Local child_target = info[1]->ToObject(); + if (!Buffer::HasInstance(child_target)) return THROW_ERROR_EXCEPTION("Argument should be a buffer object."); + + blobdata input = std::string(Buffer::Data(target), Buffer::Length(target)); + blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); + blobdata output = ""; + + //convert + block b = AUTO_VAL_INIT(b); + b.set_blob_type(BLOB_TYPE_CRYPTONOTE); + if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); + + block b2 = AUTO_VAL_INIT(b2); + b.set_blob_type(BLOB_TYPE_FORKNOTE2); + if (!parse_and_validate_block_from_blob(child_input, b2)) return THROW_ERROR_EXCEPTION("Failed to parse child block"); + + + + if (!fillExtra(b, b2)) { + return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra (convert_blob)"); + } + if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); + + v8::Local returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked(); + info.GetReturnValue().Set(returnValue); +} + + NAN_MODULE_INIT(init) { Nan::Set(target, Nan::New("construct_block_blob").ToLocalChecked(), Nan::GetFunction(Nan::New(construct_block_blob)).ToLocalChecked()); Nan::Set(target, Nan::New("get_block_id").ToLocalChecked(), Nan::GetFunction(Nan::New(get_block_id)).ToLocalChecked()); @@ -370,6 +403,7 @@ NAN_MODULE_INIT(init) { Nan::Set(target, Nan::New("merge_blocks").ToLocalChecked(), Nan::GetFunction(Nan::New(merge_blocks)).ToLocalChecked()); Nan::Set(target, Nan::New("get_merge_mining_tag_reserved_size").ToLocalChecked(), Nan::GetFunction(Nan::New(get_merge_mining_tag_reserved_size)).ToLocalChecked()); + Nan::Set(target, Nan::New("fill_extra").ToLocalChecked(), Nan::GetFunction(Nan::New(fill_extra)).ToLocalChecked()); } NODE_MODULE(cryptoforknote, init) From b234fcb6c6281cd81578f6fabd85aa5b74cdfc11 Mon Sep 17 00:00:00 2001 From: campurro Date: Sat, 16 Mar 2019 13:32:11 +0100 Subject: [PATCH 3/5] Initial support for Moneta Verde Multi-PoW merged mining --- README.md | 4 ++-- src/cryptonote_config.h | 28 ++++++++++++++++++++++++++++ src/main.cc | 32 +++++++++++++++++++++++++++++--- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e5400fe..d75373e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Node-CryptoForkNote-Util -==================== +Node-CryptoForkNote-Util with Merged Mining support +=================================================== Dependencies ------------ diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 9dccf4a..1e5f3de 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -9,4 +9,32 @@ enum BLOB_TYPE { BLOB_TYPE_CRYPTONOTE2 = 3, // Masari BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki +}; + +enum POW_TYPE { + POW_TYPE_NOT_SET = -1, + POW_TYPE_CN_ORIGINAL = 0, + POW_TYPE_CN_V1 = 1, // Monero v7 + POW_TYPE_CN_XTL = 3, + POW_TYPE_CN_MSR = 4, + POW_TYPE_CN_XAO = 6, + POW_TYPE_CN_RTO = 7, + POW_TYPE_CN_V2 = 8, // Monero v8 + POW_TYPE_CN_HALF = 9, + POW_TYPE_CN_GPU = 11, + POW_TYPE_CN_WOW = 12, + POW_TYPE_CN_V4 = 13, // Monero cn-R + POW_TYPE_CN_RWZ = 14, + POW_TYPE_CN_ZLS = 15, + POW_TYPE_CN_DOUBLE = 16, + + POW_TYPE_CNLITE_ORIGINAL = 20, + POW_TYPE_CNLITE_V1 = 21, + + POW_TYPE_CNHEAVY_ORIGINAL = 30, + POW_TYPE_CNHEAVY_XHV = 31, + POW_TYPE_CNHEAVY_TUBE = 32, + + POW_TYPE_CNPICO_TRTL = 40 + }; \ No newline at end of file diff --git a/src/main.cc b/src/main.cc index e924f6a..a438f74 100644 --- a/src/main.cc +++ b/src/main.cc @@ -134,7 +134,9 @@ NAN_METHOD(get_merge_mining_tag_reserved_size) { info.GetReturnValue().Set(returnValue); } - +/* + * var blob = convert_blob (parentBlockBuffer, cnBlobType, [childBlockBuffer], [PoW]) + */ NAN_METHOD(convert_blob) { if (info.Length() < 1) return THROW_ERROR_EXCEPTION("You must provide one argument."); @@ -150,6 +152,12 @@ NAN_METHOD(convert_blob) { blob_type = static_cast(Nan::To(info[1]).FromMaybe(0)); } + enum POW_TYPE pow_type = POW_TYPE_NOT_SET; + if (info.Length() >= 4) { + if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 4 should be a number"); + pow_type = static_cast(Nan::To(info[3]).FromMaybe(0)); + } + //convert block b = AUTO_VAL_INIT(b); b.set_blob_type(blob_type); @@ -166,6 +174,7 @@ NAN_METHOD(convert_blob) { if (blob_type == BLOB_TYPE_FORKNOTE2) { block parent_block; + if (POW_TYPE_NOT_SET != pow_type) b.minor_version = pow_type; if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); if (!get_block_hashing_blob(parent_block, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); } else { @@ -208,6 +217,9 @@ NAN_METHOD(get_block_id) { info.GetReturnValue().Set(returnValue); } +/* + * var shareBuffer = construct_block_blob(parentBlockTemplateBuffer, nonceBuffer, cnBlobType, [childBlockTemplateBuffer], [PoW]); + */ NAN_METHOD(construct_block_blob) { if (info.Length() < 2) return THROW_ERROR_EXCEPTION("You must provide two arguments."); @@ -227,6 +239,12 @@ NAN_METHOD(construct_block_blob) { blob_type = static_cast(Nan::To(info[2]).FromMaybe(0)); } + enum POW_TYPE pow_type = POW_TYPE_NOT_SET; + if (info.Length() >= 5) { + if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 5 should be a number"); + pow_type = static_cast(Nan::To(info[4]).FromMaybe(0)); + } + block b = AUTO_VAL_INIT(b); b.set_blob_type(blob_type); if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); @@ -244,6 +262,7 @@ NAN_METHOD(construct_block_blob) { if (blob_type == BLOB_TYPE_FORKNOTE2) { block parent_block; b.parent_block.nonce = nonce; + if (POW_TYPE_NOT_SET != pow_type) b.minor_version = pow_type; if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); if (!mergeBlocks(parent_block, b, std::vector())) return THROW_ERROR_EXCEPTION("Failed to postprocess mining block"); } else if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 3) { // MM @@ -321,7 +340,7 @@ NAN_METHOD(address_decode_integrated) { /** - * var mmShareBuffer = merge_blocks(shareBuffer, childBlockTemplate); + * var mmShareBuffer = merge_blocks(shareBuffer, childBlockTemplate, [PoW] ); */ NAN_METHOD(merge_blocks) { @@ -337,6 +356,12 @@ NAN_METHOD(merge_blocks) { if (!Buffer::HasInstance(child_block_template_buf)) return THROW_ERROR_EXCEPTION("Second argument should be a buffer object."); + enum POW_TYPE pow_type = POW_TYPE_NOT_SET; + if (info.Length() >= 3) { + if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 3 should be a number"); + pow_type = static_cast(Nan::To(info[2]).FromMaybe(0)); + } + blobdata block_template_blob = std::string(Buffer::Data(block_template_buf), Buffer::Length(block_template_buf)); blobdata child_block_template_blob = std::string(Buffer::Data(child_block_template_buf), Buffer::Length(child_block_template_buf)); blobdata output = ""; @@ -351,7 +376,8 @@ NAN_METHOD(merge_blocks) { if (!mergeBlocks(b, b2, std::vector())) return THROW_ERROR_EXCEPTION("mergeBlocks(b,b2): Failed to postprocess mining block"); - + if (POW_TYPE_NOT_SET != pow_type) b2.minor_version = pow_type; + if (!block_to_blob(b2, output)) { return THROW_ERROR_EXCEPTION("Failed to convert block to blob (merge_blocks)"); } From 1583dcd07a09c05005f68b8293aaed097d653c42 Mon Sep 17 00:00:00 2001 From: campurro Date: Sat, 16 Mar 2019 15:10:47 +0100 Subject: [PATCH 4/5] Some bugfixes & improvements --- src/main.cc | 86 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/src/main.cc b/src/main.cc index a438f74..ebd4faf 100644 --- a/src/main.cc +++ b/src/main.cc @@ -58,43 +58,53 @@ static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2 block1.timestamp = block2.timestamp; } - size_t MERGE_MINING_TAG_RESERVED_SIZE_EX = MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE; - std::vector& extra = block1.miner_tx.extra; - std::string extraAsString(reinterpret_cast(extra.data()), extra.size()); + if (BLOB_TYPE_CRYPTONOTE == block2.blob_type) { // Insert merged mining tag and block header hash into the miner extra + size_t MERGE_MINING_TAG_RESERVED_SIZE_EX = MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE; + std::vector& extra = block1.miner_tx.extra; + std::string extraAsString(reinterpret_cast(extra.data()), extra.size()); - std::string extraNonceTemplate; - extraNonceTemplate.push_back(TX_EXTRA_NONCE); - extraNonceTemplate.push_back(MERGE_MINING_TAG_RESERVED_SIZE_EX); - extraNonceTemplate.append(MERGE_MINING_TAG_RESERVED_SIZE, '\0'); + std::string extraNonceTemplate; + extraNonceTemplate.push_back(TX_EXTRA_NONCE); + extraNonceTemplate.push_back(MERGE_MINING_TAG_RESERVED_SIZE_EX); + extraNonceTemplate.append(MERGE_MINING_TAG_RESERVED_SIZE, '\0'); - size_t extraNoncePos = extraAsString.find(extraNonceTemplate); - if (std::string::npos == extraNoncePos) { + size_t extraNoncePos = extraAsString.find(extraNonceTemplate); + if (std::string::npos == extraNoncePos) { + return false; + } + + cryptonote::tx_extra_merge_mining_tag tag; + tag.depth = 0; + if (!cryptonote::get_block_header_hash(block2, tag.merkle_root)) { return false; - } - - cryptonote::tx_extra_merge_mining_tag tag; - tag.depth = 0; - if (!cryptonote::get_block_header_hash(block2, tag.merkle_root)) { - return false; - } + } - std::vector extraNonceReplacement; - if (!cryptonote::append_mm_tag_to_extra(extraNonceReplacement, tag)) { - return false; - } + std::vector extraNonceReplacement; + if (!cryptonote::append_mm_tag_to_extra(extraNonceReplacement, tag)) { + return false; + } - if (MERGE_MINING_TAG_RESERVED_SIZE < extraNonceReplacement.size()) { - return false; - } + if (MERGE_MINING_TAG_RESERVED_SIZE < extraNonceReplacement.size()) { + return false; + } - size_t diff = (extraNonceTemplate.size() + POOL_NONCE_SIZE) - extraNonceReplacement.size(); - if (0 < diff) { - extraNonceReplacement.push_back(TX_EXTRA_NONCE); - extraNonceReplacement.push_back(static_cast(diff - 2)); - } + size_t diff = (extraNonceTemplate.size() + POOL_NONCE_SIZE) - extraNonceReplacement.size(); + if (0 < diff) { + extraNonceReplacement.push_back(TX_EXTRA_NONCE); + extraNonceReplacement.push_back(static_cast(diff - 2)); + } - std::copy(extraNonceReplacement.begin(), extraNonceReplacement.end(), extra.begin() + extraNoncePos); + std::copy(extraNonceReplacement.begin(), extraNonceReplacement.end(), extra.begin() + extraNoncePos); + + } else { + cryptonote::tx_extra_merge_mining_tag mm_tag; + mm_tag.depth = 0; + if (!cryptonote::get_block_header_hash(block2, mm_tag.merkle_root)) return false; + + block1.miner_tx.extra.clear(); + if (!cryptonote::append_mm_tag_to_extra(block1.miner_tx.extra, mm_tag)) return false; + } return true; } @@ -154,7 +164,7 @@ NAN_METHOD(convert_blob) { enum POW_TYPE pow_type = POW_TYPE_NOT_SET; if (info.Length() >= 4) { - if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 4 should be a number"); + if (!info[3]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 4 should be a number"); pow_type = static_cast(Nan::To(info[3]).FromMaybe(0)); } @@ -168,22 +178,22 @@ NAN_METHOD(convert_blob) { b2.set_blob_type(BLOB_TYPE_FORKNOTE2); // Only forknote 2 blob types support being mm as child coin Local child_target = info[2]->ToObject(); blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); - if (!Buffer::HasInstance(child_target)) return THROW_ERROR_EXCEPTION("Argument (Child block) should be a buffer object."); - if (!parse_and_validate_block_from_blob(child_input, b2)) return THROW_ERROR_EXCEPTION("Failed to parse child block"); + if (!Buffer::HasInstance(child_target)) return THROW_ERROR_EXCEPTION("convert_blob: Argument (Child block) should be a buffer object."); + if (!parse_and_validate_block_from_blob(child_input, b2)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to parse child block"); } if (blob_type == BLOB_TYPE_FORKNOTE2) { block parent_block; if (POW_TYPE_NOT_SET != pow_type) b.minor_version = pow_type; - if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); - if (!get_block_hashing_blob(parent_block, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); + if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to construct parent block"); + if (!get_block_hashing_blob(parent_block, output)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to create mining block"); } else { if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 2) { // MM if (!fillExtra(b, b2)) { - return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra (convert_blob)"); + return THROW_ERROR_EXCEPTION("convert_blob: Failed to add merged mining tag to parent block extra (convert_blob)"); } } - if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); + if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to create mining block"); } v8::Local returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked(); @@ -241,7 +251,7 @@ NAN_METHOD(construct_block_blob) { enum POW_TYPE pow_type = POW_TYPE_NOT_SET; if (info.Length() >= 5) { - if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 5 should be a number"); + if (!info[4]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 5 should be a number"); pow_type = static_cast(Nan::To(info[4]).FromMaybe(0)); } @@ -358,7 +368,7 @@ NAN_METHOD(merge_blocks) { enum POW_TYPE pow_type = POW_TYPE_NOT_SET; if (info.Length() >= 3) { - if (!info[1]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 3 should be a number"); + if (!info[2]->IsNumber()) return THROW_ERROR_EXCEPTION("Argument 3 should be a number"); pow_type = static_cast(Nan::To(info[2]).FromMaybe(0)); } From 23696c6c63a169e8bbca80e6d4aba4cd69bcf74a Mon Sep 17 00:00:00 2001 From: campurro Date: Sat, 16 Mar 2019 16:17:53 +0100 Subject: [PATCH 5/5] Clear some bugs + support mining just a v2 coin --- src/main.cc | 85 +++++++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/src/main.cc b/src/main.cc index ebd4faf..0778bfc 100644 --- a/src/main.cc +++ b/src/main.cc @@ -38,7 +38,7 @@ blobdata uint64be_to_blob(uint64_t num) { } -/* + static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2) { cryptonote::tx_extra_merge_mining_tag mm_tag; mm_tag.depth = 0; @@ -49,62 +49,51 @@ static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2 return true; } -*/ -static bool fillExtra(cryptonote::block& block1, const cryptonote::block& block2) +static bool fillExtraMM(cryptonote::block& block1, const cryptonote::block& block2) { if (block2.timestamp > block1.timestamp) { // get the most recent timestamp (solve duplicated timestamps on child coin) block1.timestamp = block2.timestamp; } - if (BLOB_TYPE_CRYPTONOTE == block2.blob_type) { // Insert merged mining tag and block header hash into the miner extra - size_t MERGE_MINING_TAG_RESERVED_SIZE_EX = MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE; - std::vector& extra = block1.miner_tx.extra; - std::string extraAsString(reinterpret_cast(extra.data()), extra.size()); + size_t MERGE_MINING_TAG_RESERVED_SIZE_EX = MERGE_MINING_TAG_RESERVED_SIZE + POOL_NONCE_SIZE; + std::vector& extra = block1.miner_tx.extra; + std::string extraAsString(reinterpret_cast(extra.data()), extra.size()); - std::string extraNonceTemplate; - extraNonceTemplate.push_back(TX_EXTRA_NONCE); - extraNonceTemplate.push_back(MERGE_MINING_TAG_RESERVED_SIZE_EX); - extraNonceTemplate.append(MERGE_MINING_TAG_RESERVED_SIZE, '\0'); + std::string extraNonceTemplate; + extraNonceTemplate.push_back(TX_EXTRA_NONCE); + extraNonceTemplate.push_back(MERGE_MINING_TAG_RESERVED_SIZE_EX); + extraNonceTemplate.append(MERGE_MINING_TAG_RESERVED_SIZE, '\0'); - size_t extraNoncePos = extraAsString.find(extraNonceTemplate); - if (std::string::npos == extraNoncePos) { - return false; - } - - cryptonote::tx_extra_merge_mining_tag tag; - tag.depth = 0; - if (!cryptonote::get_block_header_hash(block2, tag.merkle_root)) { + size_t extraNoncePos = extraAsString.find(extraNonceTemplate); + if (std::string::npos == extraNoncePos) { return false; - } + } - - std::vector extraNonceReplacement; - if (!cryptonote::append_mm_tag_to_extra(extraNonceReplacement, tag)) { + cryptonote::tx_extra_merge_mining_tag tag; + tag.depth = 0; + if (!cryptonote::get_block_header_hash(block2, tag.merkle_root)) { return false; - } + } - if (MERGE_MINING_TAG_RESERVED_SIZE < extraNonceReplacement.size()) { + std::vector extraNonceReplacement; + if (!cryptonote::append_mm_tag_to_extra(extraNonceReplacement, tag)) { return false; - } + } - size_t diff = (extraNonceTemplate.size() + POOL_NONCE_SIZE) - extraNonceReplacement.size(); - if (0 < diff) { - extraNonceReplacement.push_back(TX_EXTRA_NONCE); - extraNonceReplacement.push_back(static_cast(diff - 2)); - } + if (MERGE_MINING_TAG_RESERVED_SIZE < extraNonceReplacement.size()) { + return false; + } - std::copy(extraNonceReplacement.begin(), extraNonceReplacement.end(), extra.begin() + extraNoncePos); + size_t diff = (extraNonceTemplate.size() + POOL_NONCE_SIZE) - extraNonceReplacement.size(); + if (0 < diff) { + extraNonceReplacement.push_back(TX_EXTRA_NONCE); + extraNonceReplacement.push_back(static_cast(diff - 2)); + } - } else { - cryptonote::tx_extra_merge_mining_tag mm_tag; - mm_tag.depth = 0; - if (!cryptonote::get_block_header_hash(block2, mm_tag.merkle_root)) return false; + std::copy(extraNonceReplacement.begin(), extraNonceReplacement.end(), extra.begin() + extraNoncePos); - block1.miner_tx.extra.clear(); - if (!cryptonote::append_mm_tag_to_extra(block1.miner_tx.extra, mm_tag)) return false; - } return true; } @@ -174,7 +163,7 @@ NAN_METHOD(convert_blob) { if (!parse_and_validate_block_from_blob(input, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); block b2 = AUTO_VAL_INIT(b2); - if (info.Length() > 2) { // MM + if (info.Length() > 2 && !info[2]->IsNumber()) { // MM b2.set_blob_type(BLOB_TYPE_FORKNOTE2); // Only forknote 2 blob types support being mm as child coin Local child_target = info[2]->ToObject(); blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); @@ -188,9 +177,9 @@ NAN_METHOD(convert_blob) { if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to construct parent block"); if (!get_block_hashing_blob(parent_block, output)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to create mining block"); } else { - if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 2) { // MM - if (!fillExtra(b, b2)) { - return THROW_ERROR_EXCEPTION("convert_blob: Failed to add merged mining tag to parent block extra (convert_blob)"); + if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 2 && !info[2]->IsNumber()) { // MM + if (!fillExtraMM(b, b2)) { + return THROW_ERROR_EXCEPTION("convert_blob: Failed to add merged mining tag to parent block extra"); } } if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("convert_blob: Failed to create mining block"); @@ -260,7 +249,7 @@ NAN_METHOD(construct_block_blob) { if (!parse_and_validate_block_from_blob(block_template_blob, b)) return THROW_ERROR_EXCEPTION("Failed to parse block"); block b2 = AUTO_VAL_INIT(b2); - if (info.Length() > 3) { // MM + if (info.Length() > 3 && !info[3]->IsNumber()) { // MM b2.set_blob_type(BLOB_TYPE_FORKNOTE2); // Only forknote 2 blob types support being mm as child coin Local child_target = info[3]->ToObject(); blobdata child_input = std::string(Buffer::Data(child_target), Buffer::Length(child_target)); @@ -275,8 +264,8 @@ NAN_METHOD(construct_block_blob) { if (POW_TYPE_NOT_SET != pow_type) b.minor_version = pow_type; if (!construct_parent_block(b, parent_block)) return THROW_ERROR_EXCEPTION("Failed to construct parent block"); if (!mergeBlocks(parent_block, b, std::vector())) return THROW_ERROR_EXCEPTION("Failed to postprocess mining block"); - } else if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 3) { // MM - if (!fillExtra(b, b2)) { + } else if (BLOB_TYPE_CRYPTONOTE == blob_type && info.Length() > 3 && !info[3]->IsNumber()) { // MM + if (!fillExtraMM(b, b2)) { return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra"); } } @@ -420,7 +409,7 @@ NAN_METHOD(fill_extra) { - if (!fillExtra(b, b2)) { + if (!fillExtraMM(b, b2)) { return THROW_ERROR_EXCEPTION("Failed to add merged mining tag to parent block extra (convert_blob)"); } if (!get_block_hashing_blob(b, output)) return THROW_ERROR_EXCEPTION("Failed to create mining block"); @@ -442,4 +431,4 @@ NAN_MODULE_INIT(init) { Nan::Set(target, Nan::New("fill_extra").ToLocalChecked(), Nan::GetFunction(Nan::New(fill_extra)).ToLocalChecked()); } -NODE_MODULE(cryptoforknote, init) +NODE_MODULE(cryptoforknote, init) \ No newline at end of file