From c71bbcb7e5436323597a5ce32c81f7d1c363b058 Mon Sep 17 00:00:00 2001 From: AaronDewes Date: Sun, 26 Mar 2023 15:19:59 +0000 Subject: [PATCH] Update various dependencies & switch to bitcoin core --- db/dependencies.yml | 4 ++-- karen | 11 +++++++---- scripts/update/01-run.sh | 1 - services/bitcoin/core.yml | 4 ++-- services/bitcoin/knots.yml | 4 ++-- services/lightning/lnd.yml | 4 ++-- services/manage.py | 6 +++--- templates/bitcoin-sample.conf | 3 --- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/db/dependencies.yml b/db/dependencies.yml index b9cbdb4..df8f71f 100644 --- a/db/dependencies.yml +++ b/db/dependencies.yml @@ -2,9 +2,9 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -compose: v2.12.2 +compose: v2.17.2 dashboard: ghcr.io/runcitadel/dashboard:no-https@sha256:7fc5a5b70496240e6e48a381e8ac3c7978e7343285fda4951c00846580d6216d manager: runcitadel/api:main@sha256:12d299d8850d830fa5abd0e64c8537dfcbaec662de18376b0d7b01fa59895132 middleware: ghcr.io/runcitadel/middleware:main@sha256:cbd5fd2ab5afe420025c61e276d21c79a004d6148b8dfdd58649adb55907682b -app-cli: runcitadel/app-manager:backports@sha256:11a8c1b73fe5e4c6f45126d5bde10b5a469977e280319c62e2edfacad256012d +app-cli: runcitadel/app-manager:backports@sha256:953c23bf2e176a0b2b9dbe4e3e82d897b04ae6048a2e202a3b043c6e393285c5 tor: ghcr.io/runcitadel/tor-latest:main@sha256:761948a86f8367238eb61f991cf87094b12a8a772be0eabec00d66164d13075f diff --git a/karen b/karen index 1a300f2..4d9986e 100755 --- a/karen +++ b/karen @@ -10,11 +10,11 @@ import os rootDir = os.path.dirname(os.path.abspath(__file__)) os.chdir(rootDir) -if os.path.exists("karen.socket"): - os.remove("karen.socket") +if os.path.exists("events/karen.socket"): + os.remove("events/karen.socket") server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) -server.bind("karen.socket") +server.bind("events/karen.socket") while True: server.listen(1) @@ -23,9 +23,12 @@ while True: if datagram: instructions = datagram.decode("utf-8").strip().split() cmd = instructions[0] - if(cmd == "trigger"): + if cmd == "trigger": trigger = instructions[1] instructions.pop(0) instructions.pop(0) os.system("events/triggers/{} {}".format(trigger, " ".join(instructions))) + elif cmd == "exec": + instructions.pop(0) + os.system(" ".join(instructions)) conn.close() diff --git a/scripts/update/01-run.sh b/scripts/update/01-run.sh index b904c96..293bc1a 100755 --- a/scripts/update/01-run.sh +++ b/scripts/update/01-run.sh @@ -117,7 +117,6 @@ cat < "$CITADEL_ROOT"/statuses/update-status.json {"state": "installing", "progress": 80, "description": "Starting new containers", "updateTo": "$RELEASE"} EOF cd "$CITADEL_ROOT" -rm -f apps/port*.yml || true ./scripts/start || true diff --git a/services/bitcoin/core.yml b/services/bitcoin/core.yml index d3acf32..17cee1a 100644 --- a/services/bitcoin/core.yml +++ b/services/bitcoin/core.yml @@ -1,10 +1,10 @@ -# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors +# SPDX-FileCopyrightText: 2021-2023 Citadel and contributors # # SPDX-License-Identifier: GPL-3.0-or-later bitcoin: container_name: bitcoin - image: lncm/bitcoind:v23.0@sha256:57317c90d89156a30327fe1b8e51b836e0fd1a8ba13721eb2e75e6b35a570e26 + image: lncm/bitcoind:v24.0@sha256:db19fe46f30acd3854f4f0d239278137d828ce3728f925c8d92faaab1ba8556a depends_on: - tor volumes: diff --git a/services/bitcoin/knots.yml b/services/bitcoin/knots.yml index 9e35869..f87f9cd 100644 --- a/services/bitcoin/knots.yml +++ b/services/bitcoin/knots.yml @@ -1,10 +1,10 @@ -# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors +# SPDX-FileCopyrightText: 2021-2023 Citadel and contributors # # SPDX-License-Identifier: GPL-3.0-or-later bitcoin: container_name: bitcoin - image: ghcr.io/runcitadel/bitcoinknots:main@sha256:5fbee0f6f0d09d42aacc11c373ffe6162210c42ce21e6eba294e547e3ad80219 + image: lncm/bitcoind:v24.0@sha256:db19fe46f30acd3854f4f0d239278137d828ce3728f925c8d92faaab1ba8556a depends_on: - tor volumes: diff --git a/services/lightning/lnd.yml b/services/lightning/lnd.yml index 910ed62..c76d5bf 100644 --- a/services/lightning/lnd.yml +++ b/services/lightning/lnd.yml @@ -1,10 +1,10 @@ -# SPDX-FileCopyrightText: 2022 Citadel and contributors +# SPDX-FileCopyrightText: 2022-2023 Citadel and contributors # # SPDX-License-Identifier: GPL-3.0-or-later lightning: container_name: lightning - image: lightninglabs/lnd:v0.15.4-beta@sha256:f5b19812ab7d28faa350838dac4bb88e7fcf9ae905e44d3539be41a97b80ca23 + image: lightninglabs/lnd:v0.15.5-beta@sha256:ce94136ccfc48d36f058ae48fdeb53d84dbbb8f972bbae3af98e4fdfb98d641b user: 1000:1000 depends_on: - tor diff --git a/services/manage.py b/services/manage.py index f258b72..4f94d1d 100755 --- a/services/manage.py +++ b/services/manage.py @@ -68,7 +68,7 @@ def setService(name, implementation): except FileNotFoundError: installed = { "lightning": "lnd", - "bitcoin": "knots" + "bitcoin": "core" } installed[name] = implementation with open(os.path.join(nodeRoot, "services", "installed.yml"), 'w') as stream: @@ -99,7 +99,7 @@ def uninstallService(name): except FileNotFoundError: installed = { "lightning": "lnd", - "bitcoin": "knots" + "bitcoin": "core" } try: del installed[name] @@ -116,7 +116,7 @@ def installServices(): except FileNotFoundError: installed = { "lightning": "lnd", - "bitcoin": "knots" + "bitcoin": "core" } for key, value in installed.items(): diff --git a/templates/bitcoin-sample.conf b/templates/bitcoin-sample.conf index a269b12..3609fc0 100644 --- a/templates/bitcoin-sample.conf +++ b/templates/bitcoin-sample.conf @@ -38,9 +38,6 @@ blockfilterindex=1 peerbloomfilters=1 peerblockfilters=1 -# Bitcoin Knots only, Bitcoin Core simply ignores this -reindex=auto - # NOTE: The options addnode, connect, port, bind, rpcport, rpcbind and wallet