diff --git a/docker/sqkserver/config.ini.sh b/docker/sqkserver/config.ini.sh index 4b1f3428..e573bc38 100644 --- a/docker/sqkserver/config.ini.sh +++ b/docker/sqkserver/config.ini.sh @@ -2,12 +2,8 @@ NETWORK=$1 LND_RPC_HOST=$2 LND_RPC_PORT=$3 -BTCD_RPC_HOST=$4 -BTCD_RPC_PORT=$5 -BTCD_RPC_USER=$6 -BTCD_RPC_PASS=$7 -SQK_RPC_HOST=$8 -SQK_RPC_PORT=$9 +SQK_RPC_HOST=$4 +SQK_RPC_PORT=$5 #define the template. cat << EOF @@ -19,11 +15,11 @@ network=$NETWORK rpc_host=$LND_RPC_HOST rpc_port=$LND_RPC_PORT -[btcd] -rpc_host=$BTCD_RPC_HOST -rpc_port=$BTCD_RPC_PORT -rpc_user=$BTCD_RPC_USER -rpc_pass=$BTCD_RPC_PASS +[electrum] +rpc_host= +rpc_port= +rpc_user= +rpc_pass= [server] rpc_host=$SQK_RPC_HOST diff --git a/docker/sqkserver/start-sqkserver.sh b/docker/sqkserver/start-sqkserver.sh index 1e4b0d30..9e302b39 100755 --- a/docker/sqkserver/start-sqkserver.sh +++ b/docker/sqkserver/start-sqkserver.sh @@ -41,49 +41,21 @@ set_default() { # Set default variables if needed. LND_HOST="lnd" LND_PORT=10009 -BTCD_HOST="btcd" RPCUSER=$(set_default "$RPCUSER" "devuser") RPCPASS=$(set_default "$RPCPASS" "devpass") DEBUG=$(set_default "$DEBUG" "debug") NETWORK=$(set_default "$NETWORK" "simnet") CHAIN=$(set_default "$CHAIN" "bitcoin") -BACKEND="btcd" SQK_HOST="0.0.0.0" SQK_PORT=50052 -# This is a hack that is needed because python-bitcoinlib does not -# currently support simnet network. -BTCD_RPC_PORT="18332" -if [[ "$NETWORK" == "mainnet" ]]; then - BTCD_RPC_PORT="8334" -elif [[ "$NETWORK" == "testnet" ]]; then - BTCD_RPC_PORT="18334" -elif [[ "$NETWORK" == "regtest" ]]; then - BTCD_RPC_PORT="18445" -elif [[ "$NETWORK" == "simnet" ]]; then - BTCD_RPC_PORT="18556" -fi - - -# Add btcd's RPC TLS certificate to system Certificate Authority list. exec runsqueak \ -cp /rpc/rpc.cert /usr/share/ca-certificates/btcd.crt -echo btcd.crt >> /etc/ca-certificates.conf -update-ca-certificates - -# To make python requests use the system ca-certificates bundle, it -# needs to be told to use it over its own embedded bundle -export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - # Generate the config file. chmod +x config.ini.sh -./config.ini.sh $NETWORK $LND_HOST $LND_PORT $BTCD_HOST $BTCD_RPC_PORT $RPCUSER $RPCPASS $SQK_HOST $SQK_PORT > config.ini +./config.ini.sh $NETWORK $LND_HOST $LND_PORT $SQK_HOST $SQK_PORT > config.ini echo "config.ini:" cat config.ini -echo "$DEBUG:" -echo $DEBUG - echo "Starting to run the python server here...." exec runsqueakserver \ diff --git a/itests/docker-compose.yml b/itests/docker-compose.yml index 393c0ca4..0804c2b3 100644 --- a/itests/docker-compose.yml +++ b/itests/docker-compose.yml @@ -144,7 +144,6 @@ services: - shared_test:/rpc - lnd_dir_sqkserver:/root/.lnd links: - - "btcd:blockchain" - "lnd_sqkserver:lnd" depends_on: - db @@ -162,7 +161,6 @@ services: - shared_test:/rpc - lnd_dir_alice:/root/.lnd links: - - "btcd:blockchain" - "lnd_alice:lnd" command: tail -f /dev/null