diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-06-26 06:54:53 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-06-26 06:58:31 +0100 |
| commit | 32754784dbacf3e9f30d0aaab0f656c4df32744b (patch) | |
| tree | 49dd0aa36c0c08338b76f4f11fa7a8c5c4b2ba3c /src/wallet/wallet2.cpp | |
| parent | Merge pull request #2111 (diff) | |
| download | monero-32754784dbacf3e9f30d0aaab0f656c4df32744b.tar.xz | |
wallet: fix refresh_from_height setting on new wallet
The previous patch was based on a wrong premise (that the
daemon height was 0 because the daemon calling code wasn't
yet initialized). In fact, current height approximation
was not setup for testnet. Fix this.
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index ee2b6055c..3cbe4cfe7 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -5010,11 +5010,10 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err) uint64_t wallet2::get_approximate_blockchain_height() const { - if (m_testnet) return 0; // time of v2 fork - const time_t fork_time = 1458748658; + const time_t fork_time = m_testnet ? 1448285909 : 1458748658; // v2 fork block - const uint64_t fork_block = 1009827; + const uint64_t fork_block = m_testnet ? 624634 : 1009827; // avg seconds per block const int seconds_per_block = DIFFICULTY_TARGET_V2; // Calculated blockchain height |