tsimplify parameters, add lndhost to config - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fe1a1b27c6a29a8ec615e3a4db07e959571b8d69
DIR parent 0abfcd2b6a40ba206412f48ad50513a36be398e2
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 6 Apr 2018 15:58:33 +0200
simplify parameters, add lndhost to config
Diffstat:
M lib/lightning.py | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
---
DIR diff --git a/lib/lightning.py b/lib/lightning.py
t@@ -32,8 +32,6 @@ NETWORK = None
CONFIG = None
locked = set()
-#machine = "148.251.87.112"
-machine = "127.0.0.1"
def WriteDb(json):
req = rpc_pb2.WriteDbRequest()
t@@ -602,6 +600,7 @@ class LightningRPC:
self.queue = queue.Queue()
self.subscribers = []
self.console = None
+
# overridden
async def run(self, netAndWalLock):
while asyncio.get_event_loop().is_running():
t@@ -612,6 +611,7 @@ class LightningRPC:
pass
else:
def lightningRpcNetworkRequestThreadTarget(qitem):
+ machine = CONFIG.get('lndhost', '127.0.0.1')
applyMethodName = lambda x: functools.partial(x, qitem.methodName)
client = Server("http://" + machine + ":8090")
argumentStrings = [str(x) for x in qitem.args]
t@@ -666,7 +666,7 @@ class LightningWorker:
self.wallet = wallet
self.network = network
self.config = config
- ks = self.wallet().keystore
+ ks = self.wallet.keystore
assert hasattr(ks, "xprv"), "Wallet must have xprv, can't be e.g. imported"
try:
xprv = ks.get_master_private_key(None)
t@@ -677,8 +677,7 @@ class LightningWorker:
privKey = tupl[-1]
assert type(privKey) is type(bytes([]))
privateKeyHash = bitcoin.Hash(privKey)
-
- deser = bitcoin.deserialize_xpub(wallet().keystore.xpub)
+ deser = bitcoin.deserialize_xpub(wallet.keystore.xpub)
assert deser[0] == "p2wpkh", deser
self.subscribers = []
t@@ -688,15 +687,14 @@ class LightningWorker:
global globalIdx
wasAlreadyUpToDate = False
-
while asyncio.get_event_loop().is_running():
- WALLET = self.wallet()
- NETWORK = self.network()
- CONFIG = self.config()
-
+ WALLET = self.wallet
+ NETWORK = self.network
+ CONFIG = self.config
+ machine = CONFIG.get('lndhost', '127.0.0.1')
globalIdx = WALLET.storage.get("lightning_global_key_index", 0)
- if globalIdx != 0: print("initial lightning global key index", globalIdx)
-
+ if globalIdx != 0:
+ print("initial lightning global key index", globalIdx)
writer = None
print("OPENING CONNECTION")
try:
t@@ -718,6 +716,7 @@ class LightningWorker:
traceback.print_exc()
await asyncio.sleep(5)
continue
+
def subscribe(self, notifyFunction):
self.subscribers.append(functools.partial(notifyFunction, "LightningWorker"))