Merge branch 'stable' into c-lightning

app/app-standard-v2.yml

@@ -186,6 +186,8 @@ properties:
         restart:
           type: string
           description: When the container should restart. Can be 'always' or 'on-failure'.
+        network_mode:
+          type: string
       additionalProperties: false
       required:
         - name

app/lib/composegenerator/shared/const.py

@@ -35,6 +35,7 @@ def permissions():
                 "BITCOIN_ZMQ_RAWBLOCK_PORT",
                 "BITCOIN_ZMQ_RAWTX_PORT",
                 "BITCOIN_ZMQ_HASHBLOCK_PORT",
+                "BITCOIN_ZMQ_SEQUENCE_PORT",
             ],
             "volumes": [
                 "${BITCOIN_DATA_DIR}:/bitcoin"

docker-compose.yml

@@ -68,7 +68,6 @@ services:
     image: nolim1t/bitcoinknots:v22.0.knots20211108@sha256:a475da2b2ecda55fcc65ea23e1a36c58b2c10549f1c3d3bb3c31c7dda1127354
     depends_on:
     - tor
-    init: true
     volumes:
     - ${PWD}/bitcoin:/data/.bitcoin
     restart: on-failure
@@ -101,7 +100,7 @@ services:
         ipv4_address: $LND_IP
   dashboard:
     container_name: dashboard
-    image: ghcr.io/runcitadel/dashboard:main@sha256:2a5c8b504917cdf8fcd33b4e7beed2d042f932bfc8f6d5467b6ce079610bd85a
+    image: ghcr.io/runcitadel/dashboard:v0.0.5@sha256:4430774d51e5731b5dc36606d7bef43f5ab2902c82cf4353ace59ebd590c2a40
     restart: on-failure
     stop_grace_period: 1m30s
     networks:
@@ -109,7 +108,7 @@ services:
         ipv4_address: $DASHBOARD_IP
   manager:
     container_name: manager
-    image: ghcr.io/runcitadel/manager:main@sha256:b2d34b5edec7fbf333773ce1c4168b5376ba2156e99d26fa59b1865d66540694
+    image: ghcr.io/runcitadel/manager:v0.0.5@sha256:e7dc280dbeabfd4947f60676446dd69a46354f18a54e9cfb109afa98b114396c
     depends_on:
     - tor
     - redis
@@ -143,7 +142,7 @@ services:
       LND_CERT_FILE: /lnd/tls.cert
       LND_ADMIN_MACAROON_FILE: /lnd/data/chain/bitcoin/${BITCOIN_NETWORK}/admin.macaroon
       GITHUB_REPO: runcitadel/core
-      GITHUB_BRANCH: ${UPDATE_CHANNEL:-"main"}
+      GITHUB_BRANCH: ${UPDATE_CHANNEL:-"stable"}
       VERSION_FILE: /info.json
       UPDATE_LOCK_FILE: /statuses/update-in-progress
       BACKUP_STATUS_FILE: /statuses/backup-status.json
@@ -161,7 +160,7 @@ services:
         ipv4_address: $MANAGER_IP
   middleware:
     container_name: middleware
-    image: ghcr.io/runcitadel/middleware:main@sha256:512591c3358e5e2d32c11e76e1652399323c4a9240afdde9b6d95a976c0d6bce
+    image: ghcr.io/runcitadel/middleware:v0.0.3@sha256:860fc9b1d748ac1e738322b2dc209560dc206a101be6c135bfff9b4d4fbaf023
     depends_on:
     - manager
     - bitcoin

events/triggers/use-beta-builds

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)"
+
+"${CITADEL_ROOT}/scripts/set-update-channel" beta

events/triggers/use-stable-builds

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)"
+
+"${CITADEL_ROOT}/scripts/set-update-channel" stable

info.json

@@ -1,6 +1,6 @@
 {
-    "version": "0.5.22",
-    "name": "Citadel 0.5.22",
-    "requires": ">=0.5.5",
-    "notes": "Please note: This update is not suitable for notes running the c-lightning beta. This update includes minor a few bug fixes."
+    "version": "0.0.1",
+    "name": "Citadel 0.0.1",
+    "requires": ">=0.5.24",
+    "notes": "Please note: This update is not compatible with the c-lightning beta. We're resetting version numbers to 0.0.1. This update only contains one bug fix, but please install this update so you'll receive further updates."
 }

scripts/citadel-os/external-storage/update-from-sdcard

