From 323dbb00d5a38120b7c55a19c3126be191f6f147 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Thu, 11 Aug 2022 13:56:39 +0200 Subject: [PATCH] Remove custom forks of Fulcrum & Bitcoin Core, update LND & Bitcoin (#75) Co-authored-by: nolim1t - f6287b82CC84bcbd Co-authored-by: Aaron Dewes Co-authored-by: Philipp Walter --- .gitignore | 4 ++-- cli/citadel | 6 +++--- docker-compose.yml | 2 +- {fulcrumx => fulcrum}/.gitkeep | 0 scripts/configure | 2 +- scripts/update/.updateignore | 2 +- services/bitcoin/citadel.yml | 18 ------------------ services/bitcoin/core.yml | 2 +- services/bitcoin/knots.yml | 2 +- .../{fulcrumx-custom.yml => fulcrum.yml} | 6 +++--- services/electrum/fulcrumx.yml | 19 ------------------- ...lcrumx-sample.conf => fulcrum-sample.conf} | 0 12 files changed, 13 insertions(+), 50 deletions(-) rename {fulcrumx => fulcrum}/.gitkeep (100%) delete mode 100644 services/bitcoin/citadel.yml rename services/electrum/{fulcrumx-custom.yml => fulcrum.yml} (65%) delete mode 100644 services/electrum/fulcrumx.yml rename templates/{fulcrumx-sample.conf => fulcrum-sample.conf} (100%) diff --git a/.gitignore b/.gitignore index 5e50f48..cd57ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ statuses/* app-data apps electrs/* -fulcrumx/* +fulcrum/* nginx/* redis/* docker-compose.override.yml @@ -43,7 +43,7 @@ db/citadel-seed/* !db/.gitkeep !nginx/.gitkeep !redis/.gitkeep -!fulcrumx/.gitkeep +!fulcrum/.gitkeep !**/*.license services/installed.json diff --git a/cli/citadel b/cli/citadel index 1835368..ccd1937 100755 --- a/cli/citadel +++ b/cli/citadel @@ -381,12 +381,12 @@ if [[ "$command" = "configure" ]]; then exit fi - if [[ "$2" = "fulcrumx" ]]; then + if [[ "$2" = "fulcrum" ]]; then if $persist; then - edit_file $CITADEL_ROOT/templates/fulcrumx-sample.conf + edit_file $CITADEL_ROOT/templates/fulcrum-sample.conf prompt_apply_config electrum true else - edit_file $CITADEL_ROOT/fulcrumx/fulcrumx.conf + edit_file $CITADEL_ROOT/fulcrum/fulcrum.conf prompt_apply_config electrum false fi exit diff --git a/docker-compose.yml b/docker-compose.yml index d0dc3df..7c4b3a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,7 @@ services: ipv4_address: $NGINX_IP bitcoin: container_name: bitcoin - image: nolim1t/bitcoinknots:v22.0.knots20211108@sha256:a475da2b2ecda55fcc65ea23e1a36c58b2c10549f1c3d3bb3c31c7dda1127354 + image: ghcr.io/runcitadel/bitcoinknots:main@sha256:5fbee0f6f0d09d42aacc11c373ffe6162210c42ce21e6eba294e547e3ad80219 depends_on: - tor volumes: diff --git a/fulcrumx/.gitkeep b/fulcrum/.gitkeep similarity index 100% rename from fulcrumx/.gitkeep rename to fulcrum/.gitkeep diff --git a/scripts/configure b/scripts/configure index 2f3381a..5a725ef 100755 --- a/scripts/configure +++ b/scripts/configure @@ -336,7 +336,7 @@ templates_to_build = { "./templates/bitcoin-sample.conf": "./bitcoin/bitcoin.conf", "./templates/.env-sample": "./.env", "./templates/electrs-sample.toml": "./electrs/electrs.toml", - "./templates/fulcrumx-sample.conf": "./fulcrumx/fulcrumx.conf", + "./templates/fulcrum-sample.conf": "./fulcrum/fulcrum.conf", "./templates/nginx-sample.conf": "./nginx/nginx.conf" } diff --git a/scripts/update/.updateignore b/scripts/update/.updateignore index 92b78e1..86322c8 100644 --- a/scripts/update/.updateignore +++ b/scripts/update/.updateignore @@ -12,4 +12,4 @@ nginx/* services/installed.yml apps/sourceMap.json apps/.updateignore -fulcrumx/* +fulcrum/* diff --git a/services/bitcoin/citadel.yml b/services/bitcoin/citadel.yml deleted file mode 100644 index ea2cb89..0000000 --- a/services/bitcoin/citadel.yml +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors -# -# SPDX-License-Identifier: GPL-3.0-or-later - -bitcoin: - container_name: bitcoin - image: ghcr.io/runcitadel/bitcoin-custom:main@sha256:d0af506f8dc92a434e845305ac4252d0601b699c4b3bc4443073a0a2e237f3a0 - depends_on: - - tor - volumes: - - ${PWD}/bitcoin:/data/.bitcoin - restart: on-failure - stop_grace_period: 1m - ports: - - $BITCOIN_P2P_PORT:$BITCOIN_P2P_PORT - networks: - default: - ipv4_address: $BITCOIN_IP diff --git a/services/bitcoin/core.yml b/services/bitcoin/core.yml index bec641b..d3acf32 100644 --- a/services/bitcoin/core.yml +++ b/services/bitcoin/core.yml @@ -4,7 +4,7 @@ bitcoin: container_name: bitcoin - image: lncm/bitcoind:v22.0@sha256:37a1adb29b3abc9f972f0d981f45e41e5fca2e22816a023faa9fdc0084aa4507 + image: lncm/bitcoind:v23.0@sha256:57317c90d89156a30327fe1b8e51b836e0fd1a8ba13721eb2e75e6b35a570e26 depends_on: - tor volumes: diff --git a/services/bitcoin/knots.yml b/services/bitcoin/knots.yml index 8d32077..9e35869 100644 --- a/services/bitcoin/knots.yml +++ b/services/bitcoin/knots.yml @@ -4,7 +4,7 @@ bitcoin: container_name: bitcoin - image: nolim1t/bitcoinknots:v22.0.knots20211108@sha256:a475da2b2ecda55fcc65ea23e1a36c58b2c10549f1c3d3bb3c31c7dda1127354 + image: ghcr.io/runcitadel/bitcoinknots:main@sha256:5fbee0f6f0d09d42aacc11c373ffe6162210c42ce21e6eba294e547e3ad80219 depends_on: - tor volumes: diff --git a/services/electrum/fulcrumx-custom.yml b/services/electrum/fulcrum.yml similarity index 65% rename from services/electrum/fulcrumx-custom.yml rename to services/electrum/fulcrum.yml index 7822423..cd537ed 100644 --- a/services/electrum/fulcrumx-custom.yml +++ b/services/electrum/fulcrum.yml @@ -4,12 +4,12 @@ electrum: container_name: electrum - image: ghcr.io/runcitadel/fulcrumx:latest@sha256:a74abdfe8397f02482faed6bd828477c452df071129f66ad6596d0ab8d29cf39 + image: cculianu/fulcrum:latest@sha256:c0543f8b8a5bf6b0c447d8525d6b4360a6c07532f7741f19cc2c179968e71848 working_dir: /data volumes: - ${PWD}/bitcoin:/bitcoin:ro - - ${PWD}/fulcrumx:/data - command: /usr/bin/FulcrumX /data/fulcrumx.conf + - ${PWD}/fulcrum:/data + command: /usr/bin/Fulcrum /data/fulcrum.conf restart: on-failure stop_grace_period: 5m ports: diff --git a/services/electrum/fulcrumx.yml b/services/electrum/fulcrumx.yml deleted file mode 100644 index f8ee13c..0000000 --- a/services/electrum/fulcrumx.yml +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors -# -# SPDX-License-Identifier: GPL-3.0-or-later - -electrum: - container_name: electrum - image: ghcr.io/runcitadel/fulcrumx:latest@sha256:557a54a5652b475b01c59eb6cffee3568f18b74d875c4cc125e5ac190c4b0706 - working_dir: /data - volumes: - - ${PWD}/bitcoin:/bitcoin:ro - - ${PWD}/fulcrumx:/data - command: /usr/bin/FulcrumX /data/fulcrumx.conf - restart: on-failure - stop_grace_period: 5m - ports: - - "$ELECTRUM_PORT:$ELECTRUM_PORT" - networks: - default: - ipv4_address: $ELECTRUM_IP diff --git a/templates/fulcrumx-sample.conf b/templates/fulcrum-sample.conf similarity index 100% rename from templates/fulcrumx-sample.conf rename to templates/fulcrum-sample.conf