fix bug in loading old version snapshots.

boscore · Jun 3, 2019 · a63265f · a63265f
1 parent fd444d2
commit a63265f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/libraries/chain/include/eosio/chain/snapshot.hpp b/libraries/chain/include/eosio/chain/snapshot.hpp
@@ -239,6 +239,7 @@ namespace eosio { namespace chain {
                      fc::raw::unpack(tmp_ds, data);
                      auto original_data_length = tmp_ds.tellp() - 4;
                      in.seekg(original_data_length);
+                     data.pbft_stable_checkpoint_blocknum = 0;
                  }else{
                      fc::raw::unpack(in, data);
                  }

diff --git a/libraries/chain/pbft_database.cpp b/libraries/chain/pbft_database.cpp
@@ -1436,9 +1436,11 @@ namespace eosio {
 
             if (prepare_watermarks.empty()) return 0;
 
-            auto cw = *std::upper_bound(prepare_watermarks.begin(), prepare_watermarks.end(), lib);
+            auto cw = std::upper_bound(prepare_watermarks.begin(), prepare_watermarks.end(), lib);
 
-            if (cw > lib) return cw; else return 0;
+            if (cw == prepare_watermarks.end() || *cw <= lib) return 0;
+
+            return *cw;
         }
 
         void pbft_database::update_fork_schedules() {