Skip to content

Forward port setup commits to 27.x#54

Merged
ajtowns merged 9 commits intobitcoin-inquisition:27.xfrom
ajtowns:202404-inq27-setup
May 7, 2024
Merged

Forward port setup commits to 27.x#54
ajtowns merged 9 commits intobitcoin-inquisition:27.xfrom
ajtowns:202404-inq27-setup

Conversation

@ajtowns
Copy link

@ajtowns ajtowns commented Apr 30, 2024

Forward port of #36 (inquisition branding), #31, #46, #47 (disable mainnet/testnet, bury taproot, heretical deployments with binana ids).

@ajtowns ajtowns force-pushed the 202404-inq27-setup branch from 60c8f0a to 4229415 Compare April 30, 2024 02:54
@ajtowns ajtowns added this to the 27.x milestone Apr 30, 2024
@ajtowns ajtowns force-pushed the 202404-inq27-setup branch 11 times, most recently from d74f1ae to b77fc20 Compare May 6, 2024 22:03
ajtowns added 9 commits May 7, 2024 09:23
Now defaults to adding "inquisition" as a uacomment, unless the user
specifies their own uacomment. Use -nouacomment to disable.
To avoid the risk of bugs in new consensus code causing potential
chain splits or loss of funds, we disable use of this branch on mainnet
or testnet.  Use with either regtest or signet remains supported.
Co-Author: MarcoFalke <falke.marco@gmail.com>
After we replace versionbits with heretical deployments, these will not
make sense.
@ajtowns ajtowns force-pushed the 202404-inq27-setup branch from b77fc20 to a1df560 Compare May 6, 2024 23:23
@ajtowns ajtowns merged commit d55b138 into bitcoin-inquisition:27.x May 7, 2024
arminsabouri pushed a commit to arminsabouri/bitcoin that referenced this pull request Nov 30, 2025
efb8ea04e4 Merge bitcoin-core/crc32c-subtree#8: Sync to upstream
4a7a05c48d Merge remote-tracking branch 'google/main' into bitcoin-fork
21fc8ef304 Fix typo (bitcoin-inquisition#59)
89f69843a1 Fix misspelled "Proccess" in comment
02e65f4fd3 Bump deps (bitcoin-inquisition#56)
b9d6e825a1 Fix Windows CI build. (bitcoin-inquisition#54)
bbbb93ab5d Switch CI to GitHub Actions (bitcoin-inquisition#55)
d46cd17d70 Add clangd cache directory to .gitignore.

git-subtree-dir: src/crc32c
git-subtree-split: efb8ea04e4a5b6a18dc4bc1908fd1cb2dcefb585
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant