Skip to content

Conversation

l0rinc
Copy link
Contributor

@l0rinc l0rinc commented Feb 19, 2024

This PR aims to standardize and simplify macOS-specific checks within our codebase by replacing the custom-defined MAC_OSX macro with the existing __APPLE__macro, defined in e.g. https://sourceforge.net/p/predef/wiki/OperatingSystems/#macos

We already use __APPLE__ in our own codebase for e.g. https://github.com/bitcoin/bitcoin/blob/master/src/crypto/sha256.cpp#L22

Local Verification confirms that MAC_OSX isn't defined, but __APPLE__ is:

% echo | cpp -dM | egrep 'MAC_OSX|__MACOS__|__APPLE__'
#define __APPLE__ 1

@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 19, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK fanquake
Concept ACK theuni

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

No conflicts as of last run.

@maflcko
Copy link
Member

maflcko commented Feb 19, 2024

Missing build: prefix in title?

@l0rinc l0rinc changed the title Replace Custom MAC_OSX Macro with Standard __APPLE__ for Consistent macOS Detection build: Replace Custom MAC_OSX Macro with Standard __APPLE__ for Consistent macOS Detection Feb 19, 2024
@DrahtBot
Copy link
Contributor

Guix builds (on x86_64)

File commit c265aad
(master)
commit e40066f
(master and this pull)
SHA256SUMS.part 6f821214728e3547... ab75f4bbc3127423...
*-aarch64-linux-gnu-debug.tar.gz 1be67882ac17b9d8... adf3f4e7dd456df9...
*-aarch64-linux-gnu.tar.gz 3b63efdbdbfebebc... 3651d345f6582ae2...
*-arm-linux-gnueabihf-debug.tar.gz de9aed501d377fa8... 824943a6a673b74d...
*-arm-linux-gnueabihf.tar.gz aaa813eed959c112... 886badd580265254...
*-arm64-apple-darwin-unsigned.tar.gz 36b16123ece970b8... 5b29c119f906f7c3...
*-arm64-apple-darwin-unsigned.zip b8de9375e9ea3ff4... 88304a71e6bf1256...
*-arm64-apple-darwin.tar.gz bbb0336cf64eca66... 60959eff9ec8b89a...
*-powerpc64-linux-gnu-debug.tar.gz cda7885c51e49cad... d6953c662907579c...
*-powerpc64-linux-gnu.tar.gz f351af5d4966e5a7... d6873a7608f3c7ac...
*-powerpc64le-linux-gnu-debug.tar.gz 1237e5cd283def85... 10711c142e8b24ba...
*-powerpc64le-linux-gnu.tar.gz 5fa6b8a31a28c43b... a80465957dd19cc3...
*-riscv64-linux-gnu-debug.tar.gz fcf0051066f424f3... b2c2e7864ba648f8...
*-riscv64-linux-gnu.tar.gz effb85105b1b6614... 3e74191c0d576c21...
*-x86_64-apple-darwin-unsigned.tar.gz 36c31f5c2a780e02... 0f4ed2e4c58f31b1...
*-x86_64-apple-darwin-unsigned.zip 17a933ddd37b77b2... 2b66bdc582f65a48...
*-x86_64-apple-darwin.tar.gz 5e12c8265fb50774... 1f810b70d7fc9360...
*-x86_64-linux-gnu-debug.tar.gz f41057edc7b8fd88... 1b71b8c5e89a5a46...
*-x86_64-linux-gnu.tar.gz 179c0b93c0e2c0d8... 7dc2d66ce3aeb99a...
*.tar.gz a7ecb9c3494c0b3c... 5751750368d1c91c...
guix_build.log 983a04a8e5e518d2... ab792a118d54d4be...
guix_build.log.diff bad60b7da3bc5af7...

@l0rinc l0rinc changed the title build: Replace Custom MAC_OSX Macro with Standard __APPLE__ for Consistent macOS Detection build: replace Custom MAC_OSX Macro with Standard __APPLE__ for Consistent macOS Detection Feb 20, 2024
@l0rinc l0rinc changed the title build: replace Custom MAC_OSX Macro with Standard __APPLE__ for Consistent macOS Detection build: replace custom MAC_OSX macro with standard __APPLE__ for consistent macOS detection Feb 20, 2024
@fanquake
Copy link
Member

This is MAC_OSX because that is what we actually mean, and using our own define gives us more control. We produce release binaries for macOS running on darwin hardware, not just any "__APPLE__ target", which, for example, would include iOS running on darwin hardware (i.e arm64e-apple-ios).

Swapping to just use __APPLE__ would mean it's no-longer as easy to differentiate the two. At this point, that may no-longer matter, but there is code in this codebase that is relevant for macOS, but not for iOS, for example: https://github.com/bitcoin/bitcoin/pull/29450/files#diff-820710709ad533b4feb014bcc62b8cef5158a52b7e9690af995380a23499b5e3R185-R191.

@l0rinc
Copy link
Contributor Author

l0rinc commented Feb 20, 2024

Hey @fanquake, thanks for your input.
How do you suggest we unify this in the codebase, since it's not used consistently currently?
This change could level the field before branching off to properly differentiate between the cases.

@Empact
Copy link
Contributor

Empact commented Feb 27, 2024

Fyi the current uses of __APPLE__ in the codebase are from external libs included directly into the codebase as subtrees, see get_subtrees for a list of the related dirs. tinyformat.h is a special case which is included as a single file. @paplorinc

Which is not to say this change is incorrect (I'm not sure the distinction is meaningful in our case), but that the apparent inconsistency could be misleading.

@l0rinc
Copy link
Contributor Author

l0rinc commented Feb 27, 2024

Thanks @Empact, I think we can ignore the internal consistency argument, and the change would still make the build more maintainable - do you agree?

@Empact
Copy link
Contributor

Empact commented Feb 27, 2024

I'm +0 on this change but not particularly familiar with the scope and variety of our Apple-related builds.

@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from 9061bb4 to 4b69bbb Compare March 9, 2024 13:25
@theuni
Copy link
Member

theuni commented Apr 5, 2024

I recently did the same thing in one of my branches while working to remove the remaining autoconf vars from crypto/: theuni@3646f76 .

I think this is the right thing to do. I just checked locally and this applies to iOS as well:
clang -target arm64-apple-ios test.cpp --sysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk -o testing

Where test.cpp is:

#include <sys/types.h>
#include <sys/sysctl.h>
int main()
{
    int val = 0;
    int have_arm_shani;
    size_t len = sizeof(val);
    if (sysctlbyname("hw.optional.arm.FEAT_SHA256", &val, &len, nullptr, 0) == 0) {
        have_arm_shani = val != 0;
    }
    return have_arm_shani;
}

And it compiles fine.

So in this case, we didn't actually mean macOS, we meant apple.

@theuni
Copy link
Member

theuni commented Apr 5, 2024

Whoops, sorry. I spoke too fast. This is the right thing to do for sha256.cpp. I'd have to look into the rest in detail, but I'd ACK that small change.

@theuni
Copy link
Member

theuni commented Apr 9, 2024

@paplorinc I agree with @fanquake that some of these are macos specific.

Would you be interested in opening a new PR for just the crypto changes? Otherwise I will.

@l0rinc
Copy link
Contributor Author

l0rinc commented Apr 9, 2024

@theuni, I've split it out the crypto package to #29834, thanks for checking it!

fanquake added a commit that referenced this pull request Apr 9, 2024
a71eadf Change MAC_OSX macro to __APPLE__ in crypto package (Lőrinc)

Pull request description:

  Split out from #29450 (comment) to avoid the uncertainties and simplify review.

ACKs for top commit:
  theuni:
    ACK a71eadf
  fanquake:
    ACK a71eadf

Tree-SHA512: b6a7bd7ca95585dd9110cefe7c1213f4a1a72bdfc88670abf4a0d9a8bbc12e093544524adce46aa9ca714c472d417f74ca4a678af682ed2488053059434eaa02
@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from 4b69bbb to 8f3b63a Compare April 9, 2024 15:10
@l0rinc
Copy link
Contributor Author

l0rinc commented Apr 9, 2024

Rebased after the #29834 merge, please let me know what to change or verify here.

@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from 1e20d62 to fb792a4 Compare May 11, 2024 19:58
@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from fb792a4 to e057234 Compare May 29, 2024 07:53
@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from e057234 to 30a5ad6 Compare August 30, 2024 10:32
@l0rinc l0rinc changed the title build: replace custom MAC_OSX macro with standard __APPLE__ for consistent macOS detection build: replace custom MAC_OSX macro with existing __APPLE__ Aug 30, 2024
@l0rinc
Copy link
Contributor Author

l0rinc commented Aug 30, 2024

Rebased and adjusted to the CMake build following @hebasto's Needs CMake port label.

@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit 96b0a8f
(master)
commit d26232e
(master and this pull)
SHA256SUMS.part 27365d9d56b05cce... 23f769565a1f6705...
*-aarch64-linux-gnu-debug.tar.gz 04a5bb232114f782... 043b8ad9a8e48904...
*-aarch64-linux-gnu.tar.gz bd5d23a64ab7d779... 712d59c593efe503...
*-arm-linux-gnueabihf-debug.tar.gz 0021ca776f7dcc8b... 41afb2208357ebc2...
*-arm-linux-gnueabihf.tar.gz 2340d1119a1ec632... 6c43dcca66104a1c...
*-arm64-apple-darwin-unsigned.tar.gz ab00b80f00cd09b8... 592c93b2efca91b3...
*-arm64-apple-darwin-unsigned.zip cb84320f60e26fed... bcf00da332858f45...
*-arm64-apple-darwin.tar.gz a1a2786cfcecd350... c1923d35df593f9e...
*-powerpc64-linux-gnu-debug.tar.gz 9544adef5060dfab... 44ef4a95bc0df38b...
*-powerpc64-linux-gnu.tar.gz faf390f38f51cc68... 673b88440299f599...
*-riscv64-linux-gnu-debug.tar.gz 67b921646742efc8... a5b5a3c189862f92...
*-riscv64-linux-gnu.tar.gz c4759b761c171f92... baa1c008c6062281...
*-x86_64-apple-darwin-unsigned.tar.gz 459ba0d98d89d678... d9c610e3f99c506c...
*-x86_64-apple-darwin-unsigned.zip d19b0e188ac78eb6... 7daca194a3fda375...
*-x86_64-apple-darwin.tar.gz 7b3f41e90375e361... 83926aee65beafdb...
*-x86_64-linux-gnu-debug.tar.gz a1c953af5210e0d6... 0a3774107b8134f1...
*-x86_64-linux-gnu.tar.gz 5d74858c83c440f2... f97331986c3bc9c9...
*.tar.gz b3128d336e5c9680... 3b91c398989b85b2...
guix_build.log 3e54d141b4a84788... 0ba2e46142bdfc2a...
guix_build.log.diff 0f1baed7d663ef4a...

@fanquake
Copy link
Member

@l0rinc can you rebase this?

Adopting `__APPLE__` aligns our project with broader industry practices, including those in prominent projects such as the Linux kernel (and even our own code).

See: https://sourceforge.net/p/predef/wiki/OperatingSystems/#macos
@l0rinc l0rinc force-pushed the paplorinc/macos_to_apple_macros branch from e775765 to 6c6b244 Compare October 24, 2024 10:33
@l0rinc
Copy link
Contributor Author

l0rinc commented Oct 24, 2024

@l0rinc can you rebase this?

Rebased, checked for leftover MAC_OSX (found none)

@fanquake
Copy link
Member

Guix Build:

245051dc0f18c4da7060996df1ce9eb298b449e48b62cbad30017707c94faed2  guix-build-6c6b2442edab/output/aarch64-linux-gnu/SHA256SUMS.part
55b4b8b790069826c0564c1d3372fada3c8e71dc1a172f2c360aa74c7c041ef1  guix-build-6c6b2442edab/output/aarch64-linux-gnu/bitcoin-6c6b2442edab-aarch64-linux-gnu-debug.tar.gz
133bdd966b70875c8aa6b62eed27235fc327dfeaa8e048db524ec9ccf6085602  guix-build-6c6b2442edab/output/aarch64-linux-gnu/bitcoin-6c6b2442edab-aarch64-linux-gnu.tar.gz
f34455a7dc5581bb876231671afa9c30df0376fe00bf2d12eed0b55f4b30c404  guix-build-6c6b2442edab/output/arm-linux-gnueabihf/SHA256SUMS.part
360f58a35ed523c259655e5b52ad3d93fc0d2571121ad2a922ef63b7c6c4b1a4  guix-build-6c6b2442edab/output/arm-linux-gnueabihf/bitcoin-6c6b2442edab-arm-linux-gnueabihf-debug.tar.gz
a6218bb1d3cb64fbd723edc363b00d7e61d548d611edae5228378329dc41c7e1  guix-build-6c6b2442edab/output/arm-linux-gnueabihf/bitcoin-6c6b2442edab-arm-linux-gnueabihf.tar.gz
187a912a2a1c1a815058c5a276c78cc07308ec011090b00f02cba5cae5f2b0ee  guix-build-6c6b2442edab/output/arm64-apple-darwin/SHA256SUMS.part
c0dcf923e7c3ff150aa44dac2e186d620ee90ac5fc741b22110576ac6629acd5  guix-build-6c6b2442edab/output/arm64-apple-darwin/bitcoin-6c6b2442edab-arm64-apple-darwin-unsigned.tar.gz
a25b06d388045b828f9a55c4feafa1c0bc59c7fd6836c89f5c4c0ff829246ced  guix-build-6c6b2442edab/output/arm64-apple-darwin/bitcoin-6c6b2442edab-arm64-apple-darwin-unsigned.zip
4a1145119ed52441e3a363be4c8ab334fea6fd891da9b026c607f5484f70a826  guix-build-6c6b2442edab/output/arm64-apple-darwin/bitcoin-6c6b2442edab-arm64-apple-darwin.tar.gz
f9506a3fe5890ce3a1827f523655f9f5c088c2dba94139f3750c322c40c5c81e  guix-build-6c6b2442edab/output/dist-archive/bitcoin-6c6b2442edab.tar.gz
a83ade6be06651a80f95fa66df1a7a5aacf21eed0f05c7d7546fa4c8c67d78aa  guix-build-6c6b2442edab/output/powerpc64-linux-gnu/SHA256SUMS.part
b395cfb458499059b13ff71b4dd8519a254dc21bec6155fe481a11342a0db2fe  guix-build-6c6b2442edab/output/powerpc64-linux-gnu/bitcoin-6c6b2442edab-powerpc64-linux-gnu-debug.tar.gz
00e44a878f20cea0d265afc65d8f43febc4835f0e76db3e1e052bd3bab093279  guix-build-6c6b2442edab/output/powerpc64-linux-gnu/bitcoin-6c6b2442edab-powerpc64-linux-gnu.tar.gz
64634931286dac6b138cec0ffb45fc7324c880ef7c5c3ce358991a6c89717249  guix-build-6c6b2442edab/output/riscv64-linux-gnu/SHA256SUMS.part
11822a41c7fe8e754899be924b2d2d15987dddd74660a96400935bfc9a9d76c0  guix-build-6c6b2442edab/output/riscv64-linux-gnu/bitcoin-6c6b2442edab-riscv64-linux-gnu-debug.tar.gz
6d6a070afe184ef4e3c57179b629f36daa58735506f90c33cb0df10b02805315  guix-build-6c6b2442edab/output/riscv64-linux-gnu/bitcoin-6c6b2442edab-riscv64-linux-gnu.tar.gz
752f60a689a036940a0a345626d8bdd1326790bc00c7bdaa9cefbba00b0d4a63  guix-build-6c6b2442edab/output/x86_64-apple-darwin/SHA256SUMS.part
09ee27a6c6fb8fcf128c18443c6f073672651b73363e5c4fcec2fe000609dd6d  guix-build-6c6b2442edab/output/x86_64-apple-darwin/bitcoin-6c6b2442edab-x86_64-apple-darwin-unsigned.tar.gz
e623227a1456a3ab5eec39a7b08918c5bae6a62e0d63d5a325da4193ab8bd3e9  guix-build-6c6b2442edab/output/x86_64-apple-darwin/bitcoin-6c6b2442edab-x86_64-apple-darwin-unsigned.zip
933f64785d853e3818946688dd4356ffd0b2bf4f85e7cfaf335a4ef474d9f192  guix-build-6c6b2442edab/output/x86_64-apple-darwin/bitcoin-6c6b2442edab-x86_64-apple-darwin.tar.gz
a2ce725d5e71b1622d9f5c33b264f5d67fc2f97d0dedbea2855dfaa4b44e4f28  guix-build-6c6b2442edab/output/x86_64-linux-gnu/SHA256SUMS.part
9f4f446611f2dd4f54ad0984483c5b7dd0b60d1f9fe1252ceea4ed1b07e9a868  guix-build-6c6b2442edab/output/x86_64-linux-gnu/bitcoin-6c6b2442edab-x86_64-linux-gnu-debug.tar.gz
9e83290babc2f15dfb19481dd33af31ac7ae6adc23df6887dcbae52457d463be  guix-build-6c6b2442edab/output/x86_64-linux-gnu/bitcoin-6c6b2442edab-x86_64-linux-gnu.tar.gz
a45bc4958eae09a9a3fede0f64cd468c121d3d7fa1d5e614fe5f41cdd93ae653  guix-build-6c6b2442edab/output/x86_64-w64-mingw32/SHA256SUMS.part
e0b5e0a8f3a3df304f608c2effc60bc954c1789924ce8bbc4ccc2b92c2ca0929  guix-build-6c6b2442edab/output/x86_64-w64-mingw32/bitcoin-6c6b2442edab-win64-debug.zip
be64e323eb67131cc5194d346f73f8f3d3e4acf15d05eeb0f22140556743b058  guix-build-6c6b2442edab/output/x86_64-w64-mingw32/bitcoin-6c6b2442edab-win64-setup-unsigned.exe
9eb89a27a316c32a0ee89fa5f824605e347b5a2ee95cc70a454efdaf062d6708  guix-build-6c6b2442edab/output/x86_64-w64-mingw32/bitcoin-6c6b2442edab-win64-unsigned.tar.gz
b5f40face90542333443b8a7851ac3424fa776e98a35d0dbf0afe7f04b72a023  guix-build-6c6b2442edab/output/x86_64-w64-mingw32/bitcoin-6c6b2442edab-win64.zip

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6c6b244 - at this point it seems unlikely that we'll need to accomodate non-macOS Apple, so consolidating to __APPLE__ seems ok for now.

@fanquake fanquake merged commit 2f40e45 into bitcoin:master Oct 24, 2024
15 of 16 checks passed
@TheCharlatan
Copy link
Contributor

Post-merge and Guix build reproduced ACK 6c6b244

@l0rinc l0rinc deleted the paplorinc/macos_to_apple_macros branch October 24, 2024 15:25
@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit d94adc7
(master)
commit 3bc025d
(master and this pull)
SHA256SUMS.part c713ef1f07ff0632... 9e91f78777fe09d3...
*-aarch64-linux-gnu-debug.tar.gz a6f3e8470f058065... c8943b2b757a3853...
*-aarch64-linux-gnu.tar.gz 5852fdab3138df32... 68fb3d2b2aa09603...
*-arm-linux-gnueabihf-debug.tar.gz 14b241555c922dab... c7455e4004d4b447...
*-arm-linux-gnueabihf.tar.gz f8e867278d03db30... b261dbadc48b5b39...
*-arm64-apple-darwin-unsigned.tar.gz c5a762db769a16ca... 931d31e3a07b94f1...
*-arm64-apple-darwin-unsigned.zip 595806da4d708a77... f3f7b5eac02ef77e...
*-arm64-apple-darwin.tar.gz ef7f4226f6f002f4... e931bfe8b84b24f2...
*-powerpc64-linux-gnu-debug.tar.gz d2559d77d79b0c80... 780ad5d229ce2222...
*-powerpc64-linux-gnu.tar.gz a28e29c5ad291e20... e64dc7ee30cf0ef7...
*-riscv64-linux-gnu-debug.tar.gz a985c88eba5f1425... c14ddce3034b23d9...
*-riscv64-linux-gnu.tar.gz e856f86bc9053316... 11bf995666565f17...
*-x86_64-apple-darwin-unsigned.tar.gz fd5767f5ce6dbacd... 1e45e38f5557087b...
*-x86_64-apple-darwin-unsigned.zip a24038e482ed756b... 210f3e7fba5c6528...
*-x86_64-apple-darwin.tar.gz 9012e956a46e2f64... 50ff9c08daf4d290...
*-x86_64-linux-gnu-debug.tar.gz b32a3afd06d33771... a57cf0c7a2640ffc...
*-x86_64-linux-gnu.tar.gz 67fa3d26ab7957a0... 24a2685e31142e51...
*.tar.gz aff6b4dba5453528... 8e6975d22c1df446...
guix_build.log 6f5e9f32addd55da... 3ae4df0c35281ac1...
guix_build.log.diff f94da22e4347cf98...

TheCharlatan added a commit to TheCharlatan/rust-bitcoinkernel that referenced this pull request Nov 14, 2024
…158303fe2

48158303fe2 kernel: Add pure kernel bitcoin-chainstate
bf80d2f5009 kernel: Add block index utility functions to C header
a6ab5345e3b kernel: Add function to read block undo data from disk to C header
845b824d6c7 kernel: Add functions to read block from disk to C header
9324c8c4f67 kernel: Add function for copying  block data to C header
368fc93fd80 kernel: Add functions for the block validation state to C header
eb6e25ac007 kernel: Add validation interface to C header
cdce4484005 kernel: Add interrupt function to C header
7e47ec78768 kernel: Add import blocks function to C header
2b803d50747 kernel: Add chainstate load options for in-memory dbs in C header
ea92eb13c4a kernel: Add options for reindexing in C header
8254f2035a7 kernel: Add block validation to C header
ad7b880346e Kernel: Add chainstate loading to kernel C header
583820c4487 kernel: Add chainstate manager object to C header
ec137a086a0 kernel: Add notifications context option to C header
62a89689266 kerenl: Add chain params context option to C header
bb482dcbd30 kernel: Add kernel library context object
d114ccfdf8a kernel: Add logging to kernel library C header
44c65c46c43 kernel: Introduce initial kernel C header API
69c03134440 Merge bitcoin/bitcoin#31269: validation: Remove RECENT_CONSENSUS_CHANGE validation result
42282592943 Merge bitcoin/bitcoin#31000: bench: add support for custom data directory
36f5effa178 Merge bitcoin/bitcoin#31235: addrman: cap the `max_pct` to not exceed the maximum number of addresses
98ad249b69f Merge bitcoin/bitcoin#31277: doc: mention `descriptorprocesspsbt` in psbt.md
b0222bbb494 Merge bitcoin/bitcoin#30239: Ephemeral Dust
1dda1892b6b Merge bitcoin/bitcoin#31037: test: enhance p2p_orphan_handling
5c2e291060c bench: Add basic CheckEphemeralSpends benchmark
3f6559fa581 Add release note for ephemeral dust
71a6ab4b33d test: unit test for CheckEphemeralSpends
21d28b2f362 fuzz: add ephemeral_package_eval harness
127719f516a test: Add CheckMempoolEphemeralInvariants
e2e30e89ba4 functional test: Add ephemeral dust tests
4e68f901390 rpc: disallow in-mempool prioritisation of dusty tx
e1d3e81ab4d policy: Allow dust in transactions, spent in-mempool
04b2714fbbc functional test: Add new -dustrelayfee=0 test case
ebb6cd82baf doc: mention `descriptorprocesspsbt` in psbt.md
2b33322169b Merge bitcoin/bitcoin#31249: test: Add combinerawtransaction test to rpc_createmultisig
3fb6229dcfd Merge bitcoin/bitcoin#31271: doc: correct typos
fa66e0887ca bench: add support for custom data directory
ad9c2cceda9 test, bench: specialize working directory name
9c5775c331e addrman: cap the `max_pct` to not exceed the maximum number of addresses
8d340be9247 Merge bitcoin/bitcoin#31181: cmake: Revamp `FindLibevent` module
9a8e5adb161 Merge bitcoin/bitcoin#31267: refactor: Drop deprecated space in operator""_mst
726cbee9553 doc: correct typos
9fdfb73ca84 doc: fix typos
af6088701a2 Merge bitcoin/bitcoin#31237: doc: Add missing 'blank=true' option in offline-signing-tutorial.md
7a526653022 Merge bitcoin/bitcoin#31239: test: clarify log messages when handling SOCKS5 proxy connections
900b17239fb Merge bitcoin/bitcoin#31259: doc: Fix missing comma in JSON example in REST-interface.md
faf21625652 refactor: Drop deprecated space in operator""_mst
c889890e4a3 Merge bitcoin/bitcoin#31264: doc: Fixup bitcoin-wallet manpage chain selection args
0f6d20e43f2 Merge bitcoin/bitcoin#31163: scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}
5acd5e7f874 Merge bitcoin/bitcoin#31257: ci: make ctest stop on failure
19f277711eb Merge bitcoin/bitcoin#26593: tracing: Only prepare tracepoint arguments when actually tracing
e80e4c6ff91 validation: Remove RECENT_CONSENSUS_CHANGE validation result
fa729ab4a27 doc: Fixup bitcoin-wallet manpage chain selection args
5e3b444022c doc: Fix missing comma in JSON example in REST-interface.md
0903ce8dbc2 Merge bitcoin/bitcoin#30592: Remove mempoolfullrbf
f842d0801e1 Merge bitcoin/bitcoin#29686: Update manpage descriptions
36a22e56833 ci: make ctest stop on failure
83fab3212c9 test: Add combinerawtransaction test to rpc_createmultisig
018e5fcc462 Merge bitcoin/bitcoin#31190: TxDownloadManager followups
3a5f6027e16 Merge bitcoin/bitcoin#31171: depends: Specify CMake generator explicitly
99d9a093cf6 test: clarify log messages when handling SOCKS5 proxy connections
c9e67e214f0 Merge bitcoin/bitcoin#31238: fuzz: Limit wallet_notifications iterations
564238aabf1 Merge bitcoin/bitcoin#31164: net: Use actual memory size in receive buffer accounting
fa461d7a43a fuzz: Limit wallet_notifications iterations
ec375de39ff doc: Add missing 'blank=true' option in offline-signing-tutorial.md
5a96767e3f5 depends, libevent: Do not install *.pc files and remove patches for them
ffda355b5a2 cmake, refactor: Move `HAVE_EVHTTP_...` to `libevent` interface
b619bdc3303 cmake: Revamp `FindLibevent` module
2c90f8e08c4 Merge bitcoin/bitcoin#31232: ci: `add second_deadlock_stack=1` to TSAN options
5dc94d13d41 fuzz fix: assert MAX_PEER_TX_ANNOUNCEMENTS is not exceeded
45e2f8f87d8 Merge bitcoin/bitcoin#31173: cmake: Add `FindQRencode` module and enable `libqrencode` package for MSVC
80cb630bd94 Merge bitcoin/bitcoin#31216: Update secp256k1 subtree to v0.6.0
5161c2618cd ci: add second_deadlock_stack=1 to TSAN options
85224f92d52 Merge bitcoin/bitcoin#30811: build: Unify `-logsourcelocations` format
9719d373dc2 Merge bitcoin/bitcoin#30634: ci: Use clang-19 from apt.llvm.org
97235c446e9 build: Disable secp256k1 musig module
9e5089dbb02 build, msvc: Enable `libqrencode` vcpkg package
30089b0cb61 cmake: Add `FindQRencode` module
65b19419366 Merge bitcoin/bitcoin#31186: msvc: Update vcpkg manifest
d3388720837 Merge bitcoin/bitcoin#31206: doc: Use relative hyperlinks in release-process.md
ffc05fca6f7 Merge bitcoin/bitcoin#31220: doc: Fix word order in developer-notes.md
9f2c8287a24 Merge bitcoin/bitcoin#31192: depends, doc: List packages required to build `qt` package separately
03cff2c1421 Merge bitcoin/bitcoin#31191: build: Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to fuzz
44939e5de1b doc: Fix word order in developer-notes.md
b934954ad10 Merge bitcoin/bitcoin#30670: doc: Extend developer-notes with file-name-only debugging fix
05aebe3790f Merge bitcoin/bitcoin#30930: netinfo: add peer services column and outbound-only option
0ba680d41b4 Update secp256k1 subtree to v0.6.0
2d46a89386d Squashed 'src/secp256k1/' changes from 2f2ccc46954..0cdc758a563
d22a234ed27 net: Use actual memory size in receive buffer accounting
047b5e2af1f streams: add DataStream::GetMemoryUsage
c3a6722f34a net: Use DynamicUsage(m_type) in CSerializedNetMsg::GetMemoryUsage
c6594c0b142 memusage: Add DynamicUsage for std::string
7596282a556 memusage: Allow counting usage of vectors with different allocators
6463117a292 Merge bitcoin/bitcoin#31208: doc: archive release notes for v27.2
788c1324f3d build: Unify `-logsourcelocations` format
4747f030956 depends, doc: List packages required to build `qt` package separately
1a05c86ae47 doc: archive release notes for v27.2
9f71cff6ab3 doc: Use relative hyperlinks in release-process.md
f1bcf3edc50 Merge bitcoin/bitcoin#31139: test: added test to assert TX decode rpc error on submitpackage rpc
975b115e1a2 Merge bitcoin/bitcoin#31198: init: warn, don't error, when '-upnp' is set
4a0251c05dd Merge bitcoin/bitcoin#31187: ci: Do not error on unused-member-function in test each commit
e001dc3dc6e Merge bitcoin/bitcoin#31203: fuzz: fix `implicit-integer-sign-change` in wallet_create_transaction
5a26cf7773e fuzz: fix `implicit-integer-sign-change` in wallet_create_transaction
a1b3ccae4be init: warn, don't error, when '-upnp' is set
c189eec848e doc: release note for mempoolrullrbf removal
d47297c6aab rpc: Mark fullrbf and bip125-replaceable as deprecated
04a5dcee8ab docs: remove requirement to signal bip125
fafbf8acf41 Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to execute a fuzz target
fae3cf0ffa6 ci: Temporarily disable macOS/Windows fuzz step
f6577b71741 build, msvc: Update vcpkg manifest baseline
16e16013bfa build, msvc: Document `libevent` version pinning
ec47cd2b508 build, msvc: Drop no longer needed `liblzma` version pinning
9a0734df5f1 build, msvc: Reorder keys in `vcpkg.json`
8351562bec6 [fuzz] allow negative time jumps in txdownloadman_impl
917ab810d93 [doc] comment fixups from n30110
f07a533dfcb Merge bitcoin/bitcoin#24214: Fix unsigned integer overflows in interpreter
62516105536 Merge bitcoin/bitcoin#31015: build: have "make test" depend on "make all"
4a31f8ccc9d Merge bitcoin/bitcoin#31156: test: Don't enforce BIP94 on regtest unless specified by arg
02be3dced71 Merge bitcoin/bitcoin#31166: key: clear out secret data in `DecodeExtKey`
54d07dd37d5 ci: Do not error on unused-member-function in test each commit
47f50c7af55 doc: add bitcoin-qt man description
40b82e3ab0a doc: add bitcoin-util man description
a7bf80f3a2d doc: add bitcoin-tx man description
3f9a5168323 doc: add bitcoin-wallet man description
d8c0bb23ef8 doc: add bitcoin-cli man description
09abccfa772 doc: add bitcoind man description
97b790e844a Merge bitcoin/bitcoin#29420: test: extend the SOCKS5 Python proxy to actually connect to a destination
6b73eb9a1a2 Merge bitcoin/bitcoin#31064: init: Correct coins db cache size setting
27d12cf17f2 Merge bitcoin/bitcoin#31043: rpc: getorphantxs follow-up
7b66815b16b Merge bitcoin/bitcoin#30110: refactor: TxDownloadManager + fuzzing
dc97e7f6dba Merge bitcoin/bitcoin#30903: cmake: Add `FindZeroMQ` module
1b0b9b4c787 Extend possible debugging fixes with file-name-only
da10e0bab4a Merge bitcoin/bitcoin#30942: test: Remove dead code from interface_zmq test
111a23d9b36 Remove -mempoolfullrbf option
e96ffa98b04 Merge bitcoin/bitcoin#31142: test: fix intermittent failure in p2p_seednode.py, don't connect to random IPs
54c4b09f083 Merge bitcoin/bitcoin#31042: build: Rename `PACKAGE_*` variables to `CLIENT_*`
e60cecc8115 doc: add release note for 31156
fc7dfb3df5b test: Don't enforce BIP94 on regtest unless specified by arg
fabe90c8242 ci: Use clang-19 from apt.llvm.org
0de3e96e333 tracing: use bitcoind pid in bcc tracing examples
411c6cfc6c2 tracing: only prepare tracepoint args if attached
d524c1ec066 tracing: dedup TRACE macros & rename to TRACEPOINT
70713303b63 scripted-diff: Rename `PACKAGE_*` variables to `CLIENT_*`
332655cb52c build: Rename `PACKAGE_*` variables to `CLIENT_*`
e6e29e3c94c scripted-diff: Clarify "user agent" variable name
e2ba8236715 depends: Specify CMake generator explicitly
1c7ca6e64de Merge bitcoin/bitcoin#31093: Introduce `g_fuzzing` global for fuzzing checks
6e21dedbf2b Merge bitcoin/bitcoin#31130: Drop miniupnp dependency
d7fd766feb2 test: added test to assert TX decode rpc error on submitpackage rpc
559a8dd9c0a key: clear out secret data in `DecodeExtKey`
4120c7543ee scripted-diff: get rid of remaining "command" terminology in protocol.{h,cpp}
2a52718d734 Merge bitcoin/bitcoin#31152: functional test: Additional package evaluation coverage
9de9c858d5a test: enhance p2p_orphan_handling
33af14b62e4 test: reduce assert_debug_log reliance
0ea84bc362f test: explicitly check boolean verbosity is disallowed
7a2e6b68cd9 doc: add rpc guidance for boolean verbosity avoidance
698f302df8b rpc: disallow boolean verbosity in getorphantxs
63f5e6ec795 test: add entry and expiration time checks
808a708107e rpc: add entry time to getorphantxs
56bf3027144 refactor: rename rpc_getorphantxs to rpc_orphans
7824f6b0770 test: check that getorphantxs is hidden
ac68fcca701 rpc: disallow undefined verbosity in getorphantxs
25dacae9c7f Merge bitcoin/bitcoin#31040: test: Assert that when we add the max orphan amount that we cannot add anymore and that a random orphan gets dropped
40e5f26a3ff mapport: remove dead code in DispatchMapPort
38fdf7c1fb1 mapport: drop outdated comments
915640e191b depends: zeromq: don't install .pc files and remove patches for them
6b8a74463b5 cmake: Add `FindZeroMQ` module
9a7206a34e3 Merge bitcoin/bitcoin#29536: fuzz: fuzz connman with non-empty addrman + ASMap
d4abaf8c9d9 Merge bitcoin/bitcoin#29608: optimization: Preallocate addresses in GetAddr based on nNodes
b7b24352906 doc: add release note for #31130
1b6dec98da3 depends: drop miniupnpc
953533d0214 doc: remove mentions of UPnP
94ad614482f ci: remove UPnP options
f32c34d0c3d functional test: Additional package evaluation coverage
87532fe5585 netinfo: allow setting an outbound-only peer list
9f243cd7fa6 Introduce `g_fuzzing` global for fuzzing checks
b95adf057a4 Merge bitcoin/bitcoin#31150: util: Treat Assume as Assert when evaluating at compile-time
8f24e492e20 Merge bitcoin/bitcoin#29991: depends: sqlite 3.46.1
2ef5004f78c Merge bitcoin/bitcoin#31146: ci: Temporary workaround for old CCACHE_DIR cirrus env
8c12fe828de Merge bitcoin/bitcoin#29936: fuzz: wallet: add target for `CreateTransaction`
5c299ecafe6 test: Assert that when we add the max orphan amount that we cannot add anymore and that a random orphan gets dropped
0f4bc635854 [fuzz] txdownloadman and txdownload_impl
699643f23a1 [unit test] MempoolRejectedTx
fa584cbe727 [p2p] add TxDownloadOptions bool to make TxRequestTracker deterministic
f803c8ce8dd [p2p] filter 1p1c for child txid in recent rejects
5269d57e6d7 [p2p] don't process orphan if in recent rejects
2266eba43a9 [p2p] don't find 1p1cs for reconsiderable txns that are AlreadyHaveTx
fa7027d0fc1 [refactor] add CheckIsEmpty and GetOrphanTransactions, remove access to TxDownloadMan internals
969b07237b9 [refactor] wrap {Have,Get}TxToReconsider in txdownload
f150fb94e7d [refactor] make AlreadyHaveTx and Find1P1CPackage private to TxDownloadImpl
1e08195135b [refactor] move new tx logic to txdownload
257568eab5b [refactor] move invalid package processing to TxDownload
c4ce0c1218d [refactor] move invalid tx processing to TxDownload
c6b21749ca0 [refactor] move valid tx processing to TxDownload
a8cf3b6e845 [refactor] move Find1P1CPackage to txdownload
f497414ce76 [refactor] put peerman tasks at the end of ProcessInvalidTx
6797bc42a76 [p2p] restrict RecursiveDynamicUsage of orphans added to vExtraTxnForCompact
798cc8f5aac [refactor] move Find1P1CPackage into ProcessInvalidTx
416fbc952b2 [refactor] move new orphan handling to ProcessInvalidTx
c8e67b9169b [refactor] move ProcessInvalidTx and ProcessValidTx definitions down
3a41926d1b5 [refactor] move notfound processing to txdownload
042a97ce7fc [refactor] move tx inv/getdata handling to txdownload
58e09f244b4 [p2p] don't log tx invs when in IBD
288865338f5 [refactor] rename maybe_add_extra_compact_tx to first_time_failure
f48d36cd97e [refactor] move peer (dis)connection logic to TxDownload
f61d9e4b4b8 [refactor] move AlreadyHaveTx to TxDownload
84e4ef843db [txdownload] add read-only reference to mempool
af918349de5 [refactor] move ValidationInterface functions to TxDownloadManager
f6c860efb12 [doc] fix typo in m_lazy_recent_confirmed_transactions doc
5f9004e1550 [refactor] add TxDownloadManager wrapping TxOrphanage, TxRequestTracker, and bloom filters
947f2925d55 Merge bitcoin/bitcoin#31124: util: Remove RandAddSeedPerfmon
7640cfdd624 Merge bitcoin/bitcoin#31118: doc: replace `-?` with `-h` and `-help`
74fb19317ae Merge bitcoin/bitcoin#30849: refactor: migrate `bool GetCoin` to return `optional<Coin>`
c16e909b3e2 Merge bitcoin/bitcoin#28574: wallet: optimize migration process, batch db transactions
a9598e5eaab build: drop miniupnpc dependency
a5fcfb7385c interfaces: remove now unused 'use_upnp' arg from 'mapPort'
038bbe7b200 daemon: remove UPnP support
844770b05eb qt: remove UPnP settings
dd92911732d Merge bitcoin/bitcoin#31148: ci: display logs of failed unit tests automatically
fa69a5f4b76 util: Treat Assume as Assert when evaluating at compile-time
0c79c343a9f Merge bitcoin/bitcoin#31147: cmake, qt, test: Remove problematic code
8523d8c0fc8 ci: display logs of failed tests automatically
2f40e453ccd Merge bitcoin/bitcoin#29450: build: replace custom `MAC_OSX` macro with existing `__APPLE__`
cb7c5ca824e Add gdb and lldb links to debugging troubleshooting
6c6b2442eda build: Replace MAC_OSX macro with existing __APPLE__
fb46d57d4e7 cmake, qt, test: Remove problematic code
fa9747a8961 ci: Temporary workaround for old CCACHE_DIR cirrus env
6c9fe7b73ea test: Prevent connection attempts to random IPs in p2p_seednodes.py
bb97b1ffa9f test: fix intermittent timeout in p2p_seednodes.py
57529ac4dbb test: set P2PConnection.p2p_connected_to_node in peer_connect_helper()
22cd0e888c7 test: support WTX INVs from P2PDataStore and fix a comment
ebe42c00aa4 test: extend the SOCKS5 Python proxy to actually connect to a destination
9bb92c0e7ff util: Remove RandAddSeedPerfmon
c98fc36d094 wallet: migration, consolidate external wallets db writes
7c9076a2d2e wallet: migration, consolidate main wallet db writes
9ef20e86d7f wallet: provide WalletBatch to 'SetupDescriptorScriptPubKeyMans'
34bf0795fc0 wallet: refactor ApplyMigrationData to return util::Result<void>
aacaaaa0d3a wallet: provide WalletBatch to 'RemoveTxs'
57249ff6697 wallet: introduce active db txn listeners
91e065ec175 wallet: remove post-migration signals connection
055c0532fc8 wallet: provide WalletBatch to 'DeleteRecords'
122d103ca22 wallet: introduce 'SetWalletFlagWithDB'
6052c7891dc wallet: decouple default descriptors creation from external signer setup
f2541d09e13 wallet: batch MigrateToDescriptor() db transactions
66c9936455f bench: add coverage for wallet migration process
33a28e252a7 Change default help arg to `-help` and mention `-h` and `-?` as alternatives
f0130ab1a1e doc: replace `-?` with `-h` for bench_bitcoin help
681ebcceca7 netinfo: rename and hoist max level constant to use in top-level help
e7d307ce8cf netinfo: clarify relaytxes and addr_relay_enabled help docs
eef2a9d4062 netinfo: add peer services column
3a4a788ee0d init: Correct coins db cache size setting
2957ca96119 build: have "make test" depend on "make all"
bbbbaa0d9ac Fix unsigned integer overflows in interpreter
c4dc81f9c69 test: Remove dead code from interface_zmq
c495731a316 fuzz: wallet: add target for `CreateTransaction`
3db68e29ec6 wallet: move `ImportDescriptors`/`FuzzedWallet` to util
552cae243a1 fuzz: cover `ASMapHealthCheck` in connman target
33b0f3ae966 fuzz: use `ConsumeNetGroupManager` in connman target
18c8a0945bd fuzz: move `ConsumeNetGroupManager` to util
fe624631aeb fuzz: fuzz `connman` with a non-empty addrman
0a12cff2a8e fuzz: move `AddrManDeterministic` to util
4feaa287284 refactor: Rely on returned value of GetCoin instead of parameter
46dfbf169b4 refactor: Return optional of Coin in GetCoin
e31bfb26c21 refactor: Remove unrealistic simulation state
ba621ffb9cb test: improve debug log message from P2PConnection::connection_made()
def6dd0c597 depends: sqlite 3.46.1
66082ca3488 Preallocate addresses in GetAddr based on nNodes
REVERT: 1047757ea3b kernel: Add pure kernel bitcoin-chainstate
REVERT: c568fdf75fd kernel: Add block index utility functions to C header
REVERT: 0f1da1dcba5 kernel: Add function to read block undo data from disk to C header
REVERT: 45af559c9f6 kernel: Add functions to read block from disk to C header
REVERT: 2a7f8a8240c kernel: Add function for copying  block data to C header
REVERT: b19f5336c03 kernel: Add functions for the block validation state to C header
REVERT: 9c0ffa913f4 kernel: Add validation interface to C header
REVERT: a93318c6152 kernel: Add interrupt function to C header
REVERT: 51053f33720 kernel: Add import blocks function to C header
REVERT: 6b0ada2af42 kernel: Add chainstate load options for in-memory dbs in C header
REVERT: 34427bfa9c7 kernel: Add options for reindexing in C header
REVERT: ca57311c969 kernel: Add block validation to C header
REVERT: 44156d84838 Kernel: Add chainstate loading to kernel C header
REVERT: 2cee46cdcc1 kernel: Add chainstate manager object to C header
REVERT: 7102c7ae45e kernel: Add notifications context option to C header
REVERT: ed628a2a3c4 kerenl: Add chain params context option to C header
REVERT: 27643297ff7 kernel: Add kernel library context object
REVERT: 2ba22cf3f90 kernel: Add logging to kernel library C header
REVERT: 873874c03e9 kernel: Introduce initial kernel C header API

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: 48158303fe276cb2f8fbc53ff31a4162d8f55c84
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants