From 0b26e58497b556134b016f1bea74426ef42c7d2b Mon Sep 17 00:00:00 2001 From: jwinterm Date: Wed, 18 Apr 2018 21:00:11 -0700 Subject: [PATCH] block 202612 and 685498 fix --- src/blockchain_db/blockchain_db.cpp | 4 ++-- src/cryptonote_basic/cryptonote_format_utils.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp index 9f760dc0d..5f21266e7 100644 --- a/src/blockchain_db/blockchain_db.cpp +++ b/src/blockchain_db/blockchain_db.cpp @@ -903,7 +903,7 @@ void BlockchainDB::fixup() "633cdedeb3b96ec4f234c670254c6f721e0b368d00b48c6b26759db7d62cf52d", }; - if (height() > 202612) + if (height() > 202612 && strcmp(CRYPTONOTE_NAME, "monero")==0) { for (const auto &kis: key_images_202612) { @@ -916,7 +916,7 @@ void BlockchainDB::fixup() } } } - if (height() > 685498) + if (height() > 685498 && strcmp(CRYPTONOTE_NAME, "monero")==0) { for (const auto &kis: key_images_685498) { diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index 0b1e19e6a..7e9d841e5 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -852,7 +852,7 @@ namespace cryptonote const std::string existing_block_id_202612 = "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698"; crypto::hash block_blob_hash = get_blob_hash(block_to_blob(b)); - if (string_tools::pod_to_hex(block_blob_hash) == correct_blob_hash_202612) + if (string_tools::pod_to_hex(block_blob_hash) == correct_blob_hash_202612 && strcmp(CRYPTONOTE_NAME, "monero")==0) { string_tools::hex_to_pod(existing_block_id_202612, res); return true; @@ -862,7 +862,7 @@ namespace cryptonote if (hash_result) { // make sure that we aren't looking at a block with the 202612 block id but not the correct blobdata - if (string_tools::pod_to_hex(res) == existing_block_id_202612) + if (string_tools::pod_to_hex(res) == existing_block_id_202612 && strcmp(CRYPTONOTE_NAME, "monero")==0) { LOG_ERROR("Block with block id for 202612 but incorrect block blob hash found!"); res = null_hash;