aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/checkpoints.h
diff options
context:
space:
mode:
authormydesktop <dev.mc2@gmail.com>2014-05-28 21:13:32 -0400
committermydesktop <dev.mc2@gmail.com>2014-05-28 21:13:32 -0400
commit5c1b7c72249a114b1c30945fc8a9116c07573a48 (patch)
tree5e110e349a1f4dccd33867fecbbc4a2c51fc312d /src/cryptonote_core/checkpoints.h
parentraise min fee and correct COIN value (diff)
parenttypo in tx_pool.cpp (diff)
downloadmonero-5c1b7c72249a114b1c30945fc8a9116c07573a48.tar.xz
Merge branch '0.8.8update'
Update to newest version 0.8.8. See change log for details.
Diffstat (limited to 'src/cryptonote_core/checkpoints.h')
-rw-r--r--src/cryptonote_core/checkpoints.h3
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;
};