diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:20:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-31 15:20:18 +0200 |
| commit | 39d73d2a27730e6a5844c259d81a0ed9d4ee3000 (patch) | |
| tree | 50dbaa4414eb8ba49ba28df525bc58b7fc587630 /src/cryptonote_core/hardfork.cpp | |
| parent | Merge pull request #630 (diff) | |
| parent | daemon: fix a few issues reported by valgrind (diff) | |
| download | monero-39d73d2a27730e6a5844c259d81a0ed9d4ee3000.tar.xz | |
Merge pull request #631
bcac101 daemon: fix a few issues reported by valgrind (moneromooo-monero)
a7e8174 tx_pool: fix serialization of new relayed data (moneromooo-monero)
601ad76 hardfork: fix mixup in indexing variable in get_voting_info (moneromooo-monero)
444e22f blockchain: remove unused timer (moneromooo-monero)
7edfdd8 blockchain: fix m_sync_counter uninitialized variable use (moneromooo-monero)
d97582c epee: use generate_random_bytes for new random uuids (moneromooo-monero)
17c7c9c epee: remove dodgy random code that nobody uses (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/hardfork.cpp')
| -rw-r--r-- | src/cryptonote_core/hardfork.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp index 463d9c065..66fb05010 100644 --- a/src/cryptonote_core/hardfork.cpp +++ b/src/cryptonote_core/hardfork.cpp @@ -373,7 +373,7 @@ bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &vote votes = 0; for (size_t n = version; n < 256; ++n) votes += last_versions[n]; - threshold = (window * heights[current_version].threshold + 99) / 100; + threshold = (window * heights[current_fork_index].threshold + 99) / 100; //assert((votes >= threshold) == enabled); earliest_height = get_earliest_ideal_height_for_version(version); voting = heights.back().version; |