nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cryptonote_basic: speedup calculate_block_hash

Browse Source 
The block 202612 fix can be left tested at the end, if we
already know we're not in the general case
This commit is contained in:
moneromooo-monero 2018-12-13 19:58:20 +00:00
parent 547a9708de
commit e40eb2ad9d
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cryptonote_basic/cryptonote_format_utils.cpp
View File

@ -1152,6 +1152,13 @@ namespace cryptonote
blob = &bd; blob = &bd;
} }
bool hash_result = get_object_hash(get_block_hashing_blob(b), res);
if (!hash_result)
return false;
if (get_block_height(b) != 202612)
return true;
// EXCEPTION FOR BLOCK 202612 // EXCEPTION FOR BLOCK 202612
const std::string correct_blob_hash_202612 = "3a8a2b3a29b50fc86ff73dd087ea43c6f0d6b8f936c849194d5c84c737903966"; const std::string correct_blob_hash_202612 = "3a8a2b3a29b50fc86ff73dd087ea43c6f0d6b8f936c849194d5c84c737903966";
const std::string existing_block_id_202612 = "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698"; const std::string existing_block_id_202612 = "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698";
@ -1162,9 +1169,7 @@ namespace cryptonote
string_tools::hex_to_pod(existing_block_id_202612, res); string_tools::hex_to_pod(existing_block_id_202612, res);
return true; return true;
} }
bool hash_result = get_object_hash(get_block_hashing_blob(b), res);
if (hash_result)
{ {
// make sure that we aren't looking at a block with the 202612 block id but not the correct blobdata // 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)