build: Drop ZeroMQ patch for glibc < 2.12 (Hennadii Stepanov) 079df96 build: Drop ZeroMQ patch for Mingw-w64 < 4.0 (Hennadii Stepanov)#3
Open
ryihan wants to merge 10000 commits intoNetboxGlobal:masterfrom
Open
Conversation
fafdae4 test: Check that redundant verack message is ignored (MarcoFalke) Pull request description: The code exists and is uncovered (ref https://maflcko.github.io/b-c-cov/total.coverage/src/net_processing.cpp.gcov.html#L3795), so add a trivial test to cover it. ACKs for top commit: brunoerg: ACK fafdae4 sedited: ACK fafdae4 Tree-SHA512: 157f434c2faa16243890b2344c4ee36bc359e56c80ba8a04f0bba71e9760cf9106c38ed755ff57eff8d1957f35516d20b3d010e0ecb8633b845f5314cc0d050a
d3e681b fuzz: Use `__AFL_SHM_ID` for naming test directories (marcofleon) Pull request description: During long multicore fuzzing campaigns with AFL++, stale datadirs can eventually accumulate from time outs, resulting in disk running out of space (see #28811). The easiest way to reproduce this is by running our `utxo_total_supply` target using multiple cores with AFL++ and observing the crashes that occur because of all the directories in `/tmp/test_common\ bitcoin/utxo_total_supply/`. Fix this by using the AFL++ shared memory ID to name the test dirs and cleaning it up before each setup. This ID is unique per AFL++ instance, so multiple cores can run in parallel without conflicts. Fixes #28811 ACKs for top commit: maflcko: lgtm ACK d3e681b dergoegge: utACK d3e681b Tree-SHA512: 420373e5f8a63c84797303ba2ef6657dfe9dacf9c2f3d818524421c24681a0e984c212ecb706217d93f67c2ec16b146a2d37fddcbd6918b2e5e9f634f5e13c10
4fab35c miniscript: correct and_v() properties (Antoine Poinsot) Pull request description: `and_v()` must never be 'd'. This is not a bug fix since this was unreachable in valid Miniscripts: the first sub of an `and_v()` must be of type V, which conflicts with (i.e. never has) property 'd'. ACKs for top commit: sipa: ACK 4fab35c. Fuzzed for 2 months worth of CPU time. achow101: ACK 4fab35c Tree-SHA512: 8932ad2c9188747299cb9147ff097dca8d078ce7bdd0caefa71ee2724ff81d9bef836664211c2081519a45afd50c539974d67c2a3a1a42a65a3b10b1daef8cbe
Also, use str(e) consistently in all run helpers. This refactor does not change any behavior. This can be reviewed by checking that all instances are exactly identical code now: $ git grep --function-context 'def run(cmd'
On Windows, the `winnt.h` header defines `DELETE` as a macro for a "Standard Access Right" bitmask (0x00010000L). This introduces a fragile dependency on header inclusion order: if Windows headers happen to be included before this enum definition, the preprocessor expands `DELETE` into a numeric literal, causing syntax errors. Rename the enumerator to `DELETE_FLAG` to remove this fragility and avoid the collision entirely.
script_invalid.json no longer exists.
Fix a test that isn't implemented as intended. The idea is to test execution order by providing a signature that would cause script failure when parsed. An empty signature does not cause script failure in CHECKMULTISIG. Use OP_1 for the second signature instead of OP_0.
Copy existing STRICTENC tests and change the flag to DERSIG.
Currently, there are issues with headers in `batchpriority.cpp`: 1. `SCHED_BATCH` is not defined on all supported *BSD platforms. 2. `pthread.h` is necessary on other platforms. This addresses both issues and fixes other includes.
Co-authored-by: furszy <matiasfurszyfer@protonmail.com>
Replace the HTTP server's WorkQueue implementation and single threads handling code with ThreadPool for processing HTTP requests. The ThreadPool class encapsulates all this functionality on a reusable class, properly unit and fuzz tested (the previous code was not unit nor fuzz tested at all). This cleanly separates responsibilities: The HTTP server now focuses solely on receiving and dispatching requests, while ThreadPool handles concurrency, queuing, and execution. It simplifies init, shutdown and requests tracking. This also allows us to experiment with further performance improvements at the task queuing and execution level, such as a lock-free structure, task prioritization or any other performance improvement in the future, without having to deal with HTTP code that lives on a different layer.
…ETE_FLAG` 516be10 wallet: Rename `RecordType::DELETE` to `RecordType::DELETE_FLAG` (Hennadii Stepanov) Pull request description: On Windows, the `winnt.h` header defines `DELETE` as a macro for a "Standard Access Right" bitmask (0x00010000L). This introduces a fragile dependency on header inclusion order: if Windows headers happen to be included before the `RecordType` enum definition, the preprocessor expands `DELETE` into a numeric literal, causing syntax errors. Rename the enumerator to `DELETE_FLAG` to remove this fragility and avoid the collision entirely. Split from #34448. ACKs for top commit: maflcko: re-lgtm ACK 516be10 achow101: ACK 516be10 Tree-SHA512: eba054b395e18c07efb2901b28f542b042b62d85e1a798eeff35f8431530cb667fa791c47c4125cecdb689213b458ba396715495415e9b83bb322509a9376222
The input parameter of `PeerManagerImpl::BlockRequestAllowed()` changed to reference from pointer. The change is local to the class.
964c44c test(miniscript): Prove avoidance of stack overflow (Hodlinator) 198bbae refactor(miniscript): Destroy nodes one full subs-vector at a time (Hodlinator) 50cab85 refactor(miniscript): Remove NodeRef & MakeNodeRef() (Hodlinator) 15fb34d refactor(miniscript): Remove superfluous unique_ptr-indirection (Hodlinator) e55b23c refactor(miniscript): Remove Node::subs mutability (Hodlinator) c6f798b refactor(miniscript): Make fields non-const & private (Hodlinator) 22e4115 doc(miniscript): Remove mention of shared pointers (Hodlinator) Pull request description: Removes one level of unnecessary indirection, which was a change that originally [aided in finding one issue](#30866 (review)) in #30866. Simplifies the code one step further than 09a1875 belonging to aforementioned PR. Also adds test which verifies resistance to stack overflow when it comes to `~Node()` and `Node::Clone()`. No observed difference when running benchmarks: ExpandDescriptor/WalletIsMineDescriptors/WalletIsMineMigratedDescriptors/WalletLoadingDescriptors. Followup to #30866. ACKs for top commit: achow101: ACK 964c44c darosior: Code review ACK 964c44c l0rinc: ACK 964c44c Tree-SHA512: 32927e8f0f916fb70372ffd110f7ec7207d9e7a099c21c0a7482a12e96593b673c339719f4ab166ad7c086dc43767315fc1742c5b236a3facc45c4cfeb5872e9
6f7b432 test: remove UNKNOWN_ERROR from script_tests (Bruno Garcia) bd31a92 script: use SCRIPT_ERR_SCRIPTNUM for CScriptNum errors (Bruno Garcia) 0ca4dcd script: add SCRIPT_ERR_SCRIPTNUM error (Bruno Garcia) Pull request description: When evaluating a script, the current code is bad for analyzing some errors because it returns `SCRIPT_ERR_UNKNOWN_ERROR` for errors that are clearly known. `CScriptNum` has two well defined errors: number overflow and non-minimally encoded number. However, for both errors we return as unknown. This PR changes it by adding a new ScriptError that is used for any `CScriptNum` error. ACKs for top commit: achow101: ACK 6f7b432 w0xlt: ACK 6f7b432 darosior: ACK 6f7b432 Tree-SHA512: e656d9992251fbc95d33966fa18ce64bf714179d51ba6a7f429e5a55bc58e7fc08827e4ab71ace0dd385dac7e1feaea621b49503387793a30eae7a7e44aa6b0f
…nked test 552bc82 doc: Use multipath descriptors in descriptors.md and linked test (Anurag chavan) Pull request description: Updates documentation and `wallet_miniscript_decaying_multisig_descriptor_psbt.py` to use single multipath descriptors with `<0;1>` syntax instead of separate external/internal descriptors. ## Changes - **doc/descriptors.md**: Update examples (lines 70-71) to use `/<0;1>/*` multipath syntax - **doc/descriptors.md**: Update Basic Multisig Example instructions (line 179) to use single multipath descriptor - **test/functional/wallet_miniscript_decaying_multisig_descriptor_psbt.py**: Refactor to use single multipath descriptor pattern matching `wallet_multisig_descriptor_psbt.py` ## Implementation - `_get_xpub()` now extracts external descriptor and converts to multipath format - `create_multisig()` imports single descriptor that expands to receive and change addresses - Removed fake checksums from documentation examples - Added clear comments documenting multipath convention Fixes #34086 ACKs for top commit: yashbhutwala: ACK 552bc82 achow101: ACK 552bc82 rkrux: lgtm tACK 552bc82 Tree-SHA512: cc99271a3955daa475242d9f4ef8f09f4c94c64e48ec4647ecfd95dceb38bb0cdd91b78ec2d5f033b449d175eaecbdda49d6c766c8a1e1a01fed93be4eb0cfc0
…tion remains b189a34 test: add case where `TOTAL_TRIES` is exceeded yet solution remains (yancy) Pull request description: Show that `CoinGrider` halts searching when the number of attempts exceeds `TOTAL_TRIES`. To do so, show that a solution is found, then add one more entry to the same set of inputs. Since the search orders by `effective_value`, the solution is constructed such that only values with the lowest `effective_value` have the least weight. Only the lowest weight values will not exceed the `max_selection_weight`. Therefore, `CoinGrinder` will not evaluate all lowest weight solutions together before exceeding `TOTAL_TRIES` since they are last found. This test case was inspired by a similar test for `BnB` currently named `bnb_test`. ACKs for top commit: frankomosh: Code review ACK b189a34 achow101: ACK b189a34 murchandamus: ACK b189a34 Tree-SHA512: 1df0b6e29ae219edbeed14cfa97f0ad4688d6bf97ed946719ba3c3b69e004f3dee82991578eb5aceb554914b70c5b68feff9e321283c1fc8bc0fedf08df2cb4c
…rrors efcbf79 ci, iwyu: Fix warnings in `src/zmq` and treat them as errors (Hennadii Stepanov) Pull request description: This PR [continues](#33725 (comment)) the ongoing effort to enforce IWYU warnings. See [Developer Notes](https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#using-iwyu). Additionally, this adds a new include category to `src/.clang-format`. ACKs for top commit: maflcko: review ACK efcbf79 🐼 janb84: re ACK efcbf79 sedited: ACK efcbf79 Tree-SHA512: 5396719d4a9f7fff7b57be7284af5b25ff055edbaba417187e29106c9e310f19f361fbeea74e2448ef1e883a8658028762a38664858a863e5019fcb0cbb346a2
9c839aa iwyu: Document mappings for libc symbols (Hennadii Stepanov) 9182464 iwyu: Add temporary mapping to work around upstream bug (Hennadii Stepanov) 37de7d1 iwyu: Drop backported mapping (Hennadii Stepanov) Pull request description: This PR: 1. Removes mappings that have been [backported](include-what-you-use/include-what-you-use#1706) upstream. 2. Adds a new temporary mapping to work around upstream [issue](include-what-you-use/include-what-you-use#1616). 3. Document the existing mappings for libc symbols. ACKs for top commit: maflcko: lgtm ACK 9c839aa sedited: ACK 9c839aa Tree-SHA512: 691fd9fc6798951ca1a621ee607a617ebef2ed2f43196465c78c6cd7a5ea7f0f0e876e68cd54653edf9b6762ae5fdb704469a1524a5f6f1ab8b0eedbff65cc28
07af50f util: Drop *BSD headers in `batchpriority.cpp` (Hennadii Stepanov) Pull request description: Currently, there are issues with headers in `batchpriority.cpp`: 1. `SCHED_BATCH` is not defined on all supported *BSD platforms. 2. `pthread.h` is necessary on other platforms. This PR addresses both issues and fixes other includes. ACKs for top commit: maflcko: review ACK 07af50f 🤺 w0xlt: crACK 07af50f Tree-SHA512: 388f627e9d9c8b80834ba562034cd6aa44ba37d9156e13cdd6cbcfa93b19fcbf3222228d671784ca363e06fda3c978778f62f4530c3eb4ae3ff96adf91c2d789
… as errors 1bf3842 ci, iwyu: Fix warnings in `src/univalue` and treat them as errors (Hennadii Stepanov) Pull request description: This PR continues the ongoing effort to enforce IWYU warnings. See [Developer Notes](https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#using-iwyu). ACKs for top commit: maflcko: review ACK 1bf3842 🦇 sedited: ACK 1bf3842 Tree-SHA512: e2b7ad7b318c6c78de9a6b416a2bcb6da3ec9f4f060590db2b4f5f3a9a167891ac60c68efccea889df806f53b803c98303eed1fc24682257a9c37844ee2ee55d
Add minimal unit tests exercising `Consensus::CheckTxInputs` reject reasons for coinbase maturity (`bad-txns-premature-spend-of-coinbase`), input value range failures (`bad-txns-inputvalues-outofrange`), and for `nValueIn < value_out` (`bad-txns-in-belowout`). Inspired by b-c-cov coverage reports: * "bad-txns-premature-spend-of-coinbase" - https://maflcko.github.io/b-c-cov/test_bitcoin.coverage/src/consensus/tx_verify.cpp.gcov.html#L180 * "bad-txns-inputvalues-outofrange" - https://maflcko.github.io/b-c-cov/test_bitcoin.coverage/src/consensus/tx_verify.cpp.gcov.html#L187 * "bad-txns-in-belowout" - https://maflcko.github.io/b-c-cov/test_bitcoin.coverage/src/consensus/tx_verify.cpp.gcov.html#L193
…:GetValueOut` Inspired by b-c-cov coverage reports: * "GetValueOut: value out of range" - https://maflcko.github.io/b-c-cov/test_bitcoin.coverage/src/primitives/transaction.cpp.gcov.html#L103
This is a preparation for the next commit, where chunks will no longer be identified using a representative transaction, but using a set index. Reduce the load of line changes by doing this rename ahead of time. -BEGIN VERIFY SCRIPT- sed --in-place 's/_rep/_idx/g' src/cluster_linearize.h -END VERIFY SCRIPT-
This significantly changes the data structures used in SFL, based on the observation that the DepData::top_setinfo fields are quite wasteful: there is one per dependency (up to n^2/4), but we only ever need one per active dependency (of which there at most n-1). In total, the number of chunks plus the number of active dependencies is always exactly equal to the number of transactions, so it makes sense to have a shared pool of SetInfos, which are used for both chunks and top sets. To that effect, introduce a separate m_set_info variable, which stores a SetInfo per transaction. Some of these are used for chunk sets, and some for active dependencies' top sets. Every activation transforms the parent's chunk into the top set for the new dependency. Every deactivation transforms the top set into the new parent chunk. With indexes into m_set_data (SetIdx) becoming bounded by the number of transactions, we can use a SetType to represent sets of SetIdxs. Specifically, an m_chunk_idxs is added which contains all SetIdx referring to chunks. This leads to a much more natural way of iterating over chunks. Also use this opportunity to normalize many variable names.
With the earlier change to pool SetInfo objects, there is little need for DepData anymore. Use parent/child TxIdxs to refer to dependencies, and find their top set by having a child TxIdx-indexed vector in each TxData, rather than a list of dependencies. This makes code for iterating over dependencies more natural and simpler.
The combined size of TxData::dep_top_idx can be 16 KiB with 64 transactions and SetIdx = uint32_t. Use a smaller type where possible to reduce memory footprint and improve cache locality of m_tx_data. Also switch from an std::vector to an std::array, reducing allocation overhead and indirections.
This is a simple refactor to make the code more readable.
The current process consists of iterating over the transactions of the chunk one by one, and then for each figuring out which of its parents/children are in unprocessed chunks. Simplify this (and speed it up slightly) by splitting this process into two phases: first determine the union of all parents/children, and then find which chunks those belong to.
Instead of computing the set of reachable transactions inside PickMergeCandidate, make the information precomputed, and updated in Activate (by merging the two chunks' reachable sets) and Deactivate (by recomputing). This is a small performance gain on itself, but also a preparation for future optimizations that rely on quickly testing whether dependencies between chunks exist.
Future changes will rely on knowing the chunk indexes of the two created chunks after a split. It is natural to return this information from Deactivate, which also simplifies MergeSequence.
After a split, if the top part has a dependency on the bottom part, the first MergeSequence will always perform this merge and then stop. This is referred to as a self-merge. We can special case these by detecting self-merges early, and avoiding the overhead of a full MergeSequence which involves two PickMergeCandidate calls (a succesful and an unsuccesful one).
This means we can iterate over all active dependencies in a cluster/chunk in O(ntx) time rather than O(ndeps) (*), as the number of active dependencies in a set of transactions of size is at most ntx-1. (*) Asymptotically, this is not actually true, as for large transaction counts, iterating over a BitSet still scales with ntx. In practice however, where BitSets are represented by a constant number of integers, it holds.
This avoids adding them a second time to m_suboptimal_chunks when they happen to already be there.
It suffices to initially only attempt one direction of merges in MakeTopological(), and only try both directions on chunks that are the result of other merges.
The two calls to UpdateChunk, in Activate and Deactive each, are subtly different: the top one needs to update the chunk_idx of iterated transactions, while the bottom one leaves it unchanged. To exploit this difference, inline the four function calls, getting rid of UpdateChunks. This is also a preparation for a future improvement that inlines the recomputation of reachable sets in the same loop in Deactivate.
Avoid two full iterations over all of a chunks' transactions to recompute the reachable sets, by inlining them into the dependency-updating loops. Note that there is no need to do the same for Activate, because the reachable sets after merging can be computed directly from the input chunks' reachable sets. Deactivate needs to recompute them, however.
Improve upon the variable name for `invalid_walk_tip` to make the InvalidateBlock logic easier to read. Block tip before disconnection is now tracked directly via `disconnected_tip`, and `new_tip` is the tip after the disconnect. Co-authored-by: stickies-v <stickies-v@protonmail.com>
even though we have a distinction between BLOCK_FAILED_VALID and BLOCK_FAILED_CHILD in the codebase, we don't use it for anything. since there's no functional difference between them and it's unnecessary code complexity to categorise them correctly, just mark as BLOCK_FAILED_VALID instead.
…ng from disk - there maybe existing block indexes stored in disk with BLOCK_FAILED_CHILD - since they don't exist anymore, clean up block index entries with BLOCK_FAILED_CHILD and reset it to BLOCK_FAILED_VALID.
since it's the same as BLOCK_FAILED_VALID now
Add a test for block index transitioning from legacy BLOCK_FAILED_CHILD to BLOCK_FAILED_VALID behavior. In the scenario where a valid block has a BLOCK_FAILED_CHILD parent and a BLOCK_FAILED_VALID grandparent, ensure that all three blocks are correctly marked as BLOCK_FAILED_VALID after reloading the block index.
c2fcf25 clusterlin: inline GetReachable into Deactivate (optimization) (Pieter Wuille) d90f98a clusterlin: inline UpdateChunk into (De)Activate (optimization) (Pieter Wuille) b684f95 clusterlin: unidirectional MakeTopological initially (optimization) (Pieter Wuille) 1daa600 clusterlin: track suboptimal chunks (optimization) (Pieter Wuille) 63b06d5 clusterlin: keep track of active children (optimization) (Pieter Wuille) ae16485 clusterlin: special-case self-merges (optimization) (Pieter Wuille) 3221f1a clusterlin: make MergeSequence take SetIdx (simplification) (Pieter Wuille) 7194de3 clusterlin: precompute reachable sets (optimization) (Pieter Wuille) 6f898db clusterlin: simplify PickMergeCandidate (optimization) (Pieter Wuille) dcf458f clusterlin: split up OptimizeStep (refactor) (Pieter Wuille) cbd684a clusterlin: abstract out functions from MergeStep (refactor) (Pieter Wuille) b75574a clusterlin: improve TxData::dep_top_idx type (optimization) (Pieter Wuille) 73cbd15 clusterlin: get rid of DepData (optimization) (Pieter Wuille) 7c6f63a clusterlin: pool SetInfos (preparation) (Pieter Wuille) 20e2f3e scripted-diff: rename _rep -> _idx in SFL (Pieter Wuille) 268fcb6 clusterlin: add more Assumes and sanity checks (tests) (Pieter Wuille) d69c9f5 clusterlin: count chunk deps without loop (optimization) (Pieter Wuille) f66fa69 clusterlin: split tx/chunk dep counting (preparation) (Pieter Wuille) 900e459 clusterlin: avoid depgraph argument in SanityCheck (cleanup) (Pieter Wuille) 666b379 clusterlin: fix type to count dependencies (Pieter Wuille) Pull request description: Follow-up to #32545, part of #30289. This contains many of the optimizations that were originally part of #32545 itself. Here is a list of commits and the geometric average of the benchmark timings. Note that these aren't worst cases, but because of the nature of the optimizations here, I do expect them to apply roughly equally to all kinds of clusters. In other words, the relative improvement shown by these numbers should be representative: | commit title | ns per optimal linearization | |:--|--:| | clusterlin: split tx/chunk dep counting (preparation) | 24,760.30 | | clusterlin: count chunk deps without loop (optimization) | 24,677.64 | | scripted-diff: rename _rep -> _idx in SFL | 24,640.08 | | clusterlin: get rid of DepData, reuse sets (optimization) | 24,389.01 | | clusterlin: improve TxData::dep_top_idx type (optimization) | 22,578.58 | | clusterlin: abstract out functions from MergeStep (refactor) | 22,577.15 | | clusterlin: split up OptimizeStep (refactor) | 22,981.11 | | clusterlin: simplify PickMergeCandidate (optimization) | 22,018.63 | | clusterlin: precompute reachable sets (optimization) | 21,194.91 | | clusterlin: make MergeSequence take SetIdx (simplification) | 21,135.60 | | clusterlin: special-case self-merges (optimization) | 20,588.13 | | clusterlin: keep track of active children (optimization) | 13,911.22 | | clusterlin: track suboptimal chunks (optimization) | 13,629.42 | | clusterlin: unidirectional MakeTopological initially (optimization) | 12,796.57 | | clusterlin: inline UpdateChunk into (De)Activate (optimization) | 12,706.35 | | clusterlin: inline GetReachable into Deactivate (optimization) | 12,525.66 | And to show that they apply to all clusters roughly similarly: <img width="1239" height="640" alt="output(1)" src="https://github.com/user-attachments/assets/edd73937-3f87-4582-b2b9-eaed7e6ff352" /> ACKs for top commit: instagibbs: reACK c2fcf25 ajtowns: reACK c2fcf25 Tree-SHA512: e8920f7952a6681b4c1d70c864bd0e9784127ae4fd7c740be3e24a473f72e83544d2293066ed9b3e685b755febd6bbbc6c7da0c9b6ef3699b05eaa8d5bc073a0
fa48d42 test: Stricter unit test (MarcoFalke) fa626bd util: Remove brittle and confusing sp::Popen(std::string) (MarcoFalke) Pull request description: The subprocess Popen call that accepts a full `std::string` has many issues: * It promotes brittle and broken code, where spaces are not properly quoted. Example: #33929 (comment) * The internally used `util::split` function does incorrectly split on spaces, instead of using `shlex.split`. * It is redundant and not needed, because a vector interface already exists. Fix all issues by removing it and just using the vector interface. This pull request should not change any behavior: Note that the command taken from `gArgs.GetArg("-signer", "")` is still passed through the `sp::util::split` helper, just like before. Fixing that is left for a follow-up, so that this change here is basically just a refactor. This also fixes a unit test bug as a side-effect: Fixes #32574. ACKs for top commit: janb84: cr ACK fa48d42 fjahr: Code review ACK fa48d42 hebasto: re-ACK fa48d42. Tree-SHA512: 3d29226977c9392502f9361e2bd42b471ad03761bbf6a94ef6e545cbe4492ad5858da1ac9cc64b2791aacb9b6e6f3c3f63dbcc3a2bf45f6a13b5bc33eddf8c2b
fb3e1bf test: check LoadBlockIndex correctly recomputes invalidity flags (stratospher) 29740c0 validation: remove BLOCK_FAILED_MASK (stratospher) b5b2956 validation: reset BLOCK_FAILED_CHILD to BLOCK_FAILED_VALID when loading from disk (stratospher) 37bc207 validation: stop using BLOCK_FAILED_CHILD (stratospher) 120c631 refactor: use clearer variables in InvalidateBlock() (stratospher) 18f1169 validation: don't update BLOCK_FAILED_VALID to BLOCK_FAILED_CHILD in InvalidateBlock (stratospher) Pull request description: Fixes #32173 even though we have a distinction between `BLOCK_FAILED_VALID` and `BLOCK_FAILED_CHILD` in the codebase, we don't use it for anything. Whenever we check for BlockStatus, we use `BLOCK_FAILED_MASK` which encompasses both of them. Since there is no functional difference between `BLOCK_FAILED_VALID` and `BLOCK_FAILED_CHILD` and it's added code complexity to correctly categorise them (ex: #31405 (comment), #16856 (comment)), we could just remove it. Looking for conceptual feedback on whether it's better to improve handling of `BLOCK_FAILED_CHILD` in the codebase or remove `BLOCK_FAILED_CHILD`. Of less relevance, but it would also fix a `reconsiderblock` crash that could happen in the situation mentioned in #32173 (comment) Similar attempt in the past in #16856 (comment) ACKs for top commit: stickies-v: re-ACK fb3e1bf alexanderwiederin: ACK fb3e1bf mzumsande: re-ACK fb3e1bf Tree-SHA512: e97b739885c40a8c021966438e9767cc02bc183056236d6a8c64f6819347ae70c0fbcd71cc2528917560d9f4fd56aed45faf1b6c75d98de7b08b621693a97fbc
fa4cb96 test: Set assert_debug_log timeout to 0 (MarcoFalke) Pull request description: The `assert_debug_log` helper is meant to be a context manager. However, it has a default timeout of 2 seconds, and can act as a silent polling/wait/sync function. This is confusing and brittle, and leads to intermittent bugs such as #34571. Fix all issues, by setting the default timeout to zero. Then adjust all call sites to either use this correctly like a context manager, or adjust them explicitly to specify a timeout, to document that this is a polling sync function. ACKs for top commit: hodlinator: re-ACK fa4cb96 brunoerg: ACK fa4cb96 Tree-SHA512: 111a45c84327c3afea98fd9f8de13dd7d11969b2309471b4ad21694b290a3734f6e1eda75a41b39613b0995c5b7075298085cea2ca06aa07d4385eb8d72fe95b
6df4a04 qt: Replace three dots with ellipsis (Hennadii Stepanov) Pull request description: From the translator's [comment](https://app.transifex.com/bitcoin/bitcoin/translate/#pl/qt-translation-031x/611215465/) on Transifex: > Source text has 3 dots, instead of 3-dot character. Most commonly used form is the 3-dot character: … You could consider updating it. Top commit has no ACKs. Tree-SHA512: 73ca2d574798b682abca352346fd3664293f14b66c16b01d1a10128e840072fae883b65db14b86e8a4dffdd849563f4c9412d99baeb9735c919d3629ad9799f7
746d8cd qt: Use plurals where necessary (Hennadii Stepanov) Pull request description: This PR fixes pluralization strings in the GUI. These issues were identified during the translation process on Transifex: - https://app.transifex.com/bitcoin/bitcoin/translate/#pl/qt-translation-031x/611215775 - https://app.transifex.com/bitcoin/bitcoin/translate/#pl/qt-translation-031x/611215760 Top commit has no ACKs. Tree-SHA512: 588575bdec3b2408a9ef96a1d383341bc670404c79de3a8ce22ca78a0538b2cc76854cdab4d79f5728126181841743b907ed009cf1dfafbfde7324db6eec5278
24f93c9 release note (Pol Espinasa) 331a527 wallet, rpc:remove settxfee and paytxfee (Pol Espinasa) Pull request description: **Summary** This PR removes the settxfee RPC and paytxfee setting (Bitcoin Core 31.0). These two features were deprecated in #31278. ACKs for top commit: achow101: ACK 24f93c9 w0xlt: reACK 24f93c9 Tree-SHA512: e090f1a72ba2cbeba7c982dd51dfdcf6baf0a164827337cf56fd85f733e143b8d6116b8cd53c59c812cacef193dfa0b101a830fc455e32bf225e8505e7b2a554
24699fe doc: Add initial asmap data documentation (Fabian Jahr) bab085d ci: Use without embedded asmap build option in one ci job (Fabian Jahr) e539344 doc: Expand documentation on asmap feature and tooling (Fabian Jahr) 6244212 init, net: Implement usage of binary-embedded asmap data (Fabian Jahr) 6202b50 build: Generate ip_asn.dat.h during build process (Fabian Jahr) 634cd60 build: Add embedded asmap data (Fabian Jahr) Pull request description: This is the final in a series of PRs that implement the necessary changes for embedding of asmap data into the binary. This last part add the initial asmap data, implements the build changes and adds further documentation. Currently an asmap file needs to be acquired by there user from some location or the user needs to generate one themselves. Then they need to move the file to the right place in datadir or pass the path to the file as `-asmap=PATH` in order to use the asmap feature. The change here allows for builds to embed asmap data into the bitcoind binary which makes it possible to use the feature without handling of the asmap file by the user. If the user starts bitcoind with `-asmap` the embedded data will be used for bucketing of nodes. The data lives in the repository at `src/node/data/ip_asn.dat` and can be replaced with a new version at any time. The idea is that the data should be updated with every release. By default the data at that location is embedded into the binary but there is also a build option to prevent this (`-DWITH_EMBEDDED_ASMAP=OFF`). In this case the original behavior of the `-asmap` option is maintained. ACKs for top commit: achow101: ACK 24699fe sipa: ACK 24699fe hodlinator: ACK 24699fe Tree-SHA512: c2e33dbeea387efdfd3d415432bf8fa64de80f272c1207015ea53b85bb77f5c29f1dae5644513a23c844a98fb0a4bb257bf765f38b15bfc4c41984f0315b4c6a
62e3785 guix: don't export TZ twice (fanquake) badcf1c guix: fix typo in guix-codesign (fanquake) Pull request description: Remove a double export of `TZ` and fix a typo. ACKs for top commit: janb84: ACK 62e3785 hebasto: ACK 62e3785, I have reviewed the code and it looks OK. Tree-SHA512: 6e0b66d20db2b0535bea7d29a28782d0ddd423eaace5f2aa708a227985d465e33def10e9f8ac5ea5482fe640ea0df4ca9df8e9f417bf5d040867564fc60aebd0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
build: Drop ZeroMQ patch for glibc < 2.12 (Hennadii Stepanov)
079df96 build: Drop ZeroMQ patch for Mingw-w64 < 4.0 (Hennadii Stepanov)