diff --git a/docs/RELEASE-NOTES b/docs/RELEASE-NOTES index 38d013d..303ef4c 100644 --- a/docs/RELEASE-NOTES +++ b/docs/RELEASE-NOTES @@ -1,3 +1,8 @@ +version 0.7.8 +------------- + +- hopefully fix failed assertion on reorgs, issue #44 + version 0.7.7 ------------- diff --git a/server/block_processor.py b/server/block_processor.py index 2456956..144fb6a 100644 --- a/server/block_processor.py +++ b/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) diff --git a/server/version.py b/server/version.py index 62a884c..a659742 100644 --- a/server/version.py +++ b/server/version.py @@ -1 +1 @@ -VERSION = "ElectrumX 0.7.7" +VERSION = "ElectrumX 0.7.8"