diff --git a/docker/config.ini b/docker/config.ini index e1be2e0e..8ed93c50 100644 --- a/docker/config.ini +++ b/docker/config.ini @@ -1,9 +1,12 @@ [DEFAULT] -network=simnet +network=mainnet [lnd] -rpc_host=lnd +host=lnd +port=9735 rpc_port=10009 +tls_cert_path=/root/.lnd/tls.cert +macaroon_path=/root/.lnd/data/chain/bitcoin/mainnet/admin.macaroon [electrum] rpc_host= @@ -14,6 +17,7 @@ rpc_pass= [server] rpc_host=0.0.0.0 rpc_port=8774 +price=0 [postgresql] host=db diff --git a/docker/createdb.sql b/docker/createdb.sql new file mode 100644 index 00000000..24618bd8 --- /dev/null +++ b/docker/createdb.sql @@ -0,0 +1,3 @@ +CREATE DATABASE squeakserver; + +\connect squeakserver; diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8b504284..bc34a981 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,67 +1,6 @@ version: '3' services: - btcd: - image: btcd - container_name: btcd - build: - context: ../ - dockerfile: docker/btcd/Dockerfile - volumes: - - shared:/rpc - - bitcoin:/data - environment: - - RPCUSER - - RPCPASS - - NETWORK - - DEBUG - - MINING_ADDRESS - ports: - - 8334:8334 - - 18334:18334 - - 18556:18556 - - 28902:28902 - entrypoint: ["./start-btcd.sh"] - - btcctl: - image: btcd - container_name: btcctl - build: - context: ../ - dockerfile: docker/btcd/Dockerfile - volumes: - - shared:/rpc - - bitcoin:/data - environment: - - RPCUSER - - RPCPASS - - NETWORK - - DEBUG - - MINING_ADDRESS - links: - - "btcd:rpcserver" - entrypoint: ["./start-btcctl.sh"] - - lnd: - image: lnd - container_name: lnd - build: - context: ../ - dockerfile: docker/lnd/Dockerfile - environment: - - RPCUSER - - RPCPASS - - NETWORK - - CHAIN - - DEBUG - - RPC_LISTEN="0.0.0.0:10009" - volumes: - - shared:/rpc - - lnd_dir:/root/.lnd - links: - - "btcd:blockchain" - entrypoint: ["./start-lnd.sh"] - db: image: postgres environment: @@ -69,7 +8,7 @@ services: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres volumes: - - ../init.sql:/docker-entrypoint-initdb.d/init.sql + - ./createdb.sql:/docker-entrypoint-initdb.d/init.sql sqkserver: image: sqkserver @@ -77,37 +16,13 @@ services: build: context: ../ dockerfile: docker/sqkserver/Dockerfile - environment: - - RPCUSER - - RPCPASS - - NETWORK - - CHAIN - - DEBUG - - HEADLESS volumes: - - shared:/rpc - - lnd_dir:/root/.lnd - ./config.ini:/app/config.ini ports: - 8774:8774 - 18774:18774 - links: - - "lnd:lnd" depends_on: - db sysctls: - net.ipv6.conf.all.disable_ipv6=0 - -volumes: - # btcctl and lnd containers. - shared: - driver: local - - # bitcoin volume is needed for maintaining blockchain persistence - # during btcd container recreation. - bitcoin: - driver: local - - # lnd_dir volume is needed for sharing tht tls certificate - lnd_dir: - driver: local + command: ["./wait-for-it.sh", "db:5432", "--", "runsqueakserver", "--config", "config.ini", "--log-level", "DEBUG", "run-server"] diff --git a/itests/config.ini b/itests/config.ini index 8a713b13..bc86d418 100644 --- a/itests/config.ini +++ b/itests/config.ini @@ -17,6 +17,7 @@ rpc_pass= [server] rpc_host=0.0.0.0 rpc_port=8774 +price=100 [postgresql] host=db diff --git a/squeakserver/server/main.py b/squeakserver/server/main.py index 7113708c..cbe404e2 100644 --- a/squeakserver/server/main.py +++ b/squeakserver/server/main.py @@ -23,6 +23,8 @@ from squeakserver.server.postgres_db import PostgresDb def load_lightning_client(config) -> LNDLightningClient: + if int(config['server']['price']) == 0: + return None return LNDLightningClient( config['lnd']['host'], config['lnd']['rpc_port'], @@ -34,6 +36,8 @@ 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'], ) diff --git a/wait-for-it.sh b/wait-for-it.sh new file mode 100755 index 00000000..5e8679e5 --- /dev/null +++ b/wait-for-it.sh @@ -0,0 +1,182 @@ +#!/usr/bin/env bash +# Use this script to test if a given TCP host/port are available + +WAITFORIT_cmdname=${0##*/} + +echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi } + +usage() +{ + cat << USAGE >&2 +Usage: + $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args] + -h HOST | --host=HOST Host or IP under test + -p PORT | --port=PORT TCP port under test + Alternatively, you specify the host and port as host:port + -s | --strict Only execute subcommand if the test succeeds + -q | --quiet Don't output any status messages + -t TIMEOUT | --timeout=TIMEOUT + Timeout in seconds, zero for no timeout + -- COMMAND ARGS Execute command with args after the test finishes +USAGE + exit 1 +} + +wait_for() +{ + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + else + echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout" + fi + WAITFORIT_start_ts=$(date +%s) + while : + do + if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then + nc -z $WAITFORIT_HOST $WAITFORIT_PORT + WAITFORIT_result=$? + else + (echo > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1 + WAITFORIT_result=$? + fi + if [[ $WAITFORIT_result -eq 0 ]]; then + WAITFORIT_end_ts=$(date +%s) + echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds" + break + fi + sleep 1 + done + return $WAITFORIT_result +} + +wait_for_wrapper() +{ + # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692 + if [[ $WAITFORIT_QUIET -eq 1 ]]; then + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + else + timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT & + fi + WAITFORIT_PID=$! + trap "kill -INT -$WAITFORIT_PID" INT + wait $WAITFORIT_PID + WAITFORIT_RESULT=$? + if [[ $WAITFORIT_RESULT -ne 0 ]]; then + echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT" + fi + return $WAITFORIT_RESULT +} + +# process arguments +while [[ $# -gt 0 ]] +do + case "$1" in + *:* ) + WAITFORIT_hostport=(${1//:/ }) + WAITFORIT_HOST=${WAITFORIT_hostport[0]} + WAITFORIT_PORT=${WAITFORIT_hostport[1]} + shift 1 + ;; + --child) + WAITFORIT_CHILD=1 + shift 1 + ;; + -q | --quiet) + WAITFORIT_QUIET=1 + shift 1 + ;; + -s | --strict) + WAITFORIT_STRICT=1 + shift 1 + ;; + -h) + WAITFORIT_HOST="$2" + if [[ $WAITFORIT_HOST == "" ]]; then break; fi + shift 2 + ;; + --host=*) + WAITFORIT_HOST="${1#*=}" + shift 1 + ;; + -p) + WAITFORIT_PORT="$2" + if [[ $WAITFORIT_PORT == "" ]]; then break; fi + shift 2 + ;; + --port=*) + WAITFORIT_PORT="${1#*=}" + shift 1 + ;; + -t) + WAITFORIT_TIMEOUT="$2" + if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi + shift 2 + ;; + --timeout=*) + WAITFORIT_TIMEOUT="${1#*=}" + shift 1 + ;; + --) + shift + WAITFORIT_CLI=("$@") + break + ;; + --help) + usage + ;; + *) + echoerr "Unknown argument: $1" + usage + ;; + esac +done + +if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then + echoerr "Error: you need to provide a host and port to test." + usage +fi + +WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15} +WAITFORIT_STRICT=${WAITFORIT_STRICT:-0} +WAITFORIT_CHILD=${WAITFORIT_CHILD:-0} +WAITFORIT_QUIET=${WAITFORIT_QUIET:-0} + +# Check to see if timeout is from busybox? +WAITFORIT_TIMEOUT_PATH=$(type -p timeout) +WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH) + +WAITFORIT_BUSYTIMEFLAG="" +if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then + WAITFORIT_ISBUSY=1 + # Check if busybox timeout uses -t flag + # (recent Alpine versions don't support -t anymore) + if timeout &>/dev/stdout | grep -q -e '-t '; then + WAITFORIT_BUSYTIMEFLAG="-t" + fi +else + WAITFORIT_ISBUSY=0 +fi + +if [[ $WAITFORIT_CHILD -gt 0 ]]; then + wait_for + WAITFORIT_RESULT=$? + exit $WAITFORIT_RESULT +else + if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then + wait_for_wrapper + WAITFORIT_RESULT=$? + else + wait_for + WAITFORIT_RESULT=$? + fi +fi + +if [[ $WAITFORIT_CLI != "" ]]; then + if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then + echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess" + exit $WAITFORIT_RESULT + fi + exec "${WAITFORIT_CLI[@]}" +else + exit $WAITFORIT_RESULT +fi