From 140bf890ba2c688feefba14ab22ee6a70caaa059 Mon Sep 17 00:00:00 2001
From: PortlandHODL <admin@qrsnap.io>
Date: Mon, 14 Apr 2025 03:34:44 +0000
Subject: [PATCH 1/5] [Fix] CKSolo Install + GUI

---
 production/install | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/production/install b/production/install
index d243b45f4..6019b815b 100755
--- a/production/install
+++ b/production/install
@@ -43,8 +43,8 @@ CLN_INSTALL=ON
 # install UNFURL
 UNFURL_INSTALL=ON
 
-# install CKPOOL
-CKPOOL_MAINNET_INSTALL=ON
+# install CKPool
+CKPOOL_INSTALL=ON
 
 # configure 4 network instances
 BITCOIN_MAINNET_ENABLE=ON
@@ -59,11 +59,6 @@ BISQ_MAINNET_ENABLE=ON
 ELEMENTS_LIQUID_ENABLE=ON
 ELEMENTS_LIQUIDTESTNET_ENABLE=ON
 
-# configure 3 CKPool instances
-BITCOIN_MAINNET_CKPOOL=ON
-BITCOIN_TESTNET_CKPOOL=ON
-BITCOIN_TESTNET4_CKPOOL=ON
-
 # enable lightmode and disable compaction to fit on 1TB SSD drive
 BITCOIN_ELECTRS_INSTALL=ON
 BITCOIN_ELECTRS_LIGHT_MODE=ON
@@ -392,7 +387,7 @@ BISQ_REPO_BRANCH=master
 BISQ_LATEST_RELEASE=master
 echo -n '.'
 
-CKPOOL_URL=https://github.com/mempool/ckpool
+CKPOOL_REPO_URL=https://github.com/mempool/ckpool
 CKPOOL_REPO_NAME=ckpool
 CKPOOL_REPO_BRANCH=master
 CKPOOL_LATEST_RELEASE=$(curl -s https://api.github.com/repos/mempool/ckpool/releases/latest|grep tag_name|head -1|cut -d '"' -f4)
@@ -434,7 +429,7 @@ LIQUIDTESTNET_ASSET_REGISTRY_DB_NAME=asset_registry_testnet_db
 # packages needed for mempool ecosystem
 DEBIAN_PKG=()
 DEBIAN_PKG+=(zsh vim curl screen openssl python3 dialog cron)
-DEBIAN_PKG+=(build-essential git git-lfs clang cmake jq)
+DEBIAN_PKG+=(build-essential git clang cmake jq)
 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)
@@ -447,11 +442,10 @@ DEBIAN_UNFURL_PKG+=(libxdamage-dev libxrandr-dev libgbm-dev libpango1.0-dev liba
 
 # packages needed for mempool ecosystem
 FREEBSD_PKG=()
-FREEBSD_PKG+=(zsh sudo git git-lfs screen curl wget calc neovim)
+FREEBSD_PKG+=(zsh sudo git screen curl wget calc neovim)
 FREEBSD_PKG+=(openssh-portable py311-pip rust llvm17 jq base64 libzmq4)
 FREEBSD_PKG+=(boost-libs autoconf automake gmake gcc13 libevent libtool pkgconf)
 FREEBSD_PKG+=(nginx rsync py311-certbot-nginx mariadb1011-server)
-FREEBSD_PKG+=(geoipupdate redis)
 FREEBSD_PKG+=(libepoll-shim)
 
 FREEBSD_UNFURL_PKG=()
@@ -856,6 +850,7 @@ returncode=0
 
 $CUT >$input <<-EOF
 Tor:Enable Tor v3 HS Onion:ON
+KPool:Enable CKPool Stratum Interface:ON
 Mainnet:Enable Bitcoin Mainnet:ON
 Mainnet-Minfee:Enable Bitcoin Mainnet Minfee:ON
 LN-Mainnet:Enable Bitcoin Mainnet Lightning:ON
@@ -894,6 +889,12 @@ else
     TOR_INSTALL=OFF
 fi
 
+if grep CKPool $tempfile >/dev/null 2>&1;then
+    CKPOOL_INSTALL=ON
+else
+    CKPOOL_INSTALL=OFF
+fi
+
 if grep Mainnet $tempfile >/dev/null 2>&1;then
     BITCOIN_MAINNET_ENABLE=ON
 else
@@ -1304,7 +1305,7 @@ if [ "${CKPOOL_INSTALL}" = ON ]; then
 
     echo "[*] Building CKPool from source repo"
     osSudo "${CKPOOL_USER}" sh -c "cd ${CKPOOL_REPO_NAME} && ./autogen.sh --quiet"
-    osSudo "${CKPOOL_USER}" sh -c "cd ${CKPOOL_REPO_NAME} && ./configure CFLAGS='-O3 -march=native -flto -Wall -I/usr/local/include/libepoll-shim' LDFLAGS='-L/usr/local/lib -lepoll-shim -lpthread'"
+    osSudo "${CKPOOL_USER}" sh -c "cd ${CKPOOL_REPO_NAME} && ./configure CFLAGS=\"-g3 -O0 -fno-inline -fno-omit-frame-pointer -fno-eliminate-unused-debug-types -fno-eliminate-unused-debug-symbols -Wall -I/usr/local/include/libepoll-shim\" LDFLAGS=\"-L/usr/local/lib -lepoll-shim -lpthread\""
     osSudo "${CKPOOL_USER}" sh -c "cd ${CKPOOL_REPO_NAME} && gmake -j${NPROC}"
 
     echo "[*] Copy CKPool binarary into OS"
@@ -1312,15 +1313,15 @@ if [ "${CKPOOL_INSTALL}" = ON ]; then
 
     TEMP_CRON_FILE="tmp_cron"
 
-    if [ "${BITCOIN_MAINNET_CKPOOL}" = ON ]; then
+    if [ "${BITCOIN_MAINNET_ENABLE}" = ON ]; then
         install_ckpool_cron "mainnet" "Mainnet" "bitcoin" 2333
     fi
 
-    if [ "${BITCOIN_TESTNET_CKPOOL}" = ON ]; then
+    if [ "${BITCOIN_TESTNET_ENABLE}" = ON ]; then
         install_ckpool_cron "testnet" "Testnet" "testnet" 2334
     fi
 
-    if [ "${BITCOIN_TESTNET4_CKPOOL}" = ON ]; then
+    if [ "${BITCOIN_TESTNET4_ENABLE}" = ON ]; then
         install_ckpool_cron "testnet4" "Testnet4" "testnet4" 2335
     fi
 fi

From 03e9069bc0d2b37735dca1eb2aad8462d169944e Mon Sep 17 00:00:00 2001
From: PortlandHODL <git@qrsnap.io>
Date: Mon, 14 Apr 2025 04:25:35 +0000
Subject: [PATCH 2/5] [Ft.] Wildcard Cargo sysconf crate dir

---
 production/install | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/production/install b/production/install
index 6019b815b..2c31d9f30 100755
--- a/production/install
+++ b/production/install
@@ -850,7 +850,7 @@ returncode=0
 
 $CUT >$input <<-EOF
 Tor:Enable Tor v3 HS Onion:ON
-KPool:Enable CKPool Stratum Interface:ON
+CKPool:Enable CKPool Stratum Interface:ON
 Mainnet:Enable Bitcoin Mainnet:ON
 Mainnet-Minfee:Enable Bitcoin Mainnet Minfee:ON
 LN-Mainnet:Enable Bitcoin Mainnet Lightning:ON
@@ -1415,11 +1415,14 @@ if [ "${BITCOIN_ELECTRS_INSTALL}" = ON ];then
     osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && cargo run --release --bin electrs -- --version" || true
 
     case $OS in
-        FreeBSD)
-            echo "[*] Patching Bitcoin Electrs code for FreeBSD"
-            osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_HOME}/.cargo/registry/src/index.crates.io-6f17d22bba15001f/sysconf-0.3.4\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\""
-            #osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_ELECTRS_HOME}/src/new_index/\" && sed -i.bak -e s/Snappy/None/ db.rs && rm db.rs.bak"
-            #osSudo "${BITCOIN_USER}" sh -c "cd \"${BITCOIN_ELECTRS_HOME}/src/bin/\" && sed -i.bak -e 's/from_secs(5)/from_secs(1)/' electrs.rs && rm electrs.rs.bak"
+        FreeBSD*)
+        echo "[*] Patching Bitcoin Electrs code for FreeBSD"
+        SYSCONF_DIR=$(find "${BITCOIN_HOME}/.cargo/registry/src" -type d -name "sysconf-0.3.4" | head -n 1)
+        if [ -n "$SYSCONF_DIR" ]; then
+        osSudo "${BITCOIN_USER}" sh -c "cd \"$SYSCONF_DIR\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\""
+        else
+        echo "Warning: Could not find sysconf-0.3.4 directory"
+        fi
         ;;
         Debian)
         ;;

From f34b2fc4bd569637dfa25b06615774d24e818ac6 Mon Sep 17 00:00:00 2001
From: PortlandHODL <git@qrsnap.io>
Date: Tue, 15 Apr 2025 03:09:22 +0000
Subject: [PATCH 3/5] [Reqs] Reintroduce Redis to Freebsd | Whitespace fixes.

---
 production/install | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/production/install b/production/install
index 2c31d9f30..bd1e915fe 100755
--- a/production/install
+++ b/production/install
@@ -446,6 +446,7 @@ FREEBSD_PKG+=(zsh sudo git screen curl wget calc neovim)
 FREEBSD_PKG+=(openssh-portable py311-pip rust llvm17 jq base64 libzmq4)
 FREEBSD_PKG+=(boost-libs autoconf automake gmake gcc13 libevent libtool pkgconf)
 FREEBSD_PKG+=(nginx rsync py311-certbot-nginx mariadb1011-server)
+FREEBSD_PKG+=(redis)
 FREEBSD_PKG+=(libepoll-shim)
 
 FREEBSD_UNFURL_PKG=()
@@ -1416,13 +1417,13 @@ if [ "${BITCOIN_ELECTRS_INSTALL}" = ON ];then
 
     case $OS in
         FreeBSD*)
-        echo "[*] Patching Bitcoin Electrs code for FreeBSD"
-        SYSCONF_DIR=$(find "${BITCOIN_HOME}/.cargo/registry/src" -type d -name "sysconf-0.3.4" | head -n 1)
-        if [ -n "$SYSCONF_DIR" ]; then
-        osSudo "${BITCOIN_USER}" sh -c "cd \"$SYSCONF_DIR\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\""
-        else
-        echo "Warning: Could not find sysconf-0.3.4 directory"
-        fi
+            echo "[*] Patching Bitcoin Electrs code for FreeBSD"
+            SYSCONF_DIR=$(find "${BITCOIN_HOME}/.cargo/registry/src" -type d -name "sysconf-0.3.4" | head -n 1)
+            if [ -n "$SYSCONF_DIR" ]; then
+                osSudo "${BITCOIN_USER}" sh -c "cd \"$SYSCONF_DIR\" && patch -p1 < \"${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/freebsd/sysconf.patch\""
+            else
+                echo "Warning: Could not find sysconf-0.3.4 directory"
+            fi
         ;;
         Debian)
         ;;
@@ -1453,7 +1454,7 @@ if [ "${ELEMENTS_ELECTRS_INSTALL}" = ON ];then
     osSudo "${ELEMENTS_USER}" git config --global advice.detachedHead false
     osSudo "${ELEMENTS_USER}" git clone --branch "${ELEMENTS_ELECTRS_REPO_BRANCH}" "${ELEMENTS_ELECTRS_REPO_URL}" "${ELEMENTS_HOME}/${ELEMENTS_ELECTRS_REPO_NAME}"
 
-    echo "[*] Checking out Liquid Electrs ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
+    echo "[*] Checking out LiquiFREEBSD_PKG+=(redis)d Electrs ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
     osSudo "${ELEMENTS_USER}" sh -c "cd ${ELEMENTS_HOME}/${ELEMENTS_ELECTRS_REPO_NAME} && git checkout ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
 
     echo "[*] Cloning Liquid Asset Registry repo from ${LIQUID_ASSET_REGISTRY_DB_URL}"

From 71ddb38d37d2d4bec4431de3a86af2a42d9c16c4 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 15 Apr 2025 15:57:36 +0900
Subject: [PATCH 4/5] ops: Use master for ckpool installation

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index bd1e915fe..3817f6111 100755
--- a/production/install
+++ b/production/install
@@ -390,7 +390,7 @@ echo -n '.'
 CKPOOL_REPO_URL=https://github.com/mempool/ckpool
 CKPOOL_REPO_NAME=ckpool
 CKPOOL_REPO_BRANCH=master
-CKPOOL_LATEST_RELEASE=$(curl -s https://api.github.com/repos/mempool/ckpool/releases/latest|grep tag_name|head -1|cut -d '"' -f4)
+CKPOOL_LATEST_RELEASE=master
 echo -n '.'
 
 UNFURL_REPO_URL=https://github.com/mempool/mempool

From 010011dd0e481472912d1fefd3181960bf22ec97 Mon Sep 17 00:00:00 2001
From: wiz <j@wiz.biz>
Date: Tue, 15 Apr 2025 15:57:47 +0900
Subject: [PATCH 5/5] Fix mis-paste typo in install script

---
 production/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/production/install b/production/install
index 3817f6111..4a1c1672b 100755
--- a/production/install
+++ b/production/install
@@ -1454,7 +1454,7 @@ if [ "${ELEMENTS_ELECTRS_INSTALL}" = ON ];then
     osSudo "${ELEMENTS_USER}" git config --global advice.detachedHead false
     osSudo "${ELEMENTS_USER}" git clone --branch "${ELEMENTS_ELECTRS_REPO_BRANCH}" "${ELEMENTS_ELECTRS_REPO_URL}" "${ELEMENTS_HOME}/${ELEMENTS_ELECTRS_REPO_NAME}"
 
-    echo "[*] Checking out LiquiFREEBSD_PKG+=(redis)d Electrs ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
+    echo "[*] Checking out Liquid Electrs ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
     osSudo "${ELEMENTS_USER}" sh -c "cd ${ELEMENTS_HOME}/${ELEMENTS_ELECTRS_REPO_NAME} && git checkout ${ELEMENTS_ELECTRS_LATEST_RELEASE}"
 
     echo "[*] Cloning Liquid Asset Registry repo from ${LIQUID_ASSET_REGISTRY_DB_URL}"