From 0d193ace20c2748a1271dcd6f7762fa708408363 Mon Sep 17 00:00:00 2001 From: michael1011 Date: Mon, 6 Jan 2025 17:41:58 +0100 Subject: [PATCH] chore: remove mpay --- build.py | 2 +- data/backend/boltz.conf | 9 --------- docker-compose.yml | 1 - images/c-lightning-plugins/Dockerfile | 14 -------------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/build.py b/build.py index 88c29c1..cb14365 100755 --- a/build.py +++ b/build.py @@ -40,7 +40,7 @@ class Image: value="alpine", ) -CLN_VERSION = "24.08.1" +CLN_VERSION = "24.11.1" ELECTRS_VERSION = "new-index-6d182d" IMAGES: dict[str, Image] = { diff --git a/data/backend/boltz.conf b/data/backend/boltz.conf index e0d8b87..77ce7bd 100755 --- a/data/backend/boltz.conf +++ b/data/backend/boltz.conf @@ -112,15 +112,6 @@ maxZeroConfAmount = 0 privateKeyPath = "/root/.lightning/regtest/hold/client-key.pem" certChainPath = "/root/.lightning/regtest/hold/client.pem" - [currencies.cln.mpay] - host = "cln-2" - port = 9293 - - rootCertPath = "/root/.lightning/regtest/mpay/ca.pem" - privateKeyPath = "/root/.lightning/regtest/mpay/client-key.pem" - certChainPath = "/root/.lightning/regtest/mpay/client.pem" - - [liquid] symbol = "L-BTC" network = "liquidRegtest" diff --git a/docker-compose.yml b/docker-compose.yml index fcc23c0..8ffa1a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,7 +66,6 @@ x-services: - --dev-fast-reconnect - --plugin=/root/hold - --plugin=/root/clnurl - - --plugin=/root/mpay.sh - --experimental-offers - --clnurl-host=0.0.0.0 - --ignore-fee-limits=false diff --git a/images/c-lightning-plugins/Dockerfile b/images/c-lightning-plugins/Dockerfile index 151b7e2..6141bf5 100644 --- a/images/c-lightning-plugins/Dockerfile +++ b/images/c-lightning-plugins/Dockerfile @@ -4,13 +4,6 @@ FROM boltz/c-lightning:${VERSION} AS builder RUN apt-get update && apt-get install -y git pkg-config wget -RUN pip install poetry - -RUN git clone --depth 1 https://github.com/BoltzExchange/boltz-backend.git - -WORKDIR /boltz-backend/tools -RUN poetry config virtualenvs.in-project true && poetry install --no-dev - WORKDIR /hold # TODO: download arm artifacts @@ -24,14 +17,7 @@ RUN tar -xvf clnurl.tar.gz FROM boltz/c-lightning:${VERSION} -COPY --from=builder /boltz-backend/tools /tools -COPY --from=builder /boltz-backend/tools/.venv /tools/.venv COPY --from=builder /hold/build/hold-linux-amd64 /root/hold COPY --from=builder /clnurl/clnurl /root/clnurl -ENV PATH="/tools/.venv/bin:$PATH" - -RUN echo 'cd /tools && PYTHONPATH="/tools" python3 plugins/mpay/mpay.py' >> /root/mpay.sh \ - && chmod +x /root/mpay.sh - ENTRYPOINT ["lightningd"]