diff --git a/README.md b/README.md index da7d8f9..1d71c0e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,6 @@ docker compose up --build We have three possible overrides over the default `testnet` configuration in `docker-compose.yml`: - `docker-compose.testnet.yml` - `docker-compose.regtest.yml` -- `docker-compose.mainnet.yml` To use override we have to pass it down both the config using `-f` flag: ``` diff --git a/assets/bitcoin.conf b/assets/bitcoin.conf index 0a3978c..79be1bf 100644 --- a/assets/bitcoin.conf +++ b/assets/bitcoin.conf @@ -8,13 +8,6 @@ whitelist=0.0.0.0/0 txindex=1 blockfilterindex=1 -[main] -rpcbind=0.0.0.0 -rpcuser=rpcuser -rpcpassword=VLSsigner1 -rpcport=8332 -port=8333 - [test] rpcbind=0.0.0.0 rpcuser=rpcuser @@ -27,4 +20,4 @@ rpcbind=0.0.0.0 rpcuser=rpcuser rpcpassword=VLSsigner1 rpcport=38332 -port=38333 \ No newline at end of file +port=38333 diff --git a/assets/main-config b/assets/main-config deleted file mode 100644 index 95d6daa..0000000 --- a/assets/main-config +++ /dev/null @@ -1,9 +0,0 @@ -network=regtest -bitcoin-rpcuser=rpcuser -bitcoin-rpcpassword=VLSsigner1 -bitcoin-rpcport=8332 -log-level=info -max-locktime-blocks=288 -important-plugin=/usr/bin/clboss -clboss-auto-close=true -bind-addr=0.0.0.0:9735 \ No newline at end of file diff --git a/assets/main-env b/assets/main-env deleted file mode 100644 index bad59e7..0000000 --- a/assets/main-env +++ /dev/null @@ -1,4 +0,0 @@ -VLS_PORT=17701 -VLS_NETWORK=regtest -BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:8332 -RUST_LOG=info \ No newline at end of file diff --git a/docker-compose.mainnet.yml b/docker-compose.mainnet.yml deleted file mode 100644 index d1820c0..0000000 --- a/docker-compose.mainnet.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: "3.8" -services: - bitcoin-core: - container_name: bitcoind-main - expose: - - 8332 - ports: - - 8333:8333 - environment: - - BITCOIN_CHAIN=main - - core-lightning: - container_name: lightningd-main - command: - - --conf=/home/lightning/.lightning/main-config - - --bitcoin-rpcconnect=bitcoind - expose: - - 9735 - ports: - - 9735:9735 - env_file: - - ./assets/main-env - environment: - - BITCOIN_CHAIN=main - - txoo: - container_name: txoo-main - command: - - -r http://rpcuser:VLSsigner1@bitcoind:8332 - environment: - - BITCOIN_CHAIN=main \ No newline at end of file diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile index 139d1d8..864f67d 100644 --- a/lightningd/Dockerfile +++ b/lightningd/Dockerfile @@ -107,7 +107,6 @@ RUN mkdir -p "${BITCOIND_HOME}" && \ COPY assets/bitcoin.conf "${BITCOIND_HOME}"/bitcoin.conf COPY assets/testnet-config /testnet-config COPY assets/regtest-config /regtest-config -COPY assets/main-config /main-config USER lightning diff --git a/lightningd/entrypoint.sh b/lightningd/entrypoint.sh index a9fcbfa..87f3e60 100755 --- a/lightningd/entrypoint.sh +++ b/lightningd/entrypoint.sh @@ -3,7 +3,6 @@ set -e cp -u /testnet-config ${LIGHTNINGD_DATA}/testnet-config cp -u /regtest-config ${LIGHTNINGD_DATA}/regtest-config -cp -u /main-config ${LIGHTNINGD_DATA}/main-config export GREENLIGHT_VERSION=$(lightningd --version) diff --git a/lightningd/healthcheck.sh b/lightningd/healthcheck.sh index e753eec..b214130 100755 --- a/lightningd/healthcheck.sh +++ b/lightningd/healthcheck.sh @@ -7,9 +7,8 @@ LIGHTNING_NETWORK="" case $BITCOIN_CHAIN in "test") LIGHTNING_NETWORK=testnet ;; "regtest") LIGHTNING_NETWORK=regtest ;; - "main") LIGHTNING_NETWORK=bitcoin ;; "signet") LIGHTNING_NETWORK=signet ;; *) echo "Invalid BITCOIN_CHAIN value: $BITCOIN_CHAIN" && exit 1 ;; esac -lightning-cli --network $LIGHTNING_NETWORK getinfo \ No newline at end of file +lightning-cli --network $LIGHTNING_NETWORK getinfo