tMerge pull request #3734 from SomberNight/websocket_scripthash - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6f843a7bb68ba6f20552914c3d71046de2e4277a
DIR parent d808bf057e21ef728e71f926523ad58056f8c526
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 16 Jan 2018 18:19:48 +0100
Merge pull request #3734 from SomberNight/websocket_scripthash
websocket: migrate to scripthashes
Diffstat:
M lib/websockets.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/websockets.py b/lib/websockets.py
t@@ -84,7 +84,8 @@ class WsClientThread(util.DaemonThread):
l = self.subscriptions.get(addr, [])
l.append((ws, amount))
self.subscriptions[addr] = l
- self.network.send([('blockchain.address.subscribe', [addr])], self.response_queue.put)
+ h = self.network.addr_to_scripthash(addr)
+ self.network.send([('blockchain.scripthash.subscribe', [h])], self.response_queue.put)
def run(self):
t@@ -100,10 +101,13 @@ class WsClientThread(util.DaemonThread):
result = r.get('result')
if result is None:
continue
- if method == 'blockchain.address.subscribe':
- self.network.send([('blockchain.address.get_balance', params)], self.response_queue.put)
- elif method == 'blockchain.address.get_balance':
- addr = params[0]
+ if method == 'blockchain.scripthash.subscribe':
+ self.network.send([('blockchain.scripthash.get_balance', params)], self.response_queue.put)
+ elif method == 'blockchain.scripthash.get_balance':
+ h = params[0]
+ addr = self.network.h2addr.get(h, None)
+ if addr is None:
+ util.print_error("can't find address for scripthash: %s" % h)
l = self.subscriptions.get(addr, [])
for ws, amount in l:
if not ws.closed: