From cb5a4205a7e35da5d458a030c6c9f159ed9481dd Mon Sep 17 00:00:00 2001
From: BitcoinMechanic <45926711+BitcoinMechanic@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:13:29 -0800
Subject: [PATCH] merge upstream fix (#5)

* merge upstream fix

* update instructions

* change vocab around non-pooled mining

* tweak instructions
---
 Dockerfile      |  2 +-
 INSTRUCTIONS.md | 20 ++++++++++++++------
 datum_gateway   |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d80c1c9..2682ad9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:bookworm-slim AS build
 
 RUN apt update && \
     apt-get install -y build-essential cmake curl libmicrohttpd-dev libjansson-dev \
-                       libcurl4-openssl-dev libpq-dev libgcrypt20-dev libsodium-dev \
+                       libcurl4-openssl-dev libgcrypt20-dev libsodium-dev \
                        netcat-traditional pkg-config git
 
 ARG ARCH
diff --git a/INSTRUCTIONS.md b/INSTRUCTIONS.md
index 1410d88..95fbbd1 100644
--- a/INSTRUCTIONS.md
+++ b/INSTRUCTIONS.md
@@ -25,7 +25,7 @@ If you do not, you should wait for StartOS v0.3.6.
 
 Datum-Gateway is for solo mining!
 
-You can Lottery Mine where you pay yourself the entire block reward for any blocks your find.
+You can pay yourself the entire block reward for any blocks your find (non-pooled mining).
 
 You can also Pool Mine on a pool that supports DATUM where you will split rewards with other miners for increased cash flow.
 
@@ -39,7 +39,7 @@ By default, rewards from mining on OCEAN will go to Bitcoin addresses written in
 
 **If you have mined on OCEAN before and wish to use Datum-Gateway now, you can leave the Bitcoin addresses in your miners, they will override what is written in Datum's config - just leave "Pool Pass Full Users" enabled.**
 
-(You will still need to enter a valid Bitcoin address into your Datum-Gateway config. This is simply a fail-safe should the pool go down and it will be where your rewards go if you successfully Lottery Mine a block. Datum-Gateway will not start without a valid Bitcoin address configured.)
+(You will still need to enter a valid Bitcoin address into your Datum-Gateway config. This is simply a fail-safe should the pool go down and it will be where your rewards go if you successfully mine a block. Datum-Gateway will not start without a valid Bitcoin address configured.)
 
 If you chose to write only worker names in your miners and omit Bitcoin address(es) then you must disable **"Pool Pass Full Users"** and then the Bitcoin address in your Datum-Gateway config will be what gets used on OCEAN. Choose this option if you would like to just have worker names in your miners rather than Bitcoin addresses with worker names appended. See the next section for more details on setting up your miners.
 
@@ -75,13 +75,21 @@ etc
 
 **Password** can be left blank. If your miner insists on having something written there, you can write "x" or whatever you'd like.
 
-# Lottery Mining
+# Non-Pooled Mining
 
-To lottery mine with Datum-Gateway, simply remove the text from **Datum Pool Host** in your config. 
+**Note: This means no rewards unless you find blocks. Make sure you're familiar with the differences to Pooled Mining.**
 
-With default settings, you will Pool Mine on OCEAN and automatically switch to Lottery Mining if the pool were to ever go offline. If you wish to disable this, disable **Pooled Mining Only ** in your config.
+To do this with Datum-Gateway, simply remove the text from **Datum Pool Host** in your config and disable **"Pooled Mining Only"**. 
 
-**Note: Lottery Mining means no rewards unless you find blocks. Make sure you're familiar with the differences to Pooled Mining.**
+With this setup, you will keep all rewards from any blocks you find and they will be paid out to the address in **"Pool Address"**.
+
+# Failovers
+
+With default settings, you will pool-mine on OCEAN with no failover. If your connection to the pool fails, DATUM will stop and your miners will switch to mining on any backup pool they are configured to use.
+
+If you wish to failover to non-pool mining, simply disable **"Pool Mining Only"**.
+
+If you wish to intentionally non-pool mine that requires removing the text in **Datum Pool Host** as in the prior section.
 
 # Installing and Running simpleproxy
 
diff --git a/datum_gateway b/datum_gateway
index 665aa78..2f7f2b5 160000
--- a/datum_gateway
+++ b/datum_gateway
@@ -1 +1 @@
-Subproject commit 665aa787950260ae5054ae562783186f0b165f67
+Subproject commit 2f7f2b5bde5b2eaf42827ffb9f5134bd87c46476