aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/checkpoints.h
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2014-09-29 16:30:47 -0400
committerThomas Winget <tewinget@gmail.com>2014-09-30 16:21:37 -0400
commitf0b4138f1f6ecb86c971dd7edf72a92d54e22721 (patch)
treef185f6e4ddd42d55615ec3d047acce488ad8fc57 /src/cryptonote_core/checkpoints.h
parentFixed segfault with checkpoints loading (diff)
downloadmonero-f0b4138f1f6ecb86c971dd7edf72a92d54e22721.tar.xz
various changes to runtime checkpoint updating
json checkpoints will be checked every 10 minutes, dns every 60. json checkpoints always enforced, dns still with flag. conflicting checkpoints is hard fail, but soft if dns enforce flag not set and dns checkpoints are wonky.
Diffstat (limited to 'src/cryptonote_core/checkpoints.h')
-rw-r--r--src/cryptonote_core/checkpoints.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptonote_core/checkpoints.h b/src/cryptonote_core/checkpoints.h
index 60147864d..132917228 100644
--- a/src/cryptonote_core/checkpoints.h
+++ b/src/cryptonote_core/checkpoints.h
@@ -47,6 +47,7 @@ namespace cryptonote
bool is_alternative_block_allowed(uint64_t blockchain_height, uint64_t block_height) const;
uint64_t get_max_height();
const std::map<uint64_t, crypto::hash>& get_points();
+ bool check_for_conflicts(checkpoints& other);
private:
std::map<uint64_t, crypto::hash> m_points;
};