aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-05-17 19:04:41 +0200
committerRiccardo Spagni <ric@spagni.net>2016-05-17 19:04:41 +0200
commitae205020f6f17f12b75a69240c4fcbbee72d30af (patch)
tree66a868fbd6c98b3ba48665f3b8126bcf318286a6 /src/wallet/wallet2.h
parentMerge branch 'performance' of https://github.com/LMDB/bitmonero (diff)
parentOnly log 1/N skipped blocks (diff)
downloadmonero-ae205020f6f17f12b75a69240c4fcbbee72d30af.tar.xz
Merge pull request #827
f1e70d1 Only log 1/N skipped blocks (Howard Chu) cebb97c Move refresh height to keys file from cache file (Howard Chu) 590c439 Make fast_refresh interruptible (Howard Chu) 687855d Set refresh height earlier (Howard Chu) 2fb00c0 Fix 19fe8ae3ef1aa46ae8fdd4e4d6862510390ddab7 (Howard Chu)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r--src/wallet/wallet2.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 846a86ef8..c2d387acd 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -308,6 +308,7 @@ namespace tools
template <class t_archive>
inline void serialize(t_archive &a, const unsigned int ver)
{
+ uint64_t dummy_refresh_height = 0; // moved to keys file
if(ver < 5)
return;
a & m_blockchain;
@@ -328,7 +329,7 @@ namespace tools
a & m_confirmed_txs;
if(ver < 11)
return;
- a & m_refresh_from_block_height;
+ a & dummy_refresh_height;
if(ver < 12)
return;
a & m_tx_notes;