diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-25 22:27:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-25 22:27:44 +0200 |
| commit | 29d601563fff1a23fa5c21de8c455d542b1adfe3 (patch) | |
| tree | 4a071ec0ef979f020a2cf567973e02087494e8b9 /src/cryptonote_basic/cryptonote_format_utils.cpp | |
| parent | Merge pull request #2466 (diff) | |
| parent | wallet2: do not keep block hashes below last checkpoint (diff) | |
| download | monero-29d601563fff1a23fa5c21de8c455d542b1adfe3.tar.xz | |
Merge pull request #2434
36c3465b wallet2: do not keep block hashes below last checkpoint (moneromooo-monero)
cdbbe99c checkpoints: add a token checkpoint on testnet (the genesis block) (moneromooo-monero)
493fad80 serialization: add deque serialization (moneromooo-monero)
fa54b205 fix typo in basic and core CMakeLists.txt (moneromooo-monero)
5d65a75b move checkpoints in a separate library (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_basic/cryptonote_format_utils.cpp')
| -rw-r--r-- | src/cryptonote_basic/cryptonote_format_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index e73f5d778..fc979f288 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -632,7 +632,7 @@ namespace cryptonote // prunable rct if (t.rct_signatures.type == rct::RCTTypeNull) { - hashes[2] = cryptonote::null_hash; + hashes[2] = crypto::null_hash; } else { |