Bring main onto the line this project actually ships

main had drifted to a history with no ancestor in common with the tree we
build and deploy. It sat at be63e83 (2026-08-09) with 28 commits; the shipped
line, deploy/soak-2026-08-21, had 383. The two shared nothing -- git
merge-base returns no result at all -- so anyone cloning this repository
landed on a default branch that was neither current nor related to the
running node.

The 28 commits on main were audited before this merge: every one is already
present in the tree by content, including the two that are hardest to see
because they were rewritten afterwards -- the payout reorg-safety work
(PayoutBlockStillOnChain, since evolved to re-check on every retry rather
than once at maturity) and the nostr relay certificate verification
(SSL_set1_host, now with a Windows root-store path). Nothing on main is lost
by this merge.

Recorded as a merge rather than a force-push: main only ever moves forward,
its old history stays reachable as the first parent, and this is revertible.
The tree is taken wholesale from the merged branch, so main's content is now
exactly what was built and tested.

What this brings onto main:

- compactblock: BIP152-style compact block relay ported from upstream 1.2.23,
  primitives and unit test only, with the RAND_bytes failure path closed and
  the reconstruction allocation bounded.
- upstream/main 17741d9: isolated testnet parameters and genesis, optional
  2 MB large pages for RandomX. Mainnet genesis verified byte-identical
  through upstream's BuildGenesisBlock() refactor.
- deploy: every image built on bookworm so binaries run on Debian 12, and the
  container build now honours the RandomX and libsecp256k1 pins it had been
  silently ignoring since before 1.2.15.

Gates at this tree: 15/15 selftests, compactblock's 17 checks, consensus
constants unchanged against e4f898c apart from the pre-existing
MAX_BLOCK_SIZE_GEN, mainnet genesis intact, money-log check ok.

1 files changed, 38 insertions, 0 deletions

diff --git a/scripts/check-money-log-lines.sh b/scripts/check-money-log-lines.sh
new file mode 100755
index 0000000..c9f348b
--- /dev/null
+++ b/scripts/check-money-log-lines.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Money-moving payout lines must print every time they fire: they are the
+# audit trail for obligations created, moved and destroyed, and LogPrint's
+# burst collapse can stand one line in for any number of events inside one
+# 3-second window (issue #3: 100 voids totalling 4,950 BTF read as one
+# 49.49 BTF line). Every line carrying one of the phrases below must use
+# LogPrintAlways, which keeps the category gate but skips the collapse.
+#
+# Adding a payout line that reports money moving? Use LogPrintAlways and
+# add its phrase here. A phrase found in a plain LogPrint call fails this
+# check; anything else passes, so a non-money line is never held up by it.
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+phrases='was orphaned -- voiding|orphaned while queued|\[payout\] paid %s to %s|FAILED to pay|writing off|SKIPPED bad address'
+
+# Call sites span several lines; flatten each call to a single line first so
+# the phrase and the macro it belongs to are matched together. Only a line
+# whose first token is the macro starts a call, so comments mentioning
+# LogPrint are never mistaken for one.
+bad=$(awk '
+    /^[ \t]*LogPrint(Always)?[(]/ {
+        if (collecting) print buf
+        buf = $0; collecting = 1; next
+    }
+    collecting {
+        buf = buf $0
+        if (/;[ \t]*$/) { print buf; collecting = 0 }
+    }
+    END { if (collecting) print buf }
+' src/rpc.cpp | grep -E '^[[:space:]]*LogPrint[(]' | grep -E "$phrases" || true)
+
+if [ -n "$bad" ]; then
+    echo "error: money-moving payout line(s) on collapsing LogPrint:" >&2
+    echo "$bad" >&2
+    exit 1
+fi
+echo "ok: every money-moving payout line in src/rpc.cpp uses LogPrintAlways"