diff --git a/build.sh b/build.sh index daf241e..54312f3 100755 --- a/build.sh +++ b/build.sh @@ -3,15 +3,15 @@ TRACING=1 # CYPHERNODE VERSION "v0.1.1" -CONF_VERSION="v0.1.1-local" -GATEKEEPER_VERSION="v0.1.1-local" -PROXY_VERSION="v0.1.1-local" -PROXYCRON_VERSION="v0.1.1-local" -OTSCLIENT_VERSION="v0.1.1-local" -PYCOIN_VERSION="v0.1.1-local" -BITCOIN_VERSION="v0.17.0" -LIGHTNING_VERSION="v0.6.2" -GRAFANA_VERSION="v0.1.1-local" +CONF_VERSION="v0.2.0-rc.1-local" +GATEKEEPER_VERSION="v0.2.0-rc.1-local" +PROXY_VERSION="v0.2.0-rc.1-local" +PROXYCRON_VERSION="v0.2.0-rc.1-local" +OTSCLIENT_VERSION="v0.2.0-rc.1-local" +PYCOIN_VERSION="v0.2.0-rc.1-local" +BITCOIN_VERSION="v0.17.1" +LIGHTNING_VERSION="v0.7.0" +GRAFANA_VERSION="v0.2.0-rc.1-local" trace() { diff --git a/dist/setup.sh b/dist/setup.sh index ffe52be..a5aa4fb 100755 --- a/dist/setup.sh +++ b/dist/setup.sh @@ -693,14 +693,14 @@ AUTOSTART=0 # CYPHERNODE VERSION "v0.1.1" VERSION_OVERRIDE="true" -CONF_VERSION="v0.1.1" -GATEKEEPER_VERSION="v0.1.1" -PROXY_VERSION="v0.1.1" -PROXYCRON_VERSION="v0.1.1" -OTSCLIENT_VERSION="v0.1.1" -PYCOIN_VERSION="v0.1.1" -BITCOIN_VERSION="v0.17.0" -LIGHTNING_VERSION="v0.6.2" +CONF_VERSION="v0.2.0-rc.1" +GATEKEEPER_VERSION="v0.2.0-rc.1" +PROXY_VERSION="v0.2.0-rc.1" +PROXYCRON_VERSION="v0.2.0-rc.1" +OTSCLIENT_VERSION="v0.2.0-rc.1" +PYCOIN_VERSION="v0.2.0-rc.1" +BITCOIN_VERSION="v0.17.1" +LIGHTNING_VERSION="v0.7.0" SPARKWALLET_VERSION="standalone" SETUP_DIR=$(dirname $(realpath $0)) diff --git a/proxy_docker/app/script/startproxy.sh b/proxy_docker/app/script/startproxy.sh index 4ec85dc..a865012 100644 --- a/proxy_docker/app/script/startproxy.sh +++ b/proxy_docker/app/script/startproxy.sh @@ -45,6 +45,9 @@ chmod 0600 $DB_FILE createCurlConfig ${WATCHER_BTC_NODE_RPC_CFG} ${WATCHER_BTC_NODE_RPC_USER} createCurlConfig ${SPENDER_BTC_NODE_RPC_CFG} ${SPENDER_BTC_NODE_RPC_USER} -./waitanyinvoice.sh & +. ${DB_PATH}/config.sh +if [ "${FEATURE_LIGHTNING}" = "true" ]; then + ./waitanyinvoice.sh & +fi nc -vlkp${PROXY_LISTENING_PORT} -e ./requesthandler.sh