diff options
author | Riccardo Spagni <ric@spagni.net> | 2014-10-02 16:48:01 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2014-10-02 16:48:05 +0200 |
commit | 1cf22b27a6b95e1e44c35157f5c5ccb73efec9da (patch) | |
tree | 770a470c84cd8c7c7ef816dd2c34078d5aebbc7a /src/cryptonote_core/checkpoints.h | |
parent | simplewallet ignoring testnet port in RPC mode (diff) | |
parent | Daemon should now exit on conflicting checkpoints (diff) | |
download | monero-1cf22b27a6b95e1e44c35157f5c5ccb73efec9da.tar.xz |
Merge pull request #165
c0bdd51 Daemon should now exit on conflicting checkpoints (Thomas Winget)
f0b4138 various changes to runtime checkpoint updating (Thomas Winget)
7568f89 Fixed segfault with checkpoints loading (Thomas Winget)
b261d92 DNS checkpoint updating added, and daemon flag to enforce them (Thomas Winget)
30caebf reload checkpoints file every ~hr and print if any fail (Thomas Winget)
0e14491 updated DNSResolver/things that use it for DNSSEC (Thomas Winget)
6f2c2e1 Adding an identical existing checkpoint should not error (Thomas Winget)
Diffstat (limited to 'src/cryptonote_core/checkpoints.h')
-rw-r--r-- | src/cryptonote_core/checkpoints.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cryptonote_core/checkpoints.h b/src/cryptonote_core/checkpoints.h index 3dee48682..132917228 100644 --- a/src/cryptonote_core/checkpoints.h +++ b/src/cryptonote_core/checkpoints.h @@ -30,6 +30,7 @@ #pragma once #include <map> +#include <vector> #include "cryptonote_basic_impl.h" @@ -45,7 +46,8 @@ namespace cryptonote 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; 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; }; |