AaronFiore/electrum
1
0
Fork 0
Code Activity

Push network calls into network module

Browse Source 
Eventually all network calls should go through the network module
without resorting to using raw protocol strings. This, then, makes
adding an other backend easier.
Please note that the behaviour slightly changed. Initially the caller
received an unmodified response from the ElectrumX server. In it the
scripthash is present. This change replaces that scripthash with the
original address.
This commit is contained in:
Harm Aarts
2018-05-17 15:20:22 +02:00
parent 812d570ee2
commit ab2f59590c
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/commands.py
View File

@@ -647,8 +647,7 @@ class Commands:
util.print_error('Got Response for %s' % address) util.print_error('Got Response for %s' % address)
except BaseException as e: except BaseException as e:
util.print_error(str(e)) util.print_error(str(e))
h = self.network.addr_to_scripthash(address) self.network.subscribe_to_addresses([addr], callback)
self.network.send([('blockchain.scripthash.subscribe', [h])], callback)
return True return True
@command('wn') @command('wn')

4
lib/websockets.py
View File

@@ -84,9 +84,7 @@ class WsClientThread(util.DaemonThread):
l = self.subscriptions.get(addr, []) l = self.subscriptions.get(addr, [])
l.append((ws, amount)) l.append((ws, amount))
self.subscriptions[addr] = l self.subscriptions[addr] = l
h = self.network.addr_to_scripthash(addr) self.network.subscribe_to_addresses([addr], self.response_queue.put)
self.network.send([('blockchain.scripthash.subscribe', [h])], self.response_queue.put)
def run(self): def run(self):
threading.Thread(target=self.reading_thread).start() threading.Thread(target=self.reading_thread).start()