From 09db66b58a3f693361df30be7ba5f3027ffc6031 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Fri, 3 May 2024 11:55:47 -0700 Subject: [PATCH 01/20] Ensure /var/cache/nginx dirs are created on Ubuntu --- production/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/production/install b/production/install index c89bf004fa..51da3682d2 100755 --- a/production/install +++ b/production/install @@ -633,6 +633,8 @@ zfsCreateFilesystems() ext4CreateDir() { mkdir -p "/backup" "${ELEMENTS_HOME}" "${BITCOIN_HOME}" "${MINFEE_HOME}" "${ELECTRS_HOME}" "${MEMPOOL_HOME}" "${MYSQL_HOME}" "${BITCOIN_ELECTRS_HOME}" "${ELEMENTS_HOME}/liquidv1" "${ELEMENTS_ELECTRS_HOME}" + mkdir -p /var/cache/nginx/services /var/cache/nginx/api + chown "${NGINX_USER}:${NGINX_GROUP}" /var/cache/nginx/services /var/cache/nginx/api # Bitcoin Mainnet if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then From e5181ac1b6e0d6c4842e1891e746aa7bb36417e3 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Fri, 3 May 2024 11:59:02 -0700 Subject: [PATCH 02/20] Fix check for Liquid testnet --- production/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/install b/production/install index 51da3682d2..cb4510f128 100755 --- a/production/install +++ b/production/install @@ -1590,8 +1590,8 @@ fi # Bitcoin instance for Liquid Testnet # ####################################### -if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then - echo "[*] Installing Bitcoin Liquid service" +if [ "${ELEMENTS_LIQUIDTESTNET_ENABLE}" = ON ];then + echo "[*] Installing Bitcoin Liquid Testnet service" case $OS in FreeBSD) From 72af09ad6e4919cca78e905ce137032b6f0e923d Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Fri, 3 May 2024 11:59:52 -0700 Subject: [PATCH 03/20] Fix typo --- production/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/install b/production/install index cb4510f128..f9ccfefb3c 100755 --- a/production/install +++ b/production/install @@ -1437,7 +1437,7 @@ fi if [ "${UNFURL_INSTALL}" = ON ];then - echo "[*] Insalling Unfurl source" + echo "[*] Installing Unfurl source" case $OS in FreeBSD) From 69fc9d8c4a8a8deee54c69c9dc0833ec5d8f1fbf Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Fri, 3 May 2024 12:00:48 -0700 Subject: [PATCH 04/20] Fix incorrect mainnet minfee check --- production/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/install b/production/install index f9ccfefb3c..68ab5ae341 100755 --- a/production/install +++ b/production/install @@ -1522,7 +1522,7 @@ fi # Bitcoin instance for Mainnet Minfee # ####################################### -if [ "${BITCOIN_TESTNET_ENABLE}" = ON ];then +if [ "${BITCOIN_MAINNET_MINFEE_ENABLE}" = ON ];then echo "[*] Installing Bitcoin Minfee service" case $OS in From e69e5863f9627877f8eec7d51d398bb031cca561 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 5 May 2024 21:25:26 -0700 Subject: [PATCH 05/20] Update Bisq install --- production/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/production/install b/production/install index 68ab5ae341..f2b5c55a28 100755 --- a/production/install +++ b/production/install @@ -384,6 +384,7 @@ DEBIAN_PKG+=(libevent-dev libdb-dev libssl-dev libtool autotools-dev) DEBIAN_PKG+=(libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev) DEBIAN_PKG+=(nodejs npm mariadb-server nginx-core python3-certbot-nginx rsync ufw) DEBIAN_PKG+=(geoipupdate) +DEBIAN_PKG+=(openjdk-11-jdk) DEBIAN_UNFURL_PKG=() DEBIAN_UNFURL_PKG+=(cups chromium-bsu libatk1.0 libatk-bridge2.0 libxkbcommon-dev libxcomposite-dev) @@ -1381,9 +1382,6 @@ if [ "${BISQ_INSTALL}" = ON ];then echo "[*] Cloning Bisq top-level repo" osSudo "${BISQ_USER}" git clone --branch "${BISQ_REPO_BRANCH}" "${BISQ_REPO_URL}" "${BISQ_HOME}/${BISQ_REPO_NAME}" - echo "[*] Installing OpenJDK from Bisq install_java_linux.sh script" - osSudo "${ROOT_USER}" "${BISQ_HOME}/${BISQ_REPO_NAME}/scripts/install_java_linux.sh" - echo "[*] Checking out Bisq ${BISQ_LATEST_RELEASE}" osSudo "${BISQ_USER}" sh -c "cd ${BISQ_HOME}/${BISQ_REPO_NAME} && git checkout ${BISQ_LATEST_RELEASE}" From 1f35e2dfc35e759fa7cfedbb743778271a99e4d0 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 5 May 2024 21:26:18 -0700 Subject: [PATCH 06/20] Include cargo as necessary deb package --- production/install | 1 + 1 file changed, 1 insertion(+) diff --git a/production/install b/production/install index f2b5c55a28..82377d1878 100755 --- a/production/install +++ b/production/install @@ -384,6 +384,7 @@ DEBIAN_PKG+=(libevent-dev libdb-dev libssl-dev libtool autotools-dev) DEBIAN_PKG+=(libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev) DEBIAN_PKG+=(nodejs npm mariadb-server nginx-core python3-certbot-nginx rsync ufw) DEBIAN_PKG+=(geoipupdate) +DEBIAN_PKG+=(cargo) DEBIAN_PKG+=(openjdk-11-jdk) DEBIAN_UNFURL_PKG=() From 00636a95ff466aac2f907ebebfc6f5233af2ebe6 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 5 May 2024 22:15:40 -0700 Subject: [PATCH 07/20] Accept CLA --- contributors/runbtc.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contributors/runbtc.txt diff --git a/contributors/runbtc.txt b/contributors/runbtc.txt new file mode 100644 index 0000000000..7578d13808 --- /dev/null +++ b/contributors/runbtc.txt @@ -0,0 +1,3 @@ +I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of May 5, 2024. + +Signed: runbtc \ No newline at end of file From 76bd1fb9ab65a57bb00295017371f4951507d182 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 5 May 2024 22:31:04 -0700 Subject: [PATCH 08/20] Install prerequisite packages --- production/install | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/production/install b/production/install index 82377d1878..c78f5d5cb4 100755 --- a/production/install +++ b/production/install @@ -375,9 +375,13 @@ LIQUIDTESTNET_ASSET_REGISTRY_DB_NAME=asset_registry_testnet_db ##### OS packages ##### ####################### +# packages needed to run this script +DEBIAN_PREREQ_PKG=() +DEBIAN_PREREQ_PKG+=(dialog) + # packages needed for mempool ecosystem DEBIAN_PKG=() -DEBIAN_PKG+=(zsh vim curl screen openssl python3 dialog cron) +DEBIAN_PKG+=(zsh vim curl screen openssl python3 cron) DEBIAN_PKG+=(build-essential git git-lfs clang cmake jq) DEBIAN_PKG+=(autotools-dev autoconf automake pkg-config bsdmainutils) DEBIAN_PKG+=(libevent-dev libdb-dev libssl-dev libtool autotools-dev) @@ -391,6 +395,10 @@ DEBIAN_UNFURL_PKG=() DEBIAN_UNFURL_PKG+=(cups chromium-bsu libatk1.0 libatk-bridge2.0 libxkbcommon-dev libxcomposite-dev) DEBIAN_UNFURL_PKG+=(libxdamage-dev libxrandr-dev libgbm-dev libpango1.0-dev libasound-dev) +# packages needed to run this script +FREEBSD_PREREQ_PKG=() +FREEBSD_PREREQ_PKG+=(dialog) + # packages needed for mempool ecosystem FREEBSD_PKG=() FREEBSD_PKG+=(zsh sudo git git-lfs screen curl wget calc neovim) @@ -472,6 +480,18 @@ osPackageInstallAll() esac } +osPackageInstallPreReq() +{ + case $OS in + FreeBSD) + osPackageInstall ${FREEBSD_PREREQ_PKG[@]} + ;; + Debian) + osPackageInstall ${DEBIAN_PREREQ_PKG[@]} + ;; + esac +} + # osUserCreate username home_directory main_groupname [additional_group] osUserCreate() { @@ -718,6 +738,11 @@ ext4CreateDir() fi } +################################# +# Install prerequisite packages # +################################# + +osPackageInstallPreReq ##### Perform sanity checks before trying anything From 8982dd22a20b77a0d81226703e877acf2e44c426 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Mon, 6 May 2024 07:54:52 -0700 Subject: [PATCH 09/20] Update Bisq configuration --- production/install | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/production/install b/production/install index c78f5d5cb4..e7393336c1 100755 --- a/production/install +++ b/production/install @@ -1428,6 +1428,7 @@ if [ "${BISQ_INSTALL}" = ON ];then ;; Debian) + echo "[*] Installing Bisq service file" osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.service" "${DEBIAN_SERVICE_HOME}/bisq.service" osSudo "${ROOT_USER}" sed -i.orig "s/#Requires=bitcoin.service/Requires=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" osSudo "${ROOT_USER}" sed -i.orig "s/#BindsTo=bitcoin.service/BindsTo=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" @@ -1439,17 +1440,19 @@ if [ "${BISQ_INSTALL}" = ON ];then osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_APP_NAME__!${BISQ_APP_NAME}!" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_HOME__!${BISQ_HOME}!" "${DEBIAN_ENV_HOME}/bisq.env" - echo "[*] Configuring Bisq environment file with Bitcoin RPC credentials" + echo "[*] Configuring Bisq environment file" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_HOST__/${BITCOIN_MAINNET_P2P_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_PORT__/${BITCOIN_MAINNET_P2P_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_HOST__/${BITCOIN_MAINNET_RPC_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_PORT__/${BITCOIN_MAINNET_RPC_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_USER__/${BITCOIN_RPC_USER}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_PASS__/${BITCOIN_RPC_PASS}/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_BLOCKCHAIN=false/BISQ_DUMP_BLOCKCHAIN=true/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_STATISTICS=false/BISQ_DUMP_STATISTICS=true/" "${DEBIAN_ENV_HOME}/bisq.env" - #echo "[*] Updating Bitcoin configuration for Bisq" - #osSudo "${ROOT_USER}" sed -i.orig "s/#blocknotify/blocknotify/" "${BITCOIN_HOME}/bitcoin.conf" - #osSudo "${BITCOIN_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" + echo "[*] Updating Bitcoin configuration for Bisq" + osSudo "${ROOT_USER}" sed -i.orig "1iblocknotify=${BITCOIN_HOME}/blocknotify.sh %s" "${BITCOIN_HOME}/bitcoin.conf" + osSudo "${BITCOIN_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" ;; esac From 98e503236be2eedaa305d2a917d4b999f25c8acc Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Tue, 7 May 2024 23:39:54 -0700 Subject: [PATCH 10/20] Create bitcoin and elements socket files with custom ACL on Debian --- production/install | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/production/install b/production/install index e7393336c1..01682c4f9d 100755 --- a/production/install +++ b/production/install @@ -381,7 +381,7 @@ DEBIAN_PREREQ_PKG+=(dialog) # packages needed for mempool ecosystem DEBIAN_PKG=() -DEBIAN_PKG+=(zsh vim curl screen openssl python3 cron) +DEBIAN_PKG+=(zsh vim curl screen openssl python3 cron acl) DEBIAN_PKG+=(build-essential git git-lfs clang cmake jq) DEBIAN_PKG+=(autotools-dev autoconf automake pkg-config bsdmainutils) DEBIAN_PKG+=(libevent-dev libdb-dev libssl-dev libtool autotools-dev) @@ -658,6 +658,12 @@ ext4CreateDir() mkdir -p /var/cache/nginx/services /var/cache/nginx/api chown "${NGINX_USER}:${NGINX_GROUP}" /var/cache/nginx/services /var/cache/nginx/api + # create /bitcoin/socket with custom ACL for electrs unix sockets + mkdir -p "${BITCOIN_HOME}/socket" + + # create /elements/socket with custom ACL for electrs unix sockets + mkdir -p "${ELEMENTS_HOME}/socket" + # Bitcoin Mainnet if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then for folder in chainstate indexes blocks @@ -1909,13 +1915,25 @@ echo "[*] Setting permissions for electrs sockets" case $OS in FreeBSD) + if [ "${BITCOIN_INSTALL}" = ON ];then setfacl -m "user:bitcoin:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${BITCOIN_HOME}/socket" chown "${BITCOIN_USER}:${BITCOIN_GROUP}" "${BITCOIN_HOME}/socket" + fi + if [ "${ELEMENTS_INSTALL}" = ON ];then setfacl -m "user:elements:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${ELEMENTS_HOME}/socket" chown "${ELEMENTS_USER}:${ELEMENTS_GROUP}" "${ELEMENTS_HOME}/socket" + fi ;; Debian) + if [ "${BITCOIN_INSTALL}" = ON ];then + setfacl -m "u:bitcoin:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${BITCOIN_HOME}/socket" + chown "${BITCOIN_USER}:${BITCOIN_GROUP}" "${BITCOIN_HOME}/socket" + fi + if [ "${ELEMENTS_INSTALL}" = ON ];then + setfacl -m "u:elements:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${ELEMENTS_HOME}/socket" + chown "${ELEMENTS_USER}:${ELEMENTS_GROUP}" "${ELEMENTS_HOME}/socket" + fi ;; esac From 77ee10b86ec456e8797f0199b31d463deff1c01a Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Tue, 7 May 2024 23:41:49 -0700 Subject: [PATCH 11/20] Install redis on Debian --- production/install | 5 ++- production/linux/redis.conf | 79 +++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 production/linux/redis.conf diff --git a/production/install b/production/install index 01682c4f9d..a563ef7877 100755 --- a/production/install +++ b/production/install @@ -387,7 +387,7 @@ DEBIAN_PKG+=(autotools-dev autoconf automake pkg-config bsdmainutils) DEBIAN_PKG+=(libevent-dev libdb-dev libssl-dev libtool autotools-dev) DEBIAN_PKG+=(libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev) DEBIAN_PKG+=(nodejs npm mariadb-server nginx-core python3-certbot-nginx rsync ufw) -DEBIAN_PKG+=(geoipupdate) +DEBIAN_PKG+=(geoipupdate redis) DEBIAN_PKG+=(cargo) DEBIAN_PKG+=(openjdk-11-jdk) @@ -1073,6 +1073,9 @@ case $OS in echo "[*] Installing syslog configuration" osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/rsyslog.conf" /etc/rsyslog.d/10-mempool.conf osSudo "${ROOT_USER}" sed -i.orig -e 's/^\*\.\*;auth,authpriv\.none/*\.*;auth,authpriv\.none,local7\.none/' /etc/rsyslog.d/50-default.conf + + echo "[*] Installing redis configuration" + osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/redis.conf" /etc/redis/redis.conf ;; esac diff --git a/production/linux/redis.conf b/production/linux/redis.conf new file mode 100644 index 0000000000..19da4dbd13 --- /dev/null +++ b/production/linux/redis.conf @@ -0,0 +1,79 @@ +save 3600 1 300 100 60 10000 +unixsocket /tmp/redis.sock +unixsocketperm 666 + +bind 127.0.0.1 -::1 +protected-mode yes +port 6379 +tcp-backlog 511 +timeout 0 +tcp-keepalive 300 +daemonize yes +pidfile /var/run/redis/redis.pid +loglevel notice +logfile /var/log/redis/redis.log +databases 16 +always-show-logo no +set-proc-title yes +proc-title-template "{title} {listen-addr} {server-mode}" +#locale-collate "" +stop-writes-on-bgsave-error yes +rdbcompression yes +rdbchecksum yes +dbfilename dump.rdb +rdb-del-sync-files no +dir /var/lib/redis/ +replica-serve-stale-data yes +replica-read-only yes +repl-diskless-sync yes +repl-diskless-sync-delay 5 +repl-diskless-sync-max-replicas 0 +repl-diskless-load disabled +repl-disable-tcp-nodelay no +replica-priority 100 +acllog-max-len 128 +lazyfree-lazy-eviction no +lazyfree-lazy-expire no +lazyfree-lazy-server-del no +replica-lazy-flush no +lazyfree-lazy-user-del no +lazyfree-lazy-user-flush no +oom-score-adj no +oom-score-adj-values 0 200 800 +disable-thp yes +appendonly no +appendfilename "appendonly.aof" +appenddirname "appendonlydir" +appendfsync everysec +no-appendfsync-on-rewrite no +auto-aof-rewrite-percentage 100 +auto-aof-rewrite-min-size 64mb +aof-load-truncated yes +aof-use-rdb-preamble yes +aof-timestamp-enabled no + +slowlog-log-slower-than 10000 +slowlog-max-len 128 +latency-monitor-threshold 0 +notify-keyspace-events "" +hash-max-listpack-entries 512 +hash-max-listpack-value 64 +list-max-listpack-size -2 +list-compress-depth 0 +set-max-intset-entries 512 +#set-max-listpack-entries 128 +#set-max-listpack-value 64 +zset-max-listpack-entries 128 +zset-max-listpack-value 64 +hll-sparse-max-bytes 3000 +stream-node-max-bytes 4096 +stream-node-max-entries 100 +activerehashing yes +client-output-buffer-limit normal 0 0 0 +client-output-buffer-limit replica 256mb 64mb 60 +client-output-buffer-limit pubsub 32mb 8mb 60 +hz 10 +dynamic-hz yes +aof-rewrite-incremental-fsync yes +rdb-save-incremental-fsync yes +jemalloc-bg-thread yes From 12e3c915bf87a95d3a60e998bfd04eca1f496bed Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Tue, 7 May 2024 23:50:33 -0700 Subject: [PATCH 12/20] Make specific Bisq config dependent on BITCOIN_INSTALL --- production/install | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/production/install b/production/install index a563ef7877..980f513c47 100755 --- a/production/install +++ b/production/install @@ -1439,8 +1439,11 @@ if [ "${BISQ_INSTALL}" = ON ];then Debian) echo "[*] Installing Bisq service file" osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.service" "${DEBIAN_SERVICE_HOME}/bisq.service" - osSudo "${ROOT_USER}" sed -i.orig "s/#Requires=bitcoin.service/Requires=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" - osSudo "${ROOT_USER}" sed -i.orig "s/#BindsTo=bitcoin.service/BindsTo=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" + if [ "${BITCOIN_INSTALL}" = ON ];then + osSudo "${ROOT_USER}" sed -i.orig "s/After=network.target/After=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" + osSudo "${ROOT_USER}" sed -i.orig "s/#Requires=bitcoin.service/Requires=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" + osSudo "${ROOT_USER}" sed -i.orig "s/#BindsTo=bitcoin.service/BindsTo=bitcoin.service/" "${DEBIAN_SERVICE_HOME}/bisq.service" + fi osSudo "${ROOT_USER}" sed -i.orig "s/__BISQ_REPO_NAME__/${BISQ_REPO_NAME}/" "${DEBIAN_SERVICE_HOME}/bisq.service" osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_HOME__!${BISQ_HOME}!" "${DEBIAN_SERVICE_HOME}/bisq.service" @@ -1448,8 +1451,6 @@ if [ "${BISQ_INSTALL}" = ON ];then osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.env" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_APP_NAME__!${BISQ_APP_NAME}!" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_HOME__!${BISQ_HOME}!" "${DEBIAN_ENV_HOME}/bisq.env" - - echo "[*] Configuring Bisq environment file" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_HOST__/${BITCOIN_MAINNET_P2P_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_PORT__/${BITCOIN_MAINNET_P2P_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_HOST__/${BITCOIN_MAINNET_RPC_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" @@ -1459,9 +1460,11 @@ if [ "${BISQ_INSTALL}" = ON ];then osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_BLOCKCHAIN=false/BISQ_DUMP_BLOCKCHAIN=true/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_STATISTICS=false/BISQ_DUMP_STATISTICS=true/" "${DEBIAN_ENV_HOME}/bisq.env" - echo "[*] Updating Bitcoin configuration for Bisq" - osSudo "${ROOT_USER}" sed -i.orig "1iblocknotify=${BITCOIN_HOME}/blocknotify.sh %s" "${BITCOIN_HOME}/bitcoin.conf" - osSudo "${BITCOIN_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" + if [ "${BITCOIN_INSTALL}" = ON ];then + echo "[*] Updating Bitcoin configuration for Bisq" + osSudo "${ROOT_USER}" sed -i.orig "1iblocknotify=${BITCOIN_HOME}/blocknotify.sh %s" "${BITCOIN_HOME}/bitcoin.conf" + osSudo "${BITCOIN_USER}" install -c -o "${BITCOIN_USER}" -g "${BITCOIN_GROUP}" -m 755 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/blocknotify.sh" "${BITCOIN_HOME}/blocknotify.sh" + fi ;; esac @@ -1919,12 +1922,12 @@ case $OS in FreeBSD) if [ "${BITCOIN_INSTALL}" = ON ];then - setfacl -m "user:bitcoin:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${BITCOIN_HOME}/socket" - chown "${BITCOIN_USER}:${BITCOIN_GROUP}" "${BITCOIN_HOME}/socket" + setfacl -m "user:bitcoin:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${BITCOIN_HOME}/socket" + chown "${BITCOIN_USER}:${BITCOIN_GROUP}" "${BITCOIN_HOME}/socket" fi if [ "${ELEMENTS_INSTALL}" = ON ];then - setfacl -m "user:elements:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${ELEMENTS_HOME}/socket" - chown "${ELEMENTS_USER}:${ELEMENTS_GROUP}" "${ELEMENTS_HOME}/socket" + setfacl -m "user:elements:full_set:f:allow,user:mempool:full_set:f:allow,user:www:full_set:f:allow,everyone@::f:allow" "${ELEMENTS_HOME}/socket" + chown "${ELEMENTS_USER}:${ELEMENTS_GROUP}" "${ELEMENTS_HOME}/socket" fi ;; From 2715559a0f4edfd25d341475982afe2a52c690f3 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Fri, 10 May 2024 14:40:07 -0700 Subject: [PATCH 13/20] Replace DB socket path in backend configs based on OS --- production/mempool-build-all | 14 ++++++++++++++ production/mempool-config.bisq.json | 2 +- production/mempool-config.liquid.json | 2 +- production/mempool-config.liquidtestnet.json | 2 +- production/mempool-config.mainnet-lightning.json | 2 +- production/mempool-config.mainnet.json | 2 +- production/mempool-config.signet-lightning.json | 2 +- production/mempool-config.signet.json | 2 +- production/mempool-config.testnet-lightning.json | 2 +- production/mempool-config.testnet.json | 2 +- 10 files changed, 23 insertions(+), 9 deletions(-) diff --git a/production/mempool-build-all b/production/mempool-build-all index b45c0edc6a..025024c786 100755 --- a/production/mempool-build-all +++ b/production/mempool-build-all @@ -1,4 +1,17 @@ #!/usr/bin/env zsh + +case `uname -s` in + + FreeBSD) + DB_SOCKET=/var/run/mysql/mysql.sock + ;; + + Linux) + DB_SOCKET=/run/mysqld/mysqld.sock + ;; + +esac + PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin HOSTNAME=$(hostname) LOCATION=$(hostname|cut -d . -f2) @@ -110,6 +123,7 @@ build_backend() -e "s!__MEMPOOL_LIQUIDTESTNET_PASS__!${MEMPOOL_LIQUIDTESTNET_PASS}!" \ -e "s!__MEMPOOL_BISQ_USER__!${MEMPOOL_BISQ_USER}!" \ -e "s!__MEMPOOL_BISQ_PASS__!${MEMPOOL_BISQ_PASS}!" \ + -e "s!__DB_SOCKET__!${DB_SOCKET}!" \ "mempool-config.json" fi npm install --omit=dev --omit=optional || exit 1 diff --git a/production/mempool-config.bisq.json b/production/mempool-config.bisq.json index 4913cb9869..6ff25dcb4a 100644 --- a/production/mempool-config.bisq.json +++ b/production/mempool-config.bisq.json @@ -22,7 +22,7 @@ "DATABASE": { "ENABLED": false, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_BISQ_USER__", "PASSWORD": "__MEMPOOL_BISQ_PASS__", "DATABASE": "mempool_bisq" diff --git a/production/mempool-config.liquid.json b/production/mempool-config.liquid.json index 9051bba741..f70256a412 100644 --- a/production/mempool-config.liquid.json +++ b/production/mempool-config.liquid.json @@ -71,7 +71,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_LIQUID_USER__", "PASSWORD": "__MEMPOOL_LIQUID_PASS__", "DATABASE": "mempool_liquid" diff --git a/production/mempool-config.liquidtestnet.json b/production/mempool-config.liquidtestnet.json index ae6d7b1ac4..103aade69e 100644 --- a/production/mempool-config.liquidtestnet.json +++ b/production/mempool-config.liquidtestnet.json @@ -71,7 +71,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_LIQUIDTESTNET_USER__", "PASSWORD": "__MEMPOOL_LIQUIDTESTNET_PASS__", "DATABASE": "mempool_liquidtestnet" diff --git a/production/mempool-config.mainnet-lightning.json b/production/mempool-config.mainnet-lightning.json index 8dea10b4ab..58e60fc559 100644 --- a/production/mempool-config.mainnet-lightning.json +++ b/production/mempool-config.mainnet-lightning.json @@ -85,7 +85,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_MAINNET_LIGHTNING_USER__", "PASSWORD": "__MEMPOOL_MAINNET_LIGHTNING_PASS__", "DATABASE": "mempool_mainnet_lightning" diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index 5038d9bfbb..060c756ea4 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -86,7 +86,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_MAINNET_USER__", "PASSWORD": "__MEMPOOL_MAINNET_PASS__", "DATABASE": "mempool" diff --git a/production/mempool-config.signet-lightning.json b/production/mempool-config.signet-lightning.json index f90b18f503..5d549e351d 100644 --- a/production/mempool-config.signet-lightning.json +++ b/production/mempool-config.signet-lightning.json @@ -80,7 +80,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_SIGNET_LIGHTNING_USER__", "PASSWORD": "__MEMPOOL_SIGNET_LIGHTNING_PASS__", "DATABASE": "mempool_signet_lightning" diff --git a/production/mempool-config.signet.json b/production/mempool-config.signet.json index 0a711d16f8..8d32ab35a6 100644 --- a/production/mempool-config.signet.json +++ b/production/mempool-config.signet.json @@ -74,7 +74,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_SIGNET_USER__", "PASSWORD": "__MEMPOOL_SIGNET_PASS__", "DATABASE": "mempool_signet" diff --git a/production/mempool-config.testnet-lightning.json b/production/mempool-config.testnet-lightning.json index 59a858cbf9..d4c549b785 100644 --- a/production/mempool-config.testnet-lightning.json +++ b/production/mempool-config.testnet-lightning.json @@ -80,7 +80,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_TESTNET_LIGHTNING_USER__", "PASSWORD": "__MEMPOOL_TESTNET_LIGHTNING_PASS__", "DATABASE": "mempool_testnet_lightning" diff --git a/production/mempool-config.testnet.json b/production/mempool-config.testnet.json index adc93c0e90..173c6dd090 100644 --- a/production/mempool-config.testnet.json +++ b/production/mempool-config.testnet.json @@ -74,7 +74,7 @@ "DATABASE": { "ENABLED": true, "HOST": "127.0.0.1", - "SOCKET": "/var/run/mysql/mysql.sock", + "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_TESTNET_USER__", "PASSWORD": "__MEMPOOL_TESTNET_PASS__", "DATABASE": "mempool_testnet" From 45f94f9de7f2323bdca936c079d6a126db876131 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 19 May 2024 11:00:25 -0700 Subject: [PATCH 14/20] Replace redis socket path in backend configs based on OS --- production/linux/redis.conf | 2 +- production/mempool-build-all | 3 +++ production/mempool-config.mainnet.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/production/linux/redis.conf b/production/linux/redis.conf index 19da4dbd13..4426857d39 100644 --- a/production/linux/redis.conf +++ b/production/linux/redis.conf @@ -1,5 +1,5 @@ save 3600 1 300 100 60 10000 -unixsocket /tmp/redis.sock +unixsocket /var/run/redis/redis.sock unixsocketperm 666 bind 127.0.0.1 -::1 diff --git a/production/mempool-build-all b/production/mempool-build-all index 025024c786..ae05112e8f 100755 --- a/production/mempool-build-all +++ b/production/mempool-build-all @@ -4,10 +4,12 @@ case `uname -s` in FreeBSD) DB_SOCKET=/var/run/mysql/mysql.sock + REDIS_SOCKET=/tmp/redis.sock ;; Linux) DB_SOCKET=/run/mysqld/mysqld.sock + REDIS_SOCKET=/var/run/redis/redis.sock ;; esac @@ -124,6 +126,7 @@ build_backend() -e "s!__MEMPOOL_BISQ_USER__!${MEMPOOL_BISQ_USER}!" \ -e "s!__MEMPOOL_BISQ_PASS__!${MEMPOOL_BISQ_PASS}!" \ -e "s!__DB_SOCKET__!${DB_SOCKET}!" \ + -e "s!__REDIS_SOCKET__!${REDIS_SOCKET}!" \ "mempool-config.json" fi npm install --omit=dev --omit=optional || exit 1 diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index 060c756ea4..c5366b628a 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -144,7 +144,7 @@ }, "REDIS": { "ENABLED": true, - "UNIX_SOCKET_PATH": "/tmp/redis.sock", + "UNIX_SOCKET_PATH": "__REDIS_SOCKET__", "BATCH_QUERY_BASE_SIZE": 5000 }, "MEMPOOL_SERVICES": { From 9c4621faa21b0131a63b4f71b658e0cc2f957d35 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sun, 19 May 2024 11:02:53 -0700 Subject: [PATCH 15/20] Ensure created socket files inherit the ACL --- production/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/install b/production/install index 980f513c47..1342b249b9 100755 --- a/production/install +++ b/production/install @@ -1933,11 +1933,11 @@ case $OS in Debian) if [ "${BITCOIN_INSTALL}" = ON ];then - setfacl -m "u:bitcoin:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${BITCOIN_HOME}/socket" + setfacl -Rdm "u:bitcoin:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${BITCOIN_HOME}/socket" chown "${BITCOIN_USER}:${BITCOIN_GROUP}" "${BITCOIN_HOME}/socket" fi if [ "${ELEMENTS_INSTALL}" = ON ];then - setfacl -m "u:elements:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${ELEMENTS_HOME}/socket" + setfacl -Rdm "u:elements:rwx,u:mempool:rwx,u:www-data:rwx,o::rw-" "${ELEMENTS_HOME}/socket" chown "${ELEMENTS_USER}:${ELEMENTS_GROUP}" "${ELEMENTS_HOME}/socket" fi ;; From 2ebc2f16308efa7233b6c118b73e1bb152163243 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sat, 7 Dec 2024 22:25:36 -0800 Subject: [PATCH 16/20] Additional updates to Bisq config in install script --- production/install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/production/install b/production/install index 1342b249b9..be49c2b30e 100755 --- a/production/install +++ b/production/install @@ -1449,7 +1449,6 @@ if [ "${BISQ_INSTALL}" = ON ];then echo "[*] Installing Bisq environment file" osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.env" "${DEBIAN_ENV_HOME}/bisq.env" - osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_APP_NAME__!${BISQ_APP_NAME}!" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s!__BISQ_HOME__!${BISQ_HOME}!" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_HOST__/${BITCOIN_MAINNET_P2P_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_P2P_PORT__/${BITCOIN_MAINNET_P2P_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" @@ -1457,8 +1456,13 @@ if [ "${BISQ_INSTALL}" = ON ];then osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_PORT__/${BITCOIN_MAINNET_RPC_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_USER__/${BITCOIN_RPC_USER}/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_PASS__/${BITCOIN_RPC_PASS}/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_BLOCKNOTIFY_HOST__/${BISQ_BLOCKNOTIFY_HOST}/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s/__BITCOIN_RPC_BLOCKNOTIFY_PORT__/${BISQ_BLOCKNOTIFY_PORT}/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s!BISQ_APP_NAME=bisq-seednode!BISQ_APP_NAME=bisq-statsnode!" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s!BISQ_ENTRYPOINT=seednode/build/app/bin/bisq-seednode!BISQ_ENTRYPOINT=statsnode/build/app/bin/bisq-statsnode!" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_BLOCKCHAIN=false/BISQ_DUMP_BLOCKCHAIN=true/" "${DEBIAN_ENV_HOME}/bisq.env" osSudo "${ROOT_USER}" sed -i.orig "s/BISQ_DUMP_STATISTICS=false/BISQ_DUMP_STATISTICS=true/" "${DEBIAN_ENV_HOME}/bisq.env" + osSudo "${ROOT_USER}" sed -i.orig "s!-Xmx4096M!-Xmx8192M!" "${DEBIAN_SERVICE_HOME}/bisq.env" if [ "${BITCOIN_INSTALL}" = ON ];then echo "[*] Updating Bitcoin configuration for Bisq" From 01a37b552d831eb5d7b3af47d0cac7c70c6bd201 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Sat, 7 Dec 2024 22:26:07 -0800 Subject: [PATCH 17/20] Update Bisq mempool config --- production/mempool-config.bisq.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/mempool-config.bisq.json b/production/mempool-config.bisq.json index 6ff25dcb4a..de98622b43 100644 --- a/production/mempool-config.bisq.json +++ b/production/mempool-config.bisq.json @@ -20,7 +20,7 @@ "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet" }, "DATABASE": { - "ENABLED": false, + "ENABLED": true, "HOST": "127.0.0.1", "SOCKET": "__DB_SOCKET__", "USERNAME": "__MEMPOOL_BISQ_USER__", @@ -33,6 +33,6 @@ }, "BISQ": { "ENABLED": true, - "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db" + "DATA_PATH": "/bisq/bisq-statsnode/btc_mainnet/db" } } From d3cb0bdf9d170e8c340abbab15d9f3b6822bcb1c Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:45:22 -0800 Subject: [PATCH 18/20] Change official mempool setting --- production/mempool-config.bisq.json | 2 +- production/mempool-config.liquid.json | 2 +- production/mempool-config.liquidtestnet.json | 2 +- production/mempool-config.mainnet-lightning.json | 2 +- production/mempool-config.mainnet.json | 2 +- production/mempool-config.signet-lightning.json | 2 +- production/mempool-config.signet.json | 2 +- production/mempool-config.testnet-lightning.json | 2 +- production/mempool-config.testnet.json | 2 +- production/mempool-frontend-config.bisq.json | 2 +- production/mempool-frontend-config.liquid.json | 2 +- production/mempool-frontend-config.mainnet.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/production/mempool-config.bisq.json b/production/mempool-config.bisq.json index de98622b43..b1d1915673 100644 --- a/production/mempool-config.bisq.json +++ b/production/mempool-config.bisq.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "bisq", "BACKEND": "esplora", "HTTP_PORT": 8996, diff --git a/production/mempool-config.liquid.json b/production/mempool-config.liquid.json index f70256a412..0195ab4128 100644 --- a/production/mempool-config.liquid.json +++ b/production/mempool-config.liquid.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "liquid", "BACKEND": "esplora", "HTTP_PORT": 8998, diff --git a/production/mempool-config.liquidtestnet.json b/production/mempool-config.liquidtestnet.json index 103aade69e..7c59d519d7 100644 --- a/production/mempool-config.liquidtestnet.json +++ b/production/mempool-config.liquidtestnet.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "liquid", "BACKEND": "esplora", "HTTP_PORT": 8994, diff --git a/production/mempool-config.mainnet-lightning.json b/production/mempool-config.mainnet-lightning.json index 58e60fc559..a3b44dae87 100644 --- a/production/mempool-config.mainnet-lightning.json +++ b/production/mempool-config.mainnet-lightning.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "ENABLED": false, "NETWORK": "mainnet", "BACKEND": "esplora", diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index c5366b628a..a3c1e92a16 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "mainnet", "BACKEND": "esplora", "HTTP_PORT": 8999, diff --git a/production/mempool-config.signet-lightning.json b/production/mempool-config.signet-lightning.json index 5d549e351d..f785e60d23 100644 --- a/production/mempool-config.signet-lightning.json +++ b/production/mempool-config.signet-lightning.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "ENABLED": false, "NETWORK": "signet", "BACKEND": "esplora", diff --git a/production/mempool-config.signet.json b/production/mempool-config.signet.json index 8d32ab35a6..b634f91987 100644 --- a/production/mempool-config.signet.json +++ b/production/mempool-config.signet.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "signet", "BACKEND": "esplora", "HTTP_PORT": 8995, diff --git a/production/mempool-config.testnet-lightning.json b/production/mempool-config.testnet-lightning.json index d4c549b785..1a7d0ad89c 100644 --- a/production/mempool-config.testnet-lightning.json +++ b/production/mempool-config.testnet-lightning.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "ENABLED": false, "NETWORK": "testnet", "BACKEND": "esplora", diff --git a/production/mempool-config.testnet.json b/production/mempool-config.testnet.json index 173c6dd090..d406105433 100644 --- a/production/mempool-config.testnet.json +++ b/production/mempool-config.testnet.json @@ -1,6 +1,6 @@ { "MEMPOOL": { - "OFFICIAL": true, + "OFFICIAL": false, "NETWORK": "testnet", "BACKEND": "esplora", "HTTP_PORT": 8997, diff --git a/production/mempool-frontend-config.bisq.json b/production/mempool-frontend-config.bisq.json index 3ddb807f9b..df9fcdf6d5 100644 --- a/production/mempool-frontend-config.bisq.json +++ b/production/mempool-frontend-config.bisq.json @@ -1,6 +1,6 @@ { "BASE_MODULE": "bisq", - "OFFICIAL_MEMPOOL_SPACE": true, + "OFFICIAL_MEMPOOL_SPACE": false, "TESTNET_ENABLED": true, "LIQUID_ENABLED": true, "LIQUID_TESTNET_ENABLED": true, diff --git a/production/mempool-frontend-config.liquid.json b/production/mempool-frontend-config.liquid.json index 1a4fc2998d..e29f5e6325 100644 --- a/production/mempool-frontend-config.liquid.json +++ b/production/mempool-frontend-config.liquid.json @@ -1,6 +1,6 @@ { "BASE_MODULE": "liquid", - "OFFICIAL_MEMPOOL_SPACE": true, + "OFFICIAL_MEMPOOL_SPACE": false, "TESTNET_ENABLED": true, "LIQUID_ENABLED": true, "LIQUID_TESTNET_ENABLED": true, diff --git a/production/mempool-frontend-config.mainnet.json b/production/mempool-frontend-config.mainnet.json index 144783a939..87f5fc42f2 100644 --- a/production/mempool-frontend-config.mainnet.json +++ b/production/mempool-frontend-config.mainnet.json @@ -1,5 +1,5 @@ { - "OFFICIAL_MEMPOOL_SPACE": true, + "OFFICIAL_MEMPOOL_SPACE": false, "TESTNET_ENABLED": true, "LIQUID_ENABLED": true, "LIQUID_TESTNET_ENABLED": true, From 69d198f42876cf34b015fd54b1f805e4038010e3 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:47:31 -0800 Subject: [PATCH 19/20] Disable replication and remove fallback servers --- production/mempool-config.liquid.json | 44 +-------- production/mempool-config.liquidtestnet.json | 44 +-------- .../mempool-config.mainnet-lightning.json | 44 +-------- production/mempool-config.mainnet.json | 92 +------------------ .../mempool-config.signet-lightning.json | 44 +-------- production/mempool-config.signet.json | 44 +-------- .../mempool-config.testnet-lightning.json | 44 +-------- production/mempool-config.testnet.json | 44 +-------- 8 files changed, 11 insertions(+), 389 deletions(-) diff --git a/production/mempool-config.liquid.json b/production/mempool-config.liquid.json index 0195ab4128..b20279fd6e 100644 --- a/production/mempool-config.liquid.json +++ b/production/mempool-config.liquid.json @@ -24,49 +24,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquid", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3001", - "http://node202.fmt.mempool.space:3001", - "http://node203.fmt.mempool.space:3001", - "http://node204.fmt.mempool.space:3001", - "http://node205.fmt.mempool.space:3001", - "http://node206.fmt.mempool.space:3001", - "http://node201.va1.mempool.space:3001", - "http://node202.va1.mempool.space:3001", - "http://node203.va1.mempool.space:3001", - "http://node204.va1.mempool.space:3001", - "http://node205.va1.mempool.space:3001", - "http://node206.va1.mempool.space:3001", - "http://node207.va1.mempool.space:3001", - "http://node208.va1.mempool.space:3001", - "http://node209.va1.mempool.space:3001", - "http://node210.va1.mempool.space:3001", - "http://node211.va1.mempool.space:3001", - "http://node212.va1.mempool.space:3001", - "http://node213.va1.mempool.space:3001", - "http://node214.va1.mempool.space:3001", - "http://node201.fra.mempool.space:3001", - "http://node202.fra.mempool.space:3001", - "http://node203.fra.mempool.space:3001", - "http://node204.fra.mempool.space:3001", - "http://node205.fra.mempool.space:3001", - "http://node206.fra.mempool.space:3001", - "http://node207.fra.mempool.space:3001", - "http://node208.fra.mempool.space:3001", - "http://node209.fra.mempool.space:3001", - "http://node210.fra.mempool.space:3001", - "http://node211.fra.mempool.space:3001", - "http://node212.fra.mempool.space:3001", - "http://node213.fra.mempool.space:3001", - "http://node214.fra.mempool.space:3001", - "http://node201.tk7.mempool.space:3001", - "http://node202.tk7.mempool.space:3001", - "http://node203.tk7.mempool.space:3001", - "http://node204.tk7.mempool.space:3001", - "http://node205.tk7.mempool.space:3001", - "http://node206.tk7.mempool.space:3001" - ] + "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquid" }, "DATABASE": { "ENABLED": true, diff --git a/production/mempool-config.liquidtestnet.json b/production/mempool-config.liquidtestnet.json index 7c59d519d7..43bd8a4511 100644 --- a/production/mempool-config.liquidtestnet.json +++ b/production/mempool-config.liquidtestnet.json @@ -24,49 +24,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquidtestnet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3004", - "http://node202.fmt.mempool.space:3004", - "http://node203.fmt.mempool.space:3004", - "http://node204.fmt.mempool.space:3004", - "http://node205.fmt.mempool.space:3004", - "http://node206.fmt.mempool.space:3004", - "http://node201.va1.mempool.space:3004", - "http://node202.va1.mempool.space:3004", - "http://node203.va1.mempool.space:3004", - "http://node204.va1.mempool.space:3004", - "http://node205.va1.mempool.space:3004", - "http://node206.va1.mempool.space:3004", - "http://node207.va1.mempool.space:3004", - "http://node208.va1.mempool.space:3004", - "http://node209.va1.mempool.space:3004", - "http://node210.va1.mempool.space:3004", - "http://node211.va1.mempool.space:3004", - "http://node212.va1.mempool.space:3004", - "http://node213.va1.mempool.space:3004", - "http://node214.va1.mempool.space:3004", - "http://node201.fra.mempool.space:3004", - "http://node202.fra.mempool.space:3004", - "http://node203.fra.mempool.space:3004", - "http://node204.fra.mempool.space:3004", - "http://node205.fra.mempool.space:3004", - "http://node206.fra.mempool.space:3004", - "http://node207.fra.mempool.space:3004", - "http://node208.fra.mempool.space:3004", - "http://node209.fra.mempool.space:3004", - "http://node210.fra.mempool.space:3004", - "http://node211.fra.mempool.space:3004", - "http://node212.fra.mempool.space:3004", - "http://node213.fra.mempool.space:3004", - "http://node214.fra.mempool.space:3004", - "http://node201.tk7.mempool.space:3004", - "http://node202.tk7.mempool.space:3004", - "http://node203.tk7.mempool.space:3004", - "http://node204.tk7.mempool.space:3004", - "http://node205.tk7.mempool.space:3004", - "http://node206.tk7.mempool.space:3004" - ] + "UNIX_SOCKET_PATH": "/elements/socket/esplora-elements-liquidtestnet" }, "DATABASE": { "ENABLED": true, diff --git a/production/mempool-config.mainnet-lightning.json b/production/mempool-config.mainnet-lightning.json index a3b44dae87..c887b5fe00 100644 --- a/production/mempool-config.mainnet-lightning.json +++ b/production/mempool-config.mainnet-lightning.json @@ -17,49 +17,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3000", - "http://node202.fmt.mempool.space:3000", - "http://node203.fmt.mempool.space:3000", - "http://node204.fmt.mempool.space:3000", - "http://node205.fmt.mempool.space:3000", - "http://node206.fmt.mempool.space:3000", - "http://node201.va1.mempool.space:3000", - "http://node202.va1.mempool.space:3000", - "http://node203.va1.mempool.space:3000", - "http://node204.va1.mempool.space:3000", - "http://node205.va1.mempool.space:3000", - "http://node206.va1.mempool.space:3000", - "http://node207.va1.mempool.space:3000", - "http://node208.va1.mempool.space:3000", - "http://node209.va1.mempool.space:3000", - "http://node210.va1.mempool.space:3000", - "http://node211.va1.mempool.space:3000", - "http://node212.va1.mempool.space:3000", - "http://node213.va1.mempool.space:3000", - "http://node214.va1.mempool.space:3000", - "http://node201.fra.mempool.space:3000", - "http://node202.fra.mempool.space:3000", - "http://node203.fra.mempool.space:3000", - "http://node204.fra.mempool.space:3000", - "http://node205.fra.mempool.space:3000", - "http://node206.fra.mempool.space:3000", - "http://node207.fra.mempool.space:3000", - "http://node208.fra.mempool.space:3000", - "http://node209.fra.mempool.space:3000", - "http://node210.fra.mempool.space:3000", - "http://node211.fra.mempool.space:3000", - "http://node212.fra.mempool.space:3000", - "http://node213.fra.mempool.space:3000", - "http://node214.fra.mempool.space:3000", - "http://node201.tk7.mempool.space:3000", - "http://node202.tk7.mempool.space:3000", - "http://node203.tk7.mempool.space:3000", - "http://node204.tk7.mempool.space:3000", - "http://node205.tk7.mempool.space:3000", - "http://node206.tk7.mempool.space:3000" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet" }, "LIGHTNING": { "ENABLED": true, diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index a3c1e92a16..c1841b7eb2 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -39,49 +39,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3000", - "http://node202.fmt.mempool.space:3000", - "http://node203.fmt.mempool.space:3000", - "http://node204.fmt.mempool.space:3000", - "http://node205.fmt.mempool.space:3000", - "http://node206.fmt.mempool.space:3000", - "http://node201.va1.mempool.space:3000", - "http://node202.va1.mempool.space:3000", - "http://node203.va1.mempool.space:3000", - "http://node204.va1.mempool.space:3000", - "http://node205.va1.mempool.space:3000", - "http://node206.va1.mempool.space:3000", - "http://node207.va1.mempool.space:3000", - "http://node208.va1.mempool.space:3000", - "http://node209.va1.mempool.space:3000", - "http://node210.va1.mempool.space:3000", - "http://node211.va1.mempool.space:3000", - "http://node212.va1.mempool.space:3000", - "http://node213.va1.mempool.space:3000", - "http://node214.va1.mempool.space:3000", - "http://node201.fra.mempool.space:3000", - "http://node202.fra.mempool.space:3000", - "http://node203.fra.mempool.space:3000", - "http://node204.fra.mempool.space:3000", - "http://node205.fra.mempool.space:3000", - "http://node206.fra.mempool.space:3000", - "http://node207.fra.mempool.space:3000", - "http://node208.fra.mempool.space:3000", - "http://node209.fra.mempool.space:3000", - "http://node210.fra.mempool.space:3000", - "http://node211.fra.mempool.space:3000", - "http://node212.fra.mempool.space:3000", - "http://node213.fra.mempool.space:3000", - "http://node214.fra.mempool.space:3000", - "http://node201.tk7.mempool.space:3000", - "http://node202.tk7.mempool.space:3000", - "http://node203.tk7.mempool.space:3000", - "http://node204.tk7.mempool.space:3000", - "http://node205.tk7.mempool.space:3000", - "http://node206.tk7.mempool.space:3000" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-mainnet" }, "DATABASE": { "ENABLED": true, @@ -96,51 +54,9 @@ "TX_PER_SECOND_SAMPLE_PERIOD": 150 }, "REPLICATION": { - "ENABLED": true, - "AUDIT": true, - "AUDIT_START_HEIGHT": 774000, - "SERVERS": [ - "node201.fmt.mempool.space", - "node202.fmt.mempool.space", - "node203.fmt.mempool.space", - "node204.fmt.mempool.space", - "node205.fmt.mempool.space", - "node206.fmt.mempool.space", - "node201.va1.mempool.space", - "node202.va1.mempool.space", - "node203.va1.mempool.space", - "node204.va1.mempool.space", - "node205.va1.mempool.space", - "node206.va1.mempool.space", - "node207.va1.mempool.space", - "node208.va1.mempool.space", - "node209.va1.mempool.space", - "node210.va1.mempool.space", - "node211.va1.mempool.space", - "node212.va1.mempool.space", - "node213.va1.mempool.space", - "node214.va1.mempool.space", - "node201.fra.mempool.space", - "node202.fra.mempool.space", - "node203.fra.mempool.space", - "node204.fra.mempool.space", - "node205.fra.mempool.space", - "node206.fra.mempool.space", - "node207.fra.mempool.space", - "node208.fra.mempool.space", - "node209.fra.mempool.space", - "node210.fra.mempool.space", - "node211.fra.mempool.space", - "node212.fra.mempool.space", - "node213.fra.mempool.space", - "node214.fra.mempool.space", - "node201.tk7.mempool.space", - "node202.tk7.mempool.space", - "node203.tk7.mempool.space", - "node204.tk7.mempool.space", - "node205.tk7.mempool.space", - "node206.tk7.mempool.space" - ] + "ENABLED": false, + "AUDIT": false, + "AUDIT_START_HEIGHT": 774000 }, "REDIS": { "ENABLED": true, diff --git a/production/mempool-config.signet-lightning.json b/production/mempool-config.signet-lightning.json index f785e60d23..cf697f2d55 100644 --- a/production/mempool-config.signet-lightning.json +++ b/production/mempool-config.signet-lightning.json @@ -17,49 +17,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3003", - "http://node202.fmt.mempool.space:3003", - "http://node203.fmt.mempool.space:3003", - "http://node204.fmt.mempool.space:3003", - "http://node205.fmt.mempool.space:3003", - "http://node206.fmt.mempool.space:3003", - "http://node201.va1.mempool.space:3003", - "http://node202.va1.mempool.space:3003", - "http://node203.va1.mempool.space:3003", - "http://node204.va1.mempool.space:3003", - "http://node205.va1.mempool.space:3003", - "http://node206.va1.mempool.space:3003", - "http://node207.va1.mempool.space:3003", - "http://node208.va1.mempool.space:3003", - "http://node209.va1.mempool.space:3003", - "http://node210.va1.mempool.space:3003", - "http://node211.va1.mempool.space:3003", - "http://node212.va1.mempool.space:3003", - "http://node213.va1.mempool.space:3003", - "http://node214.va1.mempool.space:3003", - "http://node201.fra.mempool.space:3003", - "http://node202.fra.mempool.space:3003", - "http://node203.fra.mempool.space:3003", - "http://node204.fra.mempool.space:3003", - "http://node205.fra.mempool.space:3003", - "http://node206.fra.mempool.space:3003", - "http://node207.fra.mempool.space:3003", - "http://node208.fra.mempool.space:3003", - "http://node209.fra.mempool.space:3003", - "http://node210.fra.mempool.space:3003", - "http://node211.fra.mempool.space:3003", - "http://node212.fra.mempool.space:3003", - "http://node213.fra.mempool.space:3003", - "http://node214.fra.mempool.space:3003", - "http://node201.tk7.mempool.space:3003", - "http://node202.tk7.mempool.space:3003", - "http://node203.tk7.mempool.space:3003", - "http://node204.tk7.mempool.space:3003", - "http://node205.tk7.mempool.space:3003", - "http://node206.tk7.mempool.space:3003" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet" }, "LIGHTNING": { "ENABLED": true, diff --git a/production/mempool-config.signet.json b/production/mempool-config.signet.json index b634f91987..50a86b15ba 100644 --- a/production/mempool-config.signet.json +++ b/production/mempool-config.signet.json @@ -27,49 +27,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3003", - "http://node202.fmt.mempool.space:3003", - "http://node203.fmt.mempool.space:3003", - "http://node204.fmt.mempool.space:3003", - "http://node205.fmt.mempool.space:3003", - "http://node206.fmt.mempool.space:3003", - "http://node201.va1.mempool.space:3003", - "http://node202.va1.mempool.space:3003", - "http://node203.va1.mempool.space:3003", - "http://node204.va1.mempool.space:3003", - "http://node205.va1.mempool.space:3003", - "http://node206.va1.mempool.space:3003", - "http://node207.va1.mempool.space:3003", - "http://node208.va1.mempool.space:3003", - "http://node209.va1.mempool.space:3003", - "http://node210.va1.mempool.space:3003", - "http://node211.va1.mempool.space:3003", - "http://node212.va1.mempool.space:3003", - "http://node213.va1.mempool.space:3003", - "http://node214.va1.mempool.space:3003", - "http://node201.fra.mempool.space:3003", - "http://node202.fra.mempool.space:3003", - "http://node203.fra.mempool.space:3003", - "http://node204.fra.mempool.space:3003", - "http://node205.fra.mempool.space:3003", - "http://node206.fra.mempool.space:3003", - "http://node207.fra.mempool.space:3003", - "http://node208.fra.mempool.space:3003", - "http://node209.fra.mempool.space:3003", - "http://node210.fra.mempool.space:3003", - "http://node211.fra.mempool.space:3003", - "http://node212.fra.mempool.space:3003", - "http://node213.fra.mempool.space:3003", - "http://node214.fra.mempool.space:3003", - "http://node201.tk7.mempool.space:3003", - "http://node202.tk7.mempool.space:3003", - "http://node203.tk7.mempool.space:3003", - "http://node204.tk7.mempool.space:3003", - "http://node205.tk7.mempool.space:3003", - "http://node206.tk7.mempool.space:3003" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-signet" }, "DATABASE": { "ENABLED": true, diff --git a/production/mempool-config.testnet-lightning.json b/production/mempool-config.testnet-lightning.json index 1a7d0ad89c..cb8d6e6393 100644 --- a/production/mempool-config.testnet-lightning.json +++ b/production/mempool-config.testnet-lightning.json @@ -17,49 +17,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3002", - "http://node202.fmt.mempool.space:3002", - "http://node203.fmt.mempool.space:3002", - "http://node204.fmt.mempool.space:3002", - "http://node205.fmt.mempool.space:3002", - "http://node206.fmt.mempool.space:3002", - "http://node201.va1.mempool.space:3002", - "http://node202.va1.mempool.space:3002", - "http://node203.va1.mempool.space:3002", - "http://node204.va1.mempool.space:3002", - "http://node205.va1.mempool.space:3002", - "http://node206.va1.mempool.space:3002", - "http://node207.va1.mempool.space:3002", - "http://node208.va1.mempool.space:3002", - "http://node209.va1.mempool.space:3002", - "http://node210.va1.mempool.space:3002", - "http://node211.va1.mempool.space:3002", - "http://node212.va1.mempool.space:3002", - "http://node213.va1.mempool.space:3002", - "http://node214.va1.mempool.space:3002", - "http://node201.fra.mempool.space:3002", - "http://node202.fra.mempool.space:3002", - "http://node203.fra.mempool.space:3002", - "http://node204.fra.mempool.space:3002", - "http://node205.fra.mempool.space:3002", - "http://node206.fra.mempool.space:3002", - "http://node207.fra.mempool.space:3002", - "http://node208.fra.mempool.space:3002", - "http://node209.fra.mempool.space:3002", - "http://node210.fra.mempool.space:3002", - "http://node211.fra.mempool.space:3002", - "http://node212.fra.mempool.space:3002", - "http://node213.fra.mempool.space:3002", - "http://node214.fra.mempool.space:3002", - "http://node201.tk7.mempool.space:3002", - "http://node202.tk7.mempool.space:3002", - "http://node203.tk7.mempool.space:3002", - "http://node204.tk7.mempool.space:3002", - "http://node205.tk7.mempool.space:3002", - "http://node206.tk7.mempool.space:3002" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet" }, "LIGHTNING": { "ENABLED": true, diff --git a/production/mempool-config.testnet.json b/production/mempool-config.testnet.json index d406105433..3c3db4589b 100644 --- a/production/mempool-config.testnet.json +++ b/production/mempool-config.testnet.json @@ -27,49 +27,7 @@ "PASSWORD": "__BITCOIN_RPC_PASS__" }, "ESPLORA": { - "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet", - "FALLBACK": [ - "http://node201.fmt.mempool.space:3002", - "http://node202.fmt.mempool.space:3002", - "http://node203.fmt.mempool.space:3002", - "http://node204.fmt.mempool.space:3002", - "http://node205.fmt.mempool.space:3002", - "http://node206.fmt.mempool.space:3002", - "http://node201.va1.mempool.space:3002", - "http://node202.va1.mempool.space:3002", - "http://node203.va1.mempool.space:3002", - "http://node204.va1.mempool.space:3002", - "http://node205.va1.mempool.space:3002", - "http://node206.va1.mempool.space:3002", - "http://node207.va1.mempool.space:3002", - "http://node208.va1.mempool.space:3002", - "http://node209.va1.mempool.space:3002", - "http://node210.va1.mempool.space:3002", - "http://node211.va1.mempool.space:3002", - "http://node212.va1.mempool.space:3002", - "http://node213.va1.mempool.space:3002", - "http://node214.va1.mempool.space:3002", - "http://node201.fra.mempool.space:3002", - "http://node202.fra.mempool.space:3002", - "http://node203.fra.mempool.space:3002", - "http://node204.fra.mempool.space:3002", - "http://node205.fra.mempool.space:3002", - "http://node206.fra.mempool.space:3002", - "http://node207.fra.mempool.space:3002", - "http://node208.fra.mempool.space:3002", - "http://node209.fra.mempool.space:3002", - "http://node210.fra.mempool.space:3002", - "http://node211.fra.mempool.space:3002", - "http://node212.fra.mempool.space:3002", - "http://node213.fra.mempool.space:3002", - "http://node214.fra.mempool.space:3002", - "http://node201.tk7.mempool.space:3002", - "http://node202.tk7.mempool.space:3002", - "http://node203.tk7.mempool.space:3002", - "http://node204.tk7.mempool.space:3002", - "http://node205.tk7.mempool.space:3002", - "http://node206.tk7.mempool.space:3002" - ] + "UNIX_SOCKET_PATH": "/bitcoin/socket/esplora-bitcoin-testnet" }, "DATABASE": { "ENABLED": true, From bb207e84ca9a4bcdaf6ffda0ae12578aa087c367 Mon Sep 17 00:00:00 2001 From: runbtc <143069848+runbtc@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:48:24 -0800 Subject: [PATCH 20/20] Remove Keybase notification --- production/mempool-build-all | 4 ---- 1 file changed, 4 deletions(-) diff --git a/production/mempool-build-all b/production/mempool-build-all index ae05112e8f..47eb267fe9 100755 --- a/production/mempool-build-all +++ b/production/mempool-build-all @@ -187,8 +187,4 @@ for target in mainnet liquid bisq;do ship_frontend "${target}" done -# notify everyone -echo "${HOSTNAME} updated to \`${REF}\` @ \`${HASH}\`" | /usr/local/bin/keybase chat send --nonblock --channel general mempool.dev -echo "${HOSTNAME} updated to \`${REF}\` @ \`${HASH}\`" | /usr/local/bin/keybase chat send --nonblock --channel general "mempool.ops.${LOCATION}" - exit 0