@@ -40,6 +40,11 @@ main () {
   local external_version=$(cat "${CITADEL_ROOT}/info.json" | jq -r .version | cut -d "-" -f "1")
   local sd_version=$(cat "${SD_CITADEL_ROOT}/info.json" | jq -r .version | cut -d "-" -f "1")
 
+  if [[ "${external_version}" == "0.5"* ]]; then
+    echo "External storage is on a pre version number reset version, updating to the latest version."
+    "${CITADEL_ROOT}/scripts/update/update" --path "${SD_CITADEL_ROOT}"
+  fi
+
   if ! check_semver_range ">${external_version}" "${sd_version}"; then
     echo "No, SD version is not newer, exiting."
     exit 0

scripts/configure

@@ -146,7 +146,7 @@ if os.path.isfile('../use-core-upstream') or os.path.isfile('./use-core-upstream
 
 NGINX_PORT=os.environ.get('NGINX_PORT') or "80"
 NGINX_SSL_PORT=os.environ.get('NGINX_SSL_PORT') or "443"
-UPDATE_CHANNEL="main"
+UPDATE_CHANNEL="stable"
 
 if reconfiguring:
   if os.path.isfile('../.citadel'):
@@ -174,7 +174,7 @@ if reconfiguring:
     NGINX_SSL_PORT=dotenv['NGINX_SSL_PORT']
   if NGINX_SSL_PORT == "80" and NGINX_PORT == "80":
     NGINX_SSL_PORT="443"
-  if 'UPDATE_CHANNEL' in dotenv:
+  if 'UPDATE_CHANNEL' in dotenv and dotenv['UPDATE_CHANNEL'] != "main" and dotenv['UPDATE_CHANNEL'] != "migration":
     UPDATE_CHANNEL=dotenv['UPDATE_CHANNEL']
 else:
   # Generate RPC credentials
@@ -305,6 +305,7 @@ BITCOIN_P2P_PORT="8333"
 BITCOIN_ZMQ_RAWBLOCK_PORT="28332"
 BITCOIN_ZMQ_RAWTX_PORT="28333"
 BITCOIN_ZMQ_HASHBLOCK_PORT="28334"
+BITCOIN_ZMQ_SEQUENCE_PORT="28335"
 LND_GRPC_PORT="10009"
 LND_REST_PORT="8080"
 ELECTRUM_PORT="50001"

scripts/set-update-channel

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2021-2022 Citadel and contributors
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+NODE_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/../..)"
+
+# IN ${NODE_ROOT}/.env, change the UPDATE_CHANNEL to the desired channel ($1)
+# If $1 is not given, fail
+if [ -z "$1" ]; then
+    echo "Usage: $0 <channel>"
+    echo "Channel can currently either be 'stable' or 'beta'"
+    exit 1
+fi
+sed -i "s/UPDATE_CHANNEL=.*/UPDATE_CHANNEL=${1}/" "${NODE_ROOT}/.env"

scripts/update/01-run.sh

@@ -25,6 +25,12 @@ echo
 
 IS_MIGRATING=0
 
+# If ${CITADEL_ROOT}/c-lightning exists, fail
+if [[ -d "${CITADEL_ROOT}/c-lightning" ]]; then
+    echo "This update is not compatible with the c-lightning beta."
+    exit 1
+fi
+
 # Make Citadel OS specific updates
 if [[ ! -z "${CITADEL_OS:-}" ]]; then
     echo

scripts/update/update

@@ -34,7 +34,7 @@ elif [[ "${1}" == "--repo" ]]; then
   update_type="repo"
   descriptor="${2}"
   if [[ "${descriptor}" != *"#"* ]]; then
-    descriptor="${descriptor}#${UPDATE_CHANNEL:-"main"}"
+    descriptor="${descriptor}#${UPDATE_CHANNEL:-"stable"}"
   fi
   repo="${descriptor%%#*}"
   branch="${descriptor#*#}"

templates/.env-sample

@@ -24,6 +24,7 @@ BITCOIN_RPC_AUTH='<bitcoin-rpc-auth>'
 BITCOIN_ZMQ_RAWBLOCK_PORT=<bitcoin-zmq-rawblock-port>
 BITCOIN_ZMQ_RAWTX_PORT=<bitcoin-zmq-rawtx-port>
 BITCOIN_ZMQ_HASHBLOCK_PORT=<bitcoin-zmq-hashblock-port>
+BITCOIN_ZMQ_SEQUENCE_PORT=<bitcoin-zmq-sequence-port>
 LND_IP=<lnd-ip>
 C_LIGHTNING_IP=<c-lightning-ip>
 LND_GRPC_PORT=<lnd-grpc-port>

templates/bitcoin-sample.conf

@@ -25,6 +25,7 @@ maxmempool=300
 zmqpubrawblock=tcp://0.0.0.0:<bitcoin-zmq-rawblock-port>
 zmqpubrawtx=tcp://0.0.0.0:<bitcoin-zmq-rawtx-port>
 zmqpubhashblock=tcp://0.0.0.0:<bitcoin-zmq-hashblock-port>
+zmqpubsequence=tcp://0.0.0.0:<bitcoin-zmq-sequence-port>
 
 # Indexes
 txindex=1