tchannel watcher class - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 322acd93d95cc16fe114857005e614bc1f849858
DIR parent 4eb370d2e2d8d9a9a2064b03f0f3922d9a5aba93
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 22 Jun 2018 10:57:11 +0200
channel watcher class
Diffstat:
A lib/lnwatcher.py | 39 +++++++++++++++++++++++++++++++
M lib/lnworker.py | 17 ++++++-----------
2 files changed, 45 insertions(+), 11 deletions(-)
---
DIR diff --git a/lib/lnwatcher.py b/lib/lnwatcher.py
t@@ -0,0 +1,39 @@
+from .util import PrintError
+from .lnbase import Outpoint, funding_output_script
+from .bitcoin import redeem_script_to_address
+
+class LNWatcher(PrintError):
+
+ def __init__(self, network, channel_state):
+ self.network = network
+ self.channel_state = channel_state
+ self.channels ={}
+
+ def parse_response(self, response):
+ if response.get('error'):
+ self.print_error("response error:", response)
+ return None, None
+ return response['params'], response['result']
+
+ def watch_channel(self, chan):
+ script = funding_output_script(chan.local_config, chan.remote_config)
+ funding_address = redeem_script_to_address('p2wsh', script)
+ self.channels[funding_address] = chan
+ self.network.subscribe_to_addresses([funding_address], self.on_address_status)
+
+ def on_address_status(self, response):
+ params, result = self.parse_response(response)
+ if not params:
+ return
+ addr = params[0]
+ self.network.request_address_utxos(addr, self.on_utxos)
+
+ def on_utxos(self, response):
+ params, result = self.parse_response(response)
+ if not params:
+ return
+ addr = params[0]
+ chan = self.channels[addr]
+ outpoints = [Outpoint(x["tx_hash"], x["tx_pos"]) for x in result]
+ if chan.funding_outpoint not in outpoints:
+ self.channel_state[chan.channel_id] = "CLOSED"
DIR diff --git a/lib/lnworker.py b/lib/lnworker.py
t@@ -7,14 +7,15 @@ import threading
from collections import defaultdict
from . import constants
-from .bitcoin import sha256, COIN, address_to_scripthash, redeem_script_to_address
+from .bitcoin import sha256, COIN
from .util import bh2u, bfh, PrintError
from .constants import set_testnet, set_simnet
-from .lnbase import Peer, Outpoint, ChannelConfig, LocalState, RemoteState, Keypair, OnlyPubkeyKeypair, OpenChannel, ChannelConstraints, RevocationStore, calc_short_channel_id, privkey_to_pubkey, funding_output_script
+from .lnbase import Peer, Outpoint, ChannelConfig, LocalState, RemoteState, Keypair, OnlyPubkeyKeypair, OpenChannel, ChannelConstraints, RevocationStore, calc_short_channel_id, privkey_to_pubkey
from .lightning_payencode.lnaddr import lnencode, LnAddr, lndecode
from . import lnrouter
from .ecc import ECPrivkey, CURVE_ORDER, der_sig_from_sig_string
from .transaction import Transaction
+from .lnwatcher import LNWatcher
is_key = lambda k: k.endswith("_basepoint") or k.endswith("_key")
t@@ -99,6 +100,9 @@ class LNWorker(PrintError):
self.invoices = wallet.storage.get('lightning_invoices', {})
peer_list = network.config.get('lightning_peers', node_list)
self.channel_state = {chan.channel_id: "DISCONNECTED" for chan in self.channels.values()}
+ self.lnwatcher = LNWatcher(network, self.channel_state)
+ for chan_id, chan in self.channels.items():
+ self.lnwatcher.watch_channel(chan)
for host, port, pubkey in peer_list:
self.add_peer(host, int(port), pubkey)
# wait until we see confirmations
t@@ -111,15 +115,6 @@ class LNWorker(PrintError):
def add_peer(self, host, port, pubkey):
node_id = bfh(pubkey)
- for chan_id in self.channels_for_peer(node_id):
- chan = self.channels[chan_id]
- script = funding_output_script(chan.local_config, chan.remote_config)
- funding_address = redeem_script_to_address('p2wsh', script)
- scripthash = address_to_scripthash(funding_address)
- utxos = self.network.listunspent_for_scripthash(scripthash)
- outpoints = [Outpoint(x["tx_hash"], x["tx_pos"]) for x in utxos]
- if chan.funding_outpoint not in outpoints:
- self.channel_state[chan.channel_id] = "CLOSED"
peer = Peer(self, host, int(port), node_id, request_initial_sync=self.config.get("request_initial_sync", True))
self.network.futures.append(asyncio.run_coroutine_threadsafe(peer.main_loop(), asyncio.get_event_loop()))
self.peers[node_id] = peer