diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-09-25 17:52:15 -0400 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-09-25 17:52:16 -0400 |
commit | b8643752c122a32096733fb8686d8f2eafcf6ff8 (patch) | |
tree | 6a735c25f25996dc2f31f02708d45a001f1315fc /src/cryptonote_basic/cryptonote_format_utils.cpp | |
parent | Merge pull request #5930 (diff) | |
parent | RandomX integration (diff) | |
download | monero-b8643752c122a32096733fb8686d8f2eafcf6ff8.tar.xz |
Merge pull request #5549
81c2ad6d RandomX integration (Howard Chu)
Diffstat (limited to 'src/cryptonote_basic/cryptonote_format_utils.cpp')
-rw-r--r-- | src/cryptonote_basic/cryptonote_format_utils.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index 7d7de416d..8bf3574db 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -1218,21 +1218,6 @@ namespace cryptonote return p; } //--------------------------------------------------------------- - bool get_block_longhash(const block& b, crypto::hash& res, uint64_t height) - { - // block 202612 bug workaround - if (height == 202612) - { - static const std::string longhash_202612 = "84f64766475d51837ac9efbef1926486e58563c95a19fef4aec3254f03000000"; - string_tools::hex_to_pod(longhash_202612, res); - return true; - } - blobdata bd = get_block_hashing_blob(b); - const int cn_variant = b.major_version >= 7 ? b.major_version - 6 : 0; - crypto::cn_slow_hash(bd.data(), bd.size(), res, cn_variant, height); - return true; - } - //--------------------------------------------------------------- std::vector<uint64_t> relative_output_offsets_to_absolute(const std::vector<uint64_t>& off) { std::vector<uint64_t> res = off; @@ -1253,13 +1238,6 @@ namespace cryptonote return res; } //--------------------------------------------------------------- - crypto::hash get_block_longhash(const block& b, uint64_t height) - { - crypto::hash p = null_hash; - get_block_longhash(b, p, height); - return p; - } - //--------------------------------------------------------------- bool parse_and_validate_block_from_blob(const blobdata& b_blob, block& b, crypto::hash *block_hash) { std::stringstream ss; |