diff options
| author | bitflash-maintainer <noreply@bitflash.invalid> | 2026-08-26 22:41:53 +0000 |
|---|---|---|
| committer | bitflash-maintainer <noreply@bitflash.invalid> | 2026-08-26 22:41:53 +0000 |
| commit | bbe04dc8c96b4c4766d2771d3438233bf82687c0 (patch) | |
| tree | 62e5a1febfb8e9bc38d133ac7981e9ef93918484 /Makefile | |
| parent | 991853fa55a749d28d6f9e507ce72b289df92785 (diff) | |
| parent | 9e39a50d1f110020b0841d31e4b931aa877cc448 (diff) | |
Merge upstream v1.2.19 into the fork
Merges upstream tag v1.2.19 (9e39a50) into merge/upstream-1.2.18 (991853f).
Unlike the 1.2.15->1.2.18 replay, bc3de30 is a true ancestor of our branch via
a9b4f89, so this is an ordinary three-way merge with merge-base bc3de30.
Delta: 36 files, +3265/-163, the Tor onion transport (managed Tor, signed
direct onion endpoints, onion-only dial mode) and the nHDNext restore fix.
src/main.cpp, main.h, script.cpp/h and db.cpp/h are byte-identical between the
two tags, and the poll() socket loop carries no diff hunks, so the merge is
consensus-neutral and the soak-tested socket paths are unchanged. relay/ is
untouched; the payout ledger (rpc.cpp) is untouched.
7 conflict blocks in 6 files, resolved as follows.
Makefile -- VERSION. Ours: stays 1.2.19+sec with the naming comment updated,
so artifacts from this tree cannot be mistaken for the upstream release.
src/Makefile, src/makefile.mingw -- HEADERS list. Ours (no market.h) plus
their tor.h. NODE_OBJS auto-merged correctly: no market.o, tor.o present.
src/selftest.cpp -- known-tests list. Union: payout-ledger (ours) and
managed-tor (theirs).
src/main_gui.cpp -- one block. Our /dumpaddresses kept; their
BtfStopManagedTor() on the StartNode failure path taken. The /rvrelay pin,
/noannounce and the marketplace removal auto-merged and were verified intact.
src/nostr.cpp -- two blocks in ResolveDescriptor. Signature takes both
out-params (our fExchangeOk, their rawOut). The body keeps our
drain-to-EOSE read -- returning early poisons the pooled socket for the next
caller -- and adds their rawOut capture. Our TLS 1.2 floor
(SSL_CTX_set_min_proto_version) is untouched by this merge; upstream 1.2.19
still has no floor of its own.
Upstream's release commit also added four build logs and a compiled Python
cache (build-1219.log, build-17.log, build-appimage.log, build-node.log,
scripts/__pycache__/bitflash_chain.cpython-313.pyc). Removed here; they are
build output, not source.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
| @@ -2,6 +2,7 @@ | |||
| 2 | # | 2 | # |
| 3 | # make linux build Bitflash-*-x86_64.AppImage | 3 | # make linux build Bitflash-*-x86_64.AppImage |
| 4 | # make windows build Bitflash-*-windows.zip (from MSYS2 UCRT64) | 4 | # make windows build Bitflash-*-windows.zip (from MSYS2 UCRT64) |
| 5 | # make windows-tor build Bitflash-*-windows-with-tor.zip | ||
| 5 | # make tests build and run standalone unit tests | 6 | # make tests build and run standalone unit tests |
| 6 | # make checksums create SHA256SUMS for release assets | 7 | # make checksums create SHA256SUMS for release assets |
| 7 | # make verify-release TAG=v1.2.13 | 8 | # make verify-release TAG=v1.2.13 |
| @@ -10,10 +11,10 @@ | |||
| 10 | ROOT := $(shell pwd) | 11 | ROOT := $(shell pwd) |
| 11 | NPROC := $(shell nproc 2>/dev/null || echo 2) | 12 | NPROC := $(shell nproc 2>/dev/null || echo 2) |
| 12 | SUDO := $(shell [ "$$(id -u)" = "0" ] && echo "" || echo "sudo") | 13 | SUDO := $(shell [ "$$(id -u)" = "0" ] && echo "" || echo "sudo") |
| 13 | # Not "1.2.18". This tree is upstream v1.2.18 plus 24 commits of our own and a | 14 | # Not "1.2.19". This tree is upstream v1.2.19 plus our own hardening commits and |
| 14 | # hand-merged payout ledger, so a binary built here must not be mistakable for | 15 | # a hand-merged payout ledger, so a binary built here must not be mistakable for |
| 15 | # the upstream release of that number -- it names every release artifact. | 16 | # the upstream release of that number -- it names every release artifact. |
| 16 | VERSION := 1.2.18+sec | 17 | VERSION := 1.2.19+sec |
| 17 | 18 | ||
| 18 | # ---- Pinned third-party sources ------------------------------------------- | 19 | # ---- Pinned third-party sources ------------------------------------------- |
| 19 | # | 20 | # |
| @@ -239,6 +240,9 @@ windows: deps-windows | |||
| 239 | @zip -r Bitflash-$(VERSION)-windows.zip Bitflash-$(VERSION)-windows/ | 240 | @zip -r Bitflash-$(VERSION)-windows.zip Bitflash-$(VERSION)-windows/ |
| 240 | @echo "Built: Bitflash-$(VERSION)-windows.zip" | 241 | @echo "Built: Bitflash-$(VERSION)-windows.zip" |
| 241 | 242 | ||
| 243 | windows-tor: windows | ||
| 244 | ./scripts/package-windows-tor.sh | ||
| 245 | |||
| 242 | # ---- Clean ---------------------------------------------------------------- | 246 | # ---- Clean ---------------------------------------------------------------- |
| 243 | 247 | ||
| 244 | clean: | 248 | clean: |
| @@ -265,6 +269,6 @@ sign-checksums: | |||
| 265 | verify-release: | 269 | verify-release: |
| 266 | ./scripts/verify-release.sh $(if $(TAG),$(TAG),latest) | 270 | ./scripts/verify-release.sh $(if $(TAG),$(TAG),latest) |
| 267 | 271 | ||
| 268 | .PHONY: linux windows clean appimage \ | 272 | .PHONY: linux windows windows-tor clean appimage \ |
| 269 | tests fuzz-net-message-smoke fuzz-script-smoke checksums sign-checksums verify-release \ | 273 | tests fuzz-net-message-smoke fuzz-script-smoke checksums sign-checksums verify-release \ |
| 270 | deps-linux deps-windows deps-apt deps-secp256k1 deps-randomx | 274 | deps-linux deps-windows deps-apt deps-secp256k1 deps-randomx |