Merge branch 'release-0.7.8'

docs/RELEASE-NOTES

@@ -1,3 +1,8 @@
+version 0.7.8
+-------------
+
+- hopefully fix failed assertion on reorgs, issue #44
+
 version 0.7.7
 -------------
 

server/block_processor.py

@@ -511,6 +511,11 @@ class BlockProcessor(server.db.DB):
             for key, value in puts.items():
                 batch.put(key, value)
 
+        self.fs_height = self.height
+        self.fs_tx_count = self.tx_count
+        assert not self.headers
+        assert not self.tx_hashes
+
         self.logger.info('removed {:,d} history entries from {:,d} addresses'
                          .format(nremoves, len(hash168s)))
 
@@ -643,10 +648,6 @@ class BlockProcessor(server.db.DB):
             self.height -= 1
             self.tx_counts.pop()
 
-        self.fs_height = self.height
-        assert not self.headers
-        assert not self.tx_hashes
-
         self.logger.info('backed up to height {:,d}'.format(self.height))
 
         self.touched.update(touched)

server/version.py

@@ -1 +1 @@
-VERSION = "ElectrumX 0.7.7"
+VERSION = "ElectrumX 0.7.8"