upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorbitflash-maintainer <noreply@bitflash.invalid>2026-09-05 22:46:52 +0000
committerbitflash-maintainer <noreply@bitflash.invalid>2026-09-05 22:46:52 +0000
commitceae3d076b5ad11ee84729ae43f14e9312896646 (patch)
tree7e9132aa871fdc01cb95268d2f5ea3bb11853ddf /.gitignore
parentbe63e83d79e7e00e6b8ca889a70e6a19886aa1d8 (diff)
parent66e0b9158d050c46b1ff2509faeee3f4573cac1c (diff)
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.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 111f7ba..77b1660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ src/obj/
6*.dll 6*.dll
7bitflash-node 7bitflash-node
8src/bitflash-node 8src/bitflash-node
9src/obj-node/
10src/test_bip32
11src/test_compactblock
9 12
10# Release artefacts (produced by 'make windows' / 'make linux') 13# Release artefacts (produced by 'make windows' / 'make linux')
11Bitflash-*-windows/ 14Bitflash-*-windows/
@@ -18,11 +21,16 @@ SHA256SUMS.asc
18# Runtime data / logs 21# Runtime data / logs
19debug.log 22debug.log
20db.log 23db.log
24build-*.log
21*.dat 25*.dat
22wallet.dat 26wallet.dat
23nostr.key 27nostr.key
24btf_enc.key 28btf_enc.key
25 29
30# Python cache (upstream's release commit accidentally shipped one)
31__pycache__/
32*.pyc
33
26# Third-party build trees (rebuilt by the build scripts) 34# Third-party build trees (rebuilt by the build scripts)
27RandomX/ 35RandomX/
28deps/ 36deps/