diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 0b241f7..5b531b1 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -3,13 +3,14 @@ #define CURRENT_TRANSACTION_VERSION 1 enum BLOB_TYPE { - BLOB_TYPE_CRYPTONOTE = 0, - BLOB_TYPE_FORKNOTE1 = 1, - BLOB_TYPE_FORKNOTE2 = 2, - BLOB_TYPE_CRYPTONOTE2 = 3, // Masari - BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo - BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki - BLOB_TYPE_CRYPTONOTE3 = 6, // Masari - BLOB_TYPE_AEON = 7, // Aeon - BLOB_TYPE_CRYPTONOTE_CUCKOO = 8, // MoneroV / Swap + BLOB_TYPE_CRYPTONOTE = 0, + BLOB_TYPE_FORKNOTE1 = 1, + BLOB_TYPE_FORKNOTE2 = 2, + BLOB_TYPE_CRYPTONOTE2 = 3, // Masari + BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo + BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki + BLOB_TYPE_CRYPTONOTE3 = 6, // Masari + BLOB_TYPE_AEON = 7, // Aeon + BLOB_TYPE_CRYPTONOTE_CUCKOO8 = 8, // MoneroV / Swap + BLOB_TYPE_CRYPTONOTE_CUCKOO = 9, // XTNC }; diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index d8ff450..cd2784b 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -438,7 +438,7 @@ namespace cryptonote VARINT_FIELD(minor_version) if (blob_type != BLOB_TYPE_FORKNOTE2) VARINT_FIELD(timestamp) FIELD(prev_id) - if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) FIELD(nonce8) + if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO8) FIELD(nonce8) if (blob_type != BLOB_TYPE_FORKNOTE2) { if (blob_type == BLOB_TYPE_AEON) { FIELD(nonce) @@ -449,7 +449,7 @@ namespace cryptonote if (!typename Archive::is_saving()) nonce = nonce32; } } - if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) FIELD(cycle) + if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO || blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO8) FIELD(cycle) END_SERIALIZE() }; diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index 3f650ab..66c04a4 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -429,7 +429,7 @@ namespace cryptonote //--------------------------------------------------------------- bool get_block_hashing_blob(const block& b, blobdata& blob) { - if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) { + if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO || b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO8) { blob = t_serializable_object_to_blob(b.major_version); blob.append(reinterpret_cast(&b.minor_version), sizeof(b.minor_version)); blob.append(reinterpret_cast(&b.timestamp), sizeof(b.timestamp)); @@ -444,7 +444,7 @@ namespace cryptonote if (b.blob_type == BLOB_TYPE_CRYPTONOTE3) { blob.append(reinterpret_cast(&b.uncle), sizeof(b.uncle)); } - if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) { + if (b.blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO8) { blob.append(reinterpret_cast(&b.nonce8), sizeof(b.nonce8)); } return true; diff --git a/src/main.cc b/src/main.cc index 3a53a7d..cbe978d 100644 --- a/src/main.cc +++ b/src/main.cc @@ -216,7 +216,7 @@ NAN_METHOD(construct_block_blob) { // (parentBlockTemplateBuffer, nonceBuffer, c if (!mergeBlocks(parent_block, b, std::vector())) return THROW_ERROR_EXCEPTION("Failed to postprocess mining block"); } - if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) { + if (blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO || blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO8) { if (info.Length() != 4) return THROW_ERROR_EXCEPTION("You must provide 4 arguments."); Local cycle = Local::Cast(info[3]); for (int i = 0; i < 32; i++ ) b.cycle.data[i] = cycle->Get(i)->NumberValue();