From: CryptoManiac <balthazar@yandex.ru>
Date: Thu, 30 Jul 2015 18:57:43 +0000 (+0300)
Subject: Fix reorg issues
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=b086763e223225b1ecc7ec400f897f4fb67c7bb9

Fix reorg issues
---

diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py
index 1b8d92f..1c3a341 100644
--- a/backends/bitcoind/blockchain_processor.py
+++ b/backends/bitcoind/blockchain_processor.py
@@ -627,10 +627,11 @@ class BlockchainProcessor(Processor):
             self.up_to_date = False
             try:
                 next_block = self.bitcoind('getblockbynumber', [self.storage.height + 1, True])
-                next_block_hash = next_block.get('hash')
             except BaseException, e:
+                next_block = self.bitcoind('getblock', [self.storage.last_hash, True])
                 revert = True
-                next_block = next_block.get(self.storage.last_hash)
+
+            next_block_hash = next_block.get('hash')
 
             self.mtime('daemon')