diff options
author | paybee <dev@payb.ee> | 2014-05-29 17:53:49 +0200 |
---|---|---|
committer | paybee <dev@payb.ee> | 2014-05-29 17:53:49 +0200 |
commit | 0e5223321258d8fa6bbb7190ecb2b230a801aac2 (patch) | |
tree | acbd51dac3256b47bab6c1b98d21a3434b7158b7 /src/cryptonote_core/checkpoints.h | |
parent | Added incoming_transfers RPC API method (diff) | |
parent | Merge branch '0.8.8update' (diff) | |
download | monero-0e5223321258d8fa6bbb7190ecb2b230a801aac2.tar.xz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cryptonote_core/checkpoints.h')
-rw-r--r-- | src/cryptonote_core/checkpoints.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptonote_core/checkpoints.h b/src/cryptonote_core/checkpoints.h index 20014b1c8..1bc055d91 100644 --- a/src/cryptonote_core/checkpoints.h +++ b/src/cryptonote_core/checkpoints.h @@ -16,6 +16,9 @@ namespace cryptonote bool add_checkpoint(uint64_t height, const std::string& hash_str); bool is_in_checkpoint_zone(uint64_t height) const; bool check_block(uint64_t height, const crypto::hash& h) const; + bool check_block(uint64_t height, const crypto::hash& h, bool& is_a_checkpoint) const; + bool is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const; + private: std::map<uint64_t, crypto::hash> m_points; }; |