aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-09-03test: Use string_view for json_testsMarcoFalke
This avoids a static constructor of the global std::string, and rules out possibly expensive and implicit copies of the string completely.
2024-09-03Merge bitcoin/bitcoin#30778: build: Fix linking for `fuzz` target when ↵merge-script
building with MSan 787dfaf084a3952319778da9cbcda9d7d619e4ee ci: Do not override `-g -O1` set in `MSAN_FLAGS` (Hennadii Stepanov) 26c460aa8b5decfd08d931b9b3f80be5c13c7528 build: Fix linking for `fuzz` target when building with MSan (Hennadii Stepanov) Pull request description: The first commit fixes https://github.com/bitcoin/bitcoin/issues/30760. The second commit: 1. Preserves `-g -O1` set in `MSAN_FLAGS`. Since configuration-specific flags override general flags, these are set to empty strings. A similar approach is used in the OSS-Fuzz repository. 2. Sets the "Debug" build configuration when depends are built with `DEBUG=1`, ensuring that `linux_debug_CPPFLAGS` from depends are passed to the main build system. ACKs for top commit: maflcko: review-only ACK 787dfaf084a3952319778da9cbcda9d7d619e4ee fanquake: ACK 787dfaf084a3952319778da9cbcda9d7d619e4ee - as a follow up it would be good to: Tree-SHA512: c324390d1dbda30f82025d8482ddb0cfa0395f9ba225a2ddce05a123c65e0622a6a1d5f0fa03f09e21d62792431cf3da5c49e41a3ac7f7a958d0392a0430f29c
2024-09-03Merge bitcoin/bitcoin#30741: doc: update documentation and scripts related ↵merge-script
to build directories 6a68343ffbf3291eb243d90c00df50e672ff3944 doc: Prepend 'build/' to binary paths under 'src/' in docs (Lőrinc) 91b3bc2b9c572d9244e1cf542655c1b32e87aaf7 doc: Update documentation generation example in developer-notes.md (Lőrinc) Pull request description: In [the other readmes](https://github.com/bitcoin/bitcoin/blob/6ce50fd9d0ae6850d54bf883e7a7c1bcb6912c5c/src/test/README.md?plain=1#L19) we've provided a default build directory instead, unified the `developer-notes.md` to specify it explicitly. In the next commit I've used this default to go over each reference to our binaries and changed their in-source references to the build directory. Some of these changes were in example outputs - I haven't validated that the outputs are still the same. I haven't modified the build folders in the devtools. ACKs for top commit: maflcko: review ACK 6a68343ffbf3291eb243d90c00df50e672ff3944 pablomartin4btc: ACK 6a68343ffbf3291eb243d90c00df50e672ff3944 fanquake: ACK 6a68343ffbf3291eb243d90c00df50e672ff3944 - we still need to followup with other scripts/devtools, and likely unify what we are doing in some way, but this is an improvement. Tree-SHA512: 905d9c68cafe1e405e98d6aa089d7a36a34c9e03403df5c67ac2c9a98cfa54a0305b647cb92247dcb9f49e9b509a8ba88367392b95618c67059684c67b6c36fb
2024-09-02ci: Do not override `-g -O1` set in `MSAN_FLAGS`Hennadii Stepanov
Additionally, setting the "Debug" build configuration ensures that `linux_debug_CPPFLAGS` from depends are passed to the main build system.
2024-09-02build: Fix linking for `fuzz` target when building with MSanHennadii Stepanov
2024-09-02Merge bitcoin/bitcoin#30761: test: Avoid intermittent timeout in ↵merge-script
p2p_headers_sync_with_minchainwork.py fa247e6e8c7fddf9e3461c3e2e6f5fade0fe64cf test: Avoid intermittent timeout in p2p_headers_sync_with_minchainwork.py (MarcoFalke) Pull request description: Similar to https://github.com/bitcoin/bitcoin/pull/30705: The goal of this test case is to check that the sync works at all, not to check any timeout. On extremely slow hardware (for example qemu virtual hardware), downloading the 4110 BLOCKS_TO_MINE may take longer than the block download timeout. Fix it by pinning the time using mocktime temporarily, and advance it immediately after the sync. ACKs for top commit: stratospher: ACK fa247e6. Checked the timeout downloading block logs before/after using `setmocktime`. tdb3: ACK fa247e6e8c7fddf9e3461c3e2e6f5fade0fe64cf Tree-SHA512: f61632a8d9e484f1b888aafbf87f7adf71b8692387bd77f603cdbc0de49f30d42e654741d46ae1ff8b9706a5559ee0faabdb192ed0db7449010b68bfcdbaa42d
2024-09-02Merge bitcoin/bitcoin#30779: doc: add `-DWITH_BDB=ON` to unix build docsmerge-script
ddef914bbb1e4fe87e8a85f17e4e839639fd97da doc: remove extraneous install statement (tdb3) bc532c915ec6ec8ca28e0b2dd00e232f0dd8f259 doc: add with_bdb to unix build docs (tdb3) Pull request description: Existing instructions for building legacy wallet support omit `-DWITH_BDB=ON`, which results in: ``` CMake Warning: Manually-specified variables were not used by the project: BerkeleyDB_INCLUDE_DIR ``` and a build without BDB support. This PR updates the docs to include `-DWITH_BDB=ON`. Also adds a minor correction to the OpenBSD build doc. Checked by building on Linux (Debian 12.7), FreeBSD 14.1, and OpenBSD 7.5 and attempting to create a legacy wallet with the `createwallet` rpc (with `-deprecatedrpc=create_bdb`). ACKs for top commit: l0rinc: utACK ddef914bbb1e4fe87e8a85f17e4e839639fd97da fanquake: ACK ddef914bbb1e4fe87e8a85f17e4e839639fd97da Tree-SHA512: 261568700b95fc073e03db6ca64a5f0544d5aed337aee4275575c1d0d1373c2a96911947abd202da3ed7c3b7a662b700b0596c0dabefe4b50900a798eed7e118
2024-09-02Merge bitcoin/bitcoin#30785: doc: fix compiler flags for macOS configurationmerge-script
8d7f8fabae252710e8e43bf18a0c33ec9f8a7137 doc: fix compiler flags for macOS configuration (marcofleon) Pull request description: Small CMake correction in the macOS build docs. My Mac will actually use AppleClang if I don't specify the compiler flags. ```bash % cmake -B testbuild -- The CXX compiler identification is AppleClang 15.0.0.15000309 ``` ```bash % cmake -B testbuild -DCMAKE_C_COMPILER="$(brew --prefix llvm)/bin/clang" -DCMAKE_CXX_COMPILER="$(brew --prefix llvm)/bin/clang++" -- The CXX compiler identification is Clang 18.1.8 ``` ACKs for top commit: maflcko: review ACK 8d7f8fabae252710e8e43bf18a0c33ec9f8a7137 brunoerg: ACK 8d7f8fabae252710e8e43bf18a0c33ec9f8a7137 Tree-SHA512: f25f0b38d5868d3182b79b8d0ff75ba7041e6282a6f4c83ed08ba7254ec9d8ae2553df36a4654a91ede5777e4c727dbdce6dcee7a5fe35bdd403d17e249ddd18
2024-09-02doc: fix compiler flags for macOS configurationmarcofleon
2024-09-02Merge bitcoin/bitcoin#30750: scripted-diff: LogPrint -> LogDebugmerge-script
fa09cb41f58d0483ffe134eb274b9048c5260faa refactor: Remove unused LogPrint (MarcoFalke) 333341589010b1d9b21b68ae6649992fd2653756 scripted-diff: LogPrint -> LogDebug (MarcoFalke) Pull request description: `LogPrint` has many issues: * It seems to indicate that something is being "printed", however config options such as `-printtoconsole` actually control what and where something is logged. * It does not mention the log severity (debug). * It is a deprecated alias for `LogDebug`, according to the dev notes. * It wastes review cycles, because reviewers sometimes point out that it is deprecated. * It makes the code inconsistent, when both are used, possibly even in lines right next to each other (like in `InitHTTPServer`) Fix all issues by removing the deprecated alias. I checked all conflicting pull requests and at the time of writing there are no conflicts, except in pull requests that are marked as draft, are yet unreviewed, or are blocked on feedback for other reasons. So I think it is fine to do now. ACKs for top commit: stickies-v: ACK fa09cb41f58d0483ffe134eb274b9048c5260faa danielabrozzoni: utACK fa09cb41f58d0483ffe134eb274b9048c5260faa TheCharlatan: ACK fa09cb41f58d0483ffe134eb274b9048c5260faa Tree-SHA512: 14270f4cfa3906025a0b994cbb5b2e3c8c2427c0beb19c717a505a2ccbfb1fd1ecf2fd03f6c52d22cde69a8d057e50d2207119fab2c2bc8228db3f10d4288d0f
2024-09-02Merge bitcoin/bitcoin#30664: build: Remove Autotools-based build systemmerge-script
faa382ae7642da0e436ea2c7f7eac67386280a7e ci, doc: Drop reference to `src/.bear-tidy-config` (Hennadii Stepanov) d71ac768424333b65a6d88c9752cc9c7fdb276f3 build: Remove Autotools-based build system (Hennadii Stepanov) e268b48419b802857c329a7ae27d3dbe4c1a9a4b doc: Adjust `doc/design/libraries.md` (Hennadii Stepanov) d209e4f1566f9240f105bb93ed61bda9b4bb272b doc: Drop mentions of `share/genbuild.sh` (Hennadii Stepanov) Pull request description: This PR deletes the Autotools-based build system. The MSVC build system is deleted in https://github.com/bitcoin/bitcoin/pull/30731. ACKs for top commit: maflcko: re-ACK faa382ae7642da0e436ea2c7f7eac67386280a7e 🍦 TheCharlatan: ACK faa382ae7642da0e436ea2c7f7eac67386280a7e fanquake: ACK faa382ae7642da0e436ea2c7f7eac67386280a7e Tree-SHA512: 53df977b5b199a1c38f7f61a042a62b24831c559ba65a461b4ac1c96a1a56e2dfd676df79f1358fd1cc1749ff27e7b548086157f337d4f596c1054cb3d2d5739
2024-09-01Merge bitcoin/bitcoin#30763: doc: update Fedora build instructions for cmakemerge-script
877c55a68b65b30f226f4747829bc7336329e295 doc: update fedora build instructions for cmake (Marnix) Pull request description: Update Fedora build instructions for cmake: - update the Fedora build requirements - remove old configure instruction This was forgotten to update ACKs for top commit: davidgumberg: ACK https://github.com/bitcoin/bitcoin/commit/877c55a68b65b30f226f4747829bc7336329e295 l0rinc: utACK 877c55a68b65b30f226f4747829bc7336329e295 hebasto: ACK 877c55a68b65b30f226f4747829bc7336329e295. pablomartin4btc: ACK 877c55a68b65b30f226f4747829bc7336329e295 tdb3: ACK 877c55a68b65b30f226f4747829bc7336329e295 Tree-SHA512: 53fbd4bef96d2aeef753f26359eab53023a154fbcc75952aecd15e8805cc24ceb8ebdc6d8746416720b5655ed694299b3381a2e4d621ebd522fb09d145c48665
2024-08-31doc: remove extraneous install statementtdb3
2024-08-31doc: add with_bdb to unix build docstdb3
2024-08-31Merge bitcoin/bitcoin#30377: refactor: Replace ParseHex with consteval ↵Ryan Ofsky
""_hex literals 8756ccd71218c8e013181473720b10d3c4a94957 scripted-diff: Replace ParseHex[<std::byte>]("str") -> "str"_hex[_u8] (Hodlinator) 9cb687351f7ff50d19b5c5997ed69cfdab75bbf2 refactor: Prepare for ParseHex -> ""_hex scripted-diff (Hodlinator) 50bc017040ae300c795e3709233b80619db24518 refactor: Hand-replace some ParseHex -> ""_hex (Hodlinator) 5b74a849cf5c54543280ba6488ae7f87361b1e2f util: Add consteval ""_hex[_v][_u8] literals (l0rinc) dc5f6f681275f56ff389500e3dd98fbe791f4a45 test refactor: util_tests - parse_hex clean up (Hodlinator) 2b5e6eff36abe4c23b8789ef1babfafedc90b973 refactor: Make XOnlyPubKey tolerate constexpr std::arrays (Hodlinator) 403d86f1ccf0b73f042d42a9722bb007ba8c7a31 refactor: vector -> span in CCrypter (Hodlinator) bd0830bbd4105af1953b6b897ba6bc35098cbe13 refactor: de-Hungarianize CCrypter (Hodlinator) d99c81697148a9695c0fba614dff9fbe728a3acd refactor: Improve CCrypter related lines (Hodlinator) 7e1d9a84689d77a9349a3a09fd5f9dd3f9c293aa refactor: Enforce lowercase hex digits for consteval uint256 (Hodlinator) Pull request description: Motivation: * Validates and converts the hex string into bytes at compile time instead of at runtime like `ParseHex()`. * Eliminates runtime dependencies: https://github.com/bitcoin/bitcoin/pull/30377#issuecomment-2214432177, https://github.com/bitcoin/bitcoin/pull/30048#discussion_r1592108480 * Has stricter requirements than `ParseHex()` (disallows whitespace and uppercase hex digits) and replaces it in a bunch of places. * Makes it possible to derive other compile time constants. * Minor: should shave off a few runtime CPU cycles. `""_hex` produces `std::array<std::byte>` as the momentum in the codebase is to use `std::byte` over `uint8_t`. Also makes `uint256` hex string constructor disallow uppercase hex digits. Discussed: https://github.com/bitcoin/bitcoin/pull/30560#discussion_r1701323070 Surprisingly does not change the size of the Guix **bitcoind** binary (on x86_64-linux-gnu) by 1 single byte. Spawned already merged PRs: #30436, #30482, #30532, #30560. ACKs for top commit: l0rinc: ACK 8756ccd71218c8e013181473720b10d3c4a94957 stickies-v: Rebase re-ACK 8756ccd71218c8e013181473720b10d3c4a94957, no changes since a096215c9c71a2ec03e76f1fd0bcdda0727996e0 ryanofsky: Code review ACK 8756ccd71218c8e013181473720b10d3c4a94957, just rebasing since last review and taking advantage of CScript constructors in #29369, also tweaking a code comment Tree-SHA512: 9b2011b7c37e0ef004c669f8601270a214b388916316458370f5902c79c2856790b1b2c7c123efa65decad04886ab5eff95644301e0d84358bb265cf1f8ec195
2024-08-31doc: update fedora build instructions for cmakeMarnix
2024-08-31Merge bitcoin/bitcoin#30777: ci: Delete no longer needed workaroundmerge-script
74da8cb286ce057cbd8c5081bac3fda74781c279 ci: Delete no longer needed workaround (Hennadii Stepanov) Pull request description: This PR removes a workaround that was necessary at some point during the development of the CMake staging branch. ACKs for top commit: fanquake: ACK 74da8cb286ce057cbd8c5081bac3fda74781c279 Tree-SHA512: 619a513efe86af8e24fc3b6e4124df8f3ff3699216a3f87a4385aeb5e3c605f2b035d1594604cd3efe66281ac879d954d412ee4ae8423408e46ebd32956883a5
2024-08-30ci: Delete no longer needed workaroundHennadii Stepanov
It was necessary at some point during the development of the CMake staging branch.
2024-08-30ci, doc: Drop reference to `src/.bear-tidy-config`Hennadii Stepanov
2024-08-30build: Remove Autotools-based build systemHennadii Stepanov
2024-08-30Merge bitcoin/bitcoin#30752: guix: Drop unused autotools packagesmerge-script
0004dcc7b136424e5c84c3750e9d6af336b674ed guix: Drop unused autotools packages (Hennadii Stepanov) Pull request description: This PR implements https://github.com/hebasto/bitcoin/pull/294. From https://github.com/hebasto/bitcoin/pull/294#issuecomment-2317292100: > I think guix was already bumped to cmake, so this can be done in a separate pull already today? ACKs for top commit: fanquake: ACK 0004dcc7b136424e5c84c3750e9d6af336b674ed Tree-SHA512: 60d0be8df6340797bebcd6a734e2a5a0a24df18b65c174af47ea652110f26aca00b019dd205b83ae0e664ba1322628f252ade461d2dc01353045347d405ad5fa
2024-08-30guix: Drop unused autotools packagesHennadii Stepanov
2024-08-30Merge bitcoin/bitcoin#30753: build: Drop no longer needed workaroundmerge-script
66dd1b4e58347327c14e5d9a26ce41592b07113f build: Drop no longer needed workaround (Hennadii Stepanov) Pull request description: This PR deletes a workaround that is no longer needed since https://github.com/bitcoin/bitcoin/pull/30508 was merged. ACKs for top commit: fanquake: ACK 66dd1b4e58347327c14e5d9a26ce41592b07113f Tree-SHA512: abb8e79b525989afe88f94899e4dc29c80d4593ea23f44c6b3d08710e6ddd1619e748798534973fa4ee9f48d9fad7226445b7a2cb4aec0bdb5d1b7ff2f6689ea
2024-08-30test: Avoid intermittent timeout in p2p_headers_sync_with_minchainwork.pyMarcoFalke
2024-08-30Merge bitcoin/bitcoin#30730: guix: Bump time machine to ↵merge-script
53396a22afc04536ddf75d8f82ad2eafa5082725 60d4398a345cb0be600fcced3abd37219a105d57 guix: drop GCC 12.4.0 package (fanquake) 5ed1511e5032dc3e229e91701580e2a7e3146b2f guix: bump time-machine to 53396a22afc04536ddf75d8f82ad2eafa5082725 (fanquake) Pull request description: Followup to #30511. https://git.savannah.gnu.org/cgit/guix.git/commit/?id=9aa38f98cbd41644abe2c43bb4f44f74df642df2 landed. Linux headers `6.1.102` -> `6.1.106` ACKs for top commit: hebasto: ACK 60d4398a345cb0be600fcced3abd37219a105d57. TheCharlatan: ACK 60d4398a345cb0be600fcced3abd37219a105d57 Tree-SHA512: 6ff4372897e5abb15c28d4607915f777585d54b7a35787ac46f7ddca0d695dc60a7da532d8beb37e2df1de12511220f0dc6428f68d6a4db628de816e2d339914
2024-08-29Merge bitcoin/bitcoin#30754: misc: Autotools -> CMake changesmerge-script
a865494deeff7dedcad7140299aee00ab3cdd62c lint: remove autotools packages (fanquake) b02f29e7efa5043791a6574a3f0355750aab1ea1 doc: replace Autotools with CMake (fanquake) Pull request description: These don't seem to be included in, i.e #30664. ACKs for top commit: maflcko: lgtm ACK a865494deeff7dedcad7140299aee00ab3cdd62c hebasto: re-ACK a865494deeff7dedcad7140299aee00ab3cdd62c. Tree-SHA512: bafa2675d7c819478fb9b3f44f557ec767acb8fa3c4a191b1b8a1e47352a4cb6cebbb3138d961058d846926359f5451241a8badcbe3edd7e067d69ecfc45df93
2024-08-29lint: remove autotools packagesfanquake
2024-08-29doc: replace Autotools with CMakefanquake
2024-08-29Merge bitcoin/bitcoin#30714: test: fix `TestShell` initialization (late ↵glozow
follow-up for #30463) bd7ce05f9d9d21903163a2bd9dd2df3ed3990c3e test: fix `TestShell` initialization (late follow-up for #30463) (Sebastian Falbesoner) Pull request description: Creating a `TestShell` instance as stated in the [docs](https://github.com/bitcoin/bitcoin/blob/master/test/functional/test-shell.md) currently fails on master: ``` $ python3 Python 3.10.13 (main, Mar 15 2024, 07:36:23) [Clang 16.0.6 ] on openbsd7 Type "help", "copyright", "credits" or "license" for more information. >>> import sys >>> sys.path.insert(0, "/home/thestack/bitcoin/test/functional") >>> from test_framework.test_shell import TestShell >>> test = TestShell().setup(num_nodes=2, setup_clean_chain=True) Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/home/thestack/bitcoin/test/functional/test_framework/test_shell.py", line 70, in __new__ TestShell.instance = TestShell.__TestShell() TypeError: BitcoinTestFramework.__init__() missing 1 required positional argument: 'test_file' ``` Since #30463, BitcoinTestFramework instances expect the path of the calling test at construction, in order to find shared data like the configuration (config.ini) and the cache. Note that in contrast to actual functional tests, we can't simply pass `__file__` here, as the test shell module sits within the `test_framework` subfolder, so we have to navigate up to the parent directory and append some dummy test file name. On the long-term we should probably add some TestShell instantation smoke-test to detect issues like this early. As I'm not too familiar with the CI I'm not sure what is a good way to achieve this (a functional test obviously can't be used, as that's already a BitcoinTestFramework test in itself), but happy to take suggestions. ACKs for top commit: ismaelsadeeq: Tested ACK bd7ce05f9d9d21903163a2bd9dd2df3ed3990c3e danielabrozzoni: tACK bd7ce05f9d9d21903163a2bd9dd2df3ed3990c3e brunoerg: ACK bd7ce05f9d9d21903163a2bd9dd2df3ed3990c3e Tree-SHA512: c3a2365e2cda48a233ee724673c490787981354914f33e10eadbbad9c68e8403d84c5551229a611401e743886539de380ba4bfcb77032b6c85731e3bbe962dc1
2024-08-29Merge bitcoin/bitcoin#30701: Use MiniWallet in functional test ↵glozow
rpc_signrawtransactionwithkey. a563f41232e2dd360ee8e76f6348dd10c7f4f2a3 Remove second node since only 1 is needed for the test (Martin Saposnic) 1f4cdb3d69926eedb6ed9376f30c4eefcf610a0c Replace custom funding tx creation with MiniWallet. (Martin Saposnic) Pull request description: In response to issue https://github.com/bitcoin/bitcoin/issues/30600, optimizations have been implemented to enhance test efficiency and readability: This PR refactors the `rpc_signrawtransactionwithkey.py` functional test to use MiniWallet for creating funding transactions. This simplifies the test code and improves performance by eliminating the need to mine new blocks for each funding transaction. Key changes: - Replaced custom `send_to_address` method with MiniWallet's `send_to` method - Removed unnecessary setup of a clean chain and second node - Simplified transaction creation and signing process ACKs for top commit: glozow: ACK a563f41232e2dd360ee8e76f6348dd10c7f4f2a3 ismaelsadeeq: code review ACK a563f41232e2dd360ee8e76f6348dd10c7f4f2a3 theStack: ACK a563f41232e2dd360ee8e76f6348dd10c7f4f2a3 Tree-SHA512: 318959f89702b169453d537dafb822f5ef1921db1088941d8bbdb3171dd7a6ecad590e57a3802bc37bcf8992267ed6ffa7f156b229d9817ebf812bd35df509b5
2024-08-29refactor: Remove unused LogPrintMarcoFalke
2024-08-29doc: Prepend 'build/' to binary paths under 'src/' in docsLőrinc
2024-08-29doc: Update documentation generation example in developer-notes.mdLőrinc
To correspond to the documentation style of e.g. src/test/README.md Co-authored-by: pablomartin4btc <pablomartin4btc@gmail.com>
2024-08-29build: Drop no longer needed workaroundHennadii Stepanov
2024-08-29scripted-diff: LogPrint -> LogDebugMarcoFalke
-BEGIN VERIFY SCRIPT- sed -i 's/\<LogPrint\>/LogDebug/g' $( git grep -l '\<LogPrint\>' -- ./contrib/ ./src/ ./test/ ':(exclude)src/logging.h' ) -END VERIFY SCRIPT-
2024-08-29doc: Adjust `doc/design/libraries.md`Hennadii Stepanov
2024-08-29doc: Drop mentions of `share/genbuild.sh`Hennadii Stepanov
2024-08-29Merge bitcoin/bitcoin#30749: Remove bsdmainutils from doc/cimerge-script
78358ce09d2a62a469a544249e02e02f9f7b94cd ci: add libzmq3-dev to test-each-commit job (fanquake) a2b1d2c5ec25a91e224c2b83a5588128e81c6faf doc: remove bsdmainutils (fanquake) 36ff336d2e417977340c1f6ca70f55433ce8d9f8 ci: remove bsdmainutils (fanquake) Pull request description: This was previously used to install `hexdump` (for the tests). However that isn't used by CMake. I'm not aware of any other tools from this package being used. ACKs for top commit: maflcko: ACK 78358ce09d2a62a469a544249e02e02f9f7b94cd hebasto: ACK 78358ce09d2a62a469a544249e02e02f9f7b94cd. Tree-SHA512: 01c1be81feba03a9645e3d382067df4cd7c64de184871c8d9691053a8f871fcedf48d298303554560df2cb1949fb35d5ce9ff20c751ff35789b7689d656c0287
2024-08-29Merge bitcoin/bitcoin#30653: guix: Drop unused module from manifestmerge-script
c7fb80a08f9825d6d21d4a5545f42255fea11f62 guix: Drop unused module from manifest (Hennadii Stepanov) Pull request description: My Guix build: ``` x86_64 170df52c2238510bd166f3fb1c4c3c11d2c1480a2e468fd532cb4d0435ac11cf guix-build-c7fb80a08f98/output/aarch64-linux-gnu/SHA256SUMS.part 54e71ef5135464f58e3db4a3b893fa2f26a2c9cfb465699a363bb59a0d1bd94f guix-build-c7fb80a08f98/output/aarch64-linux-gnu/bitcoin-c7fb80a08f98-aarch64-linux-gnu-debug.tar.gz 806d6042151e0af026748379b9bbbfea53d4c91555b2f0d05ed11faf83f429bb guix-build-c7fb80a08f98/output/aarch64-linux-gnu/bitcoin-c7fb80a08f98-aarch64-linux-gnu.tar.gz 96f111f81311b55c805f1ebe74c5a5bc3160819e8fc6d14aab778e6a20a5c266 guix-build-c7fb80a08f98/output/arm-linux-gnueabihf/SHA256SUMS.part 231a29a9ffec9cc88260324da28d8443a6fd455ff0b010574af455034581aea3 guix-build-c7fb80a08f98/output/arm-linux-gnueabihf/bitcoin-c7fb80a08f98-arm-linux-gnueabihf-debug.tar.gz a545801e94e2a7a9859f0111be8762a2a7e5ea4636eed86ac95d17f2f4cdb37a guix-build-c7fb80a08f98/output/arm-linux-gnueabihf/bitcoin-c7fb80a08f98-arm-linux-gnueabihf.tar.gz f565c1c7c10cc5c36f2206c3c5aab54422f20e38185c43f4dbd91c12cb33d10d guix-build-c7fb80a08f98/output/arm64-apple-darwin/SHA256SUMS.part 0b0d3d7e7300984063109f2ea23fabdf3961fa337ff28ed602a22965cdf6b499 guix-build-c7fb80a08f98/output/arm64-apple-darwin/bitcoin-c7fb80a08f98-arm64-apple-darwin-unsigned.tar.gz 78cfb54230e3b054c4bb121925844720be52269db6a63161eeebe93ebfb2dc21 guix-build-c7fb80a08f98/output/arm64-apple-darwin/bitcoin-c7fb80a08f98-arm64-apple-darwin-unsigned.zip 95124a8019053cc296187c0332e3b5b3acef401298baadacf52713068764dd99 guix-build-c7fb80a08f98/output/arm64-apple-darwin/bitcoin-c7fb80a08f98-arm64-apple-darwin.tar.gz a8b36c808c7b57cb2a20e43af36749c07f14392b9816752b68a986f9124806fc guix-build-c7fb80a08f98/output/dist-archive/bitcoin-c7fb80a08f98.tar.gz f7221bc6ed56b5af1196f67c776bd80de9f2b9dc8bf84b0a8602a586fda43079 guix-build-c7fb80a08f98/output/powerpc64-linux-gnu/SHA256SUMS.part e04410e453a9fcefacdbe9a1a43ad1f9ec6a36d622d258ea4208af1dc461692d guix-build-c7fb80a08f98/output/powerpc64-linux-gnu/bitcoin-c7fb80a08f98-powerpc64-linux-gnu-debug.tar.gz 64135391e147c7357b17b72b1e54e93a9a7931f90c4d14a2066f1c9a160881a0 guix-build-c7fb80a08f98/output/powerpc64-linux-gnu/bitcoin-c7fb80a08f98-powerpc64-linux-gnu.tar.gz 3f2375042bc29a7f87cadc6ba3ce7389fa5e6f6c53b32836c7fc249e4ba9838e guix-build-c7fb80a08f98/output/riscv64-linux-gnu/SHA256SUMS.part 33b8396ab0e1fd3121a85f1a80d81d52fe9be151f401f08283f9d5b8ecbd251b guix-build-c7fb80a08f98/output/riscv64-linux-gnu/bitcoin-c7fb80a08f98-riscv64-linux-gnu-debug.tar.gz 418a264d0bcde9665d5760061284ca3b5533c9f63769a76bc64c69d8b3c7d82f guix-build-c7fb80a08f98/output/riscv64-linux-gnu/bitcoin-c7fb80a08f98-riscv64-linux-gnu.tar.gz 3fed3e2d050059694da965e1752468c3d054f1acf5b774242eb8e7a73a775af5 guix-build-c7fb80a08f98/output/x86_64-apple-darwin/SHA256SUMS.part a5d2ddf1c1bbc22d104ef08d0bd73f8d9c5c8404791df66d51ffc76a0c638fb2 guix-build-c7fb80a08f98/output/x86_64-apple-darwin/bitcoin-c7fb80a08f98-x86_64-apple-darwin-unsigned.tar.gz bc3a44ca40c5bad631b76c240a7f1f46d0597cbf0c2389473d856e29775b3f1a guix-build-c7fb80a08f98/output/x86_64-apple-darwin/bitcoin-c7fb80a08f98-x86_64-apple-darwin-unsigned.zip 5b2f0aaf4c023cda33fe952f18a977cc735c5e1524b45e734f99641ee605cc5d guix-build-c7fb80a08f98/output/x86_64-apple-darwin/bitcoin-c7fb80a08f98-x86_64-apple-darwin.tar.gz e56223d773f7d1a0a0dbe99d98e60420f729987f14fb98f18eabe6575352f68c guix-build-c7fb80a08f98/output/x86_64-linux-gnu/SHA256SUMS.part 6e4a27fcafb1ec2dda41c7e486897ff51a4447d0ebfa6be30bdef6648c673786 guix-build-c7fb80a08f98/output/x86_64-linux-gnu/bitcoin-c7fb80a08f98-x86_64-linux-gnu-debug.tar.gz 3ff4232266a461bb55518a1e8834867e7e79c02914c59eb8f6b5052a26aefc12 guix-build-c7fb80a08f98/output/x86_64-linux-gnu/bitcoin-c7fb80a08f98-x86_64-linux-gnu.tar.gz fd2cfb0befaf849e98574698ddab121a01c7894bb5acc789b9eb9c3bbe78e7b2 guix-build-c7fb80a08f98/output/x86_64-w64-mingw32/SHA256SUMS.part 58a2f67ecc94b2daad37ab99e74708c062094eb047136e57451d89f856d0c9aa guix-build-c7fb80a08f98/output/x86_64-w64-mingw32/bitcoin-c7fb80a08f98-win64-debug.zip 6ccf68edc22dab4cc3171f3d8cdaed0444c438bca812512586edd81029de2c57 guix-build-c7fb80a08f98/output/x86_64-w64-mingw32/bitcoin-c7fb80a08f98-win64-setup-unsigned.exe d466b5bc2ace63995ca22943997db7c292e240cdee7c63e127ecd380a1ca9558 guix-build-c7fb80a08f98/output/x86_64-w64-mingw32/bitcoin-c7fb80a08f98-win64-unsigned.tar.gz b3fd8af55443feb8667940a18fb511e6d85ece1dd9fa0aa40f68e5ea86ab46df guix-build-c7fb80a08f98/output/x86_64-w64-mingw32/bitcoin-c7fb80a08f98-win64.zip ``` ACKs for top commit: fanquake: ACK c7fb80a08f9825d6d21d4a5545f42255fea11f62 - looks like this was last used in https://github.com/bitcoin/bitcoin/pull/27179. Tree-SHA512: 40498cb514a31609e721b3865a99b91e4ff2bf5760750a42b5b16333d905d13cf2f87481aabc679c08b9e872a6886a7c928706b6d7ada08df02672d4b5156ba1
2024-08-29ci: add libzmq3-dev to test-each-commit jobfanquake
2024-08-29doc: remove bsdmainutilsfanquake
2024-08-29ci: remove bsdmainutilsfanquake
2024-08-29Merge bitcoin/bitcoin#30735: ci: Use C++23 in one taskmerge-script
fac587ea070fe1354708aacce33ebb9cebd35e5b ci: Use C++23 once for testing (MarcoFalke) fa053ab7c01c03fada91ccfce885dd32e2e830ca build: Add Centos Stream 9 EOL URL (MarcoFalke) Pull request description: There are no plans to switch to C++23 anytime soon in the next couple of years. The only place right now that is known to benefit is `src/compat/byteswap.h`. However, it is still useful to test with the option, because deprecated, removed or changed language features, as well as compiler changes that are guarded by the language version will be tested and developers can learn about them upfront. Also includes a minor doc fixup commit. ACKs for top commit: davidgumberg: ACK https://github.com/bitcoin/bitcoin/pull/30735/commits/fac587ea070fe1354708aacce33ebb9cebd35e5b TheCharlatan: ACK fac587ea070fe1354708aacce33ebb9cebd35e5b Tree-SHA512: 1b81788eb5b4da77715d8b047279de65ae6b8920d5a21fd8cc94c3b0edb588ab8ffb7eaffb2f8b7806045de1d47ca85ca629f49038eca762f3136bf380cf3c87
2024-08-29Merge bitcoin/bitcoin#30739: doc: update dev note examples for CMakemerge-script
7de0c99804bca98ef159b7b778e6f5b602507d2c doc: update dev note examples for CMake (fanquake) Pull request description: Update the examples in the developer notes to work with CMake. Also added an explicit `-DCMAKE_EXPORT_COMPILE_COMMANDS=ON` for clarity. ACKs for top commit: davidgumberg: Tested ACK https://github.com/bitcoin/bitcoin/commit/7de0c99804bca98ef159b7b778e6f5b602507d2c TheCharlatan: ACK 7de0c99804bca98ef159b7b778e6f5b602507d2c jonatack: Tested ACK 7de0c99804bca98ef159b7b778e6f5b602507d2c on arm64 macOS 14.6.1 Tree-SHA512: 561fe5e777c5b29a4f26309700c03a730c5bbb2f838630abfaa4174112ced66e733c2109cb429a1927f1f3692bf1945f6386bcaffe604a76ea24633932d39171
2024-08-29Merge bitcoin/bitcoin#30740: ci: Re-add configs removed in cmake migrationmerge-script
fa80d39d82013b21a70677ac79bdff8c614379b7 ci: Re-add configs removed in cmake migration (MarcoFalke) Pull request description: In commit 9730288a0cd3f33021ef00fb2d95e5216d10ab61 many configs were removed from the CI without explanation. Fix it by adding them back. Can be reviewed by looking at: * the parity table https://gist.github.com/hebasto/2ef97d3a726bfce08ded9df07f7dab5e * the installed packages * the CI logs from before the cmake migration and the CI logs of this pull request ACKs for top commit: fanquake: ACK fa80d39d82013b21a70677ac79bdff8c614379b7 Tree-SHA512: a33335e117750e6c2e1490bb621f67c466f901793e43abe1bd0e263ef16fdcbc9e88be55c206167f3a5ddb39c1df6989c0fb7a96d9240243c000ba2e7f5e2747
2024-08-29Merge bitcoin/bitcoin#30700: doc: fix CI codespell warningsmerge-script
837fbca03602982d9f1055ac798711241ea3d0a0 Update spelling.ignore-words (Lőrinc) f9a08f35a537fd3a61a3898ff1f0b30d81e64afe doc: fix a few simple codespell warnings (Lőrinc) Pull request description: Can be checked locally by running `test/lint/lint-spelling.py` ACKs for top commit: maflcko: lgtm ACK 837fbca03602982d9f1055ac798711241ea3d0a0 jonatack: ACK 837fbca03602982d9f1055ac798711241ea3d0a0 Tree-SHA512: a83c78b9de4085749b916ffd255a9e72ffed06f09736ccff2dd4a4436d1fae7b22b1fb6073b0ce59ecb5bfdef4e43271494dadf3824647a42a4f26c26f092364
2024-08-29Merge bitcoin/bitcoin#30744: doc: Fix typo in `build-unix.md`merge-script
e78551baec1bd63192112a816cef8c207c049415 doc: Fix typo in `build-unix.md` (Hennadii Stepanov) Pull request description: Addresses https://github.com/bitcoin/bitcoin/pull/30454#discussion_r1735220144. ACKs for top commit: davidgumberg: ACK https://github.com/bitcoin/bitcoin/commit/e78551baec1bd63192112a816cef8c207c049415 l0rinc: ACK e78551baec1bd63192112a816cef8c207c049415 tdb3: ACK e78551baec1bd63192112a816cef8c207c049415 Tree-SHA512: a312a7718ac3fe4a9a204518f1306f4d4622b9c11e027f26960d15ac2e2380682604890a2ae4b874a28e0798f243f8226475cda3a8f468a1aa98df7ab26eea5f
2024-08-28doc: Fix typo in `build-unix.md`Hennadii Stepanov
2024-08-28scripted-diff: Replace ParseHex[<std::byte>]("str") -> "str"_hex[_u8]Hodlinator
Ideally all call sites should accept std::byte instead of uint8_t but those transformations are left to future PRs. -BEGIN VERIFY SCRIPT- sed -i --regexp-extended 's/\bParseHex\(("[^"]*")\)/\1_hex_u8/g' $(git grep -l ParseHex -- :src ':(exclude)src/test/util_tests.cpp') sed -i --regexp-extended 's/\bParseHex<std::byte>\(("[^"]*")\)/\1_hex/g' $(git grep -l ParseHex -- :src ':(exclude)src/test/util_tests.cpp') sed -i --regexp-extended 's/\bScriptFromHex\(("[^"]*")\)/ToScript(\1_hex)/g' src/test/script_tests.cpp -END VERIFY SCRIPT- Co-Authored-By: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Co-Authored-By: Ryan Ofsky <ryan@ofsky.org>
2024-08-28refactor: Prepare for ParseHex -> ""_hex scripted-diffHodlinator
- Adds using namespace. - Extracts ToScript helper function from ScriptFromHex, to be used heavily in the next commit. - Changes ScriptFromHex from using ParseHex to TryParseHex, now asserting the string is valid. - Use even number of hex digits in comment (and apply replacement from next commit to only touch line once).