From 1fcd601bac09e2ed22909663b565c417c92f2ed1 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Fri, 26 Jun 2020 02:33:30 -0700 Subject: [PATCH] Fix lnd host config (#52) * Fix lnd host config to not lookup ip by host * Fix external lnd host --- docker/config.ini | 1 + itests/docker-compose.yml | 6 +++--- squeakserver/server/main.py | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docker/config.ini b/docker/config.ini index c98d33ba..188c5b31 100644 --- a/docker/config.ini +++ b/docker/config.ini @@ -3,6 +3,7 @@ network=testnet [lnd] host=lnd +external_host=localhost port=9735 rpc_port=10009 tls_cert_path=/root/.lnd/tls.cert diff --git a/itests/docker-compose.yml b/itests/docker-compose.yml index 42dc14e1..1f9dcf31 100644 --- a/itests/docker-compose.yml +++ b/itests/docker-compose.yml @@ -61,9 +61,9 @@ services: - "btcd:blockchain" entrypoint: ["./start-lnd.sh"] - lnd_sqkserver: + lnd: image: lnd - container_name: lnd_sqkserver + container_name: lnd build: context: ../ dockerfile: docker/lnd/Dockerfile @@ -99,7 +99,7 @@ services: - lnd_dir_sqkserver:/root/.lnd - ./config.ini:/app/config.ini links: - - "lnd_sqkserver:lnd" + - "lnd:lnd" depends_on: - db sysctls: diff --git a/squeakserver/server/main.py b/squeakserver/server/main.py index 73ff291b..b03047b2 100644 --- a/squeakserver/server/main.py +++ b/squeakserver/server/main.py @@ -38,12 +38,10 @@ def load_lightning_client(config) -> LNDLightningClient: def load_lightning_host_port(config) -> LNDLightningClient: if int(config['server']['price']) == 0: return None - lnd_ip_address = socket.gethostbyname( - config['lnd']['host'], - ) + lnd_host = config['lnd']['external_host'] or config['lnd']['host'] lnd_port = int(config['lnd']['port']) return LightningAddressHostPort( - lnd_ip_address, + lnd_host, lnd_port, )