AaronFiore/electrum
1
0
Fork 0
Code Activity

fix synchronizer: ask for missing txns on start

Browse Source 
Previously it could happen that a wallet was fully synced,
except it had missing transactions, and it would not recover from this state.
This commit is contained in:
SomberNight
2018-09-08 22:44:14 +02:00
parent 77d86f074f
commit 57cac47944
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
electrum/synchronizer.py
View File

@@ -22,19 +22,15 @@
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import traceback
import ssl
import asyncio import asyncio
from aiorpcx import ClientSession, Request, Notification, TaskGroup
from threading import Lock
import hashlib import hashlib
import concurrent.futures
# from .bitcoin import Hash, hash_encode from aiorpcx import TaskGroup
from .transaction import Transaction from .transaction import Transaction
from .util import ThreadJob, bh2u, PrintError, aiosafe, bfh from .util import bh2u, PrintError
from .bitcoin import address_to_scripthash from .bitcoin import address_to_scripthash
from .version import ELECTRUM_VERSION, PROTOCOL_VERSION
def history_status(h): def history_status(h):
if not h: if not h:
@@ -45,7 +41,6 @@ def history_status(h):
return bh2u(hashlib.sha256(status.encode('ascii')).digest()) return bh2u(hashlib.sha256(status.encode('ascii')).digest())
class Synchronizer(PrintError): class Synchronizer(PrintError):
'''The synchronizer keeps the wallet up-to-date with its set of '''The synchronizer keeps the wallet up-to-date with its set of
addresses and their transactions. It subscribes over the network addresses and their transactions. It subscribes over the network
@@ -65,7 +60,9 @@ class Synchronizer(PrintError):
self.status_queue = asyncio.Queue() self.status_queue = asyncio.Queue()
def is_up_to_date(self): def is_up_to_date(self):
return (not self.requested_addrs and not self.requested_histories) return (not self.requested_addrs
and not self.requested_histories
and not self.requested_tx)
def add(self, addr): def add(self, addr):
self.requested_addrs.add(addr) self.requested_addrs.add(addr)
@@ -167,7 +164,17 @@ class Synchronizer(PrintError):
return s return s
async def main(self): async def main(self):
for addr in self.wallet.get_addresses(): self.add(addr) # request missing txns, if any
async with TaskGroup() as group:
for history in self.wallet.history.values():
# Old electrum servers returned ['*'] when all history for the address
# was pruned. This no longer happens but may remain in old wallets.
if history == ['*']: continue
await group.spawn(self.request_missing_txs, history)
# add addresses to bootstrap
for addr in self.wallet.get_addresses():
self.add(addr)
# main loop
while True: while True:
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
self.wallet.synchronize() self.wallet.synchronize()