Merge remote-tracking branch 'upstream/master'

2016-05-27 11:33:08 +03:00
parent 4327548915 a837c9cb0f
commit bc4584c1ff
28 changed files with 1430 additions and 851 deletions
@@ -309,6 +309,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;
@@ -329,7 +330,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;