mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 14:38:29 +01:00
Merge bitcoin/bitcoin#28762: MiniMiner changes for package linearization
d9cc99d04e[test] MiniMiner::Linearize and manual construction (glozow)dfd6a3788c[refactor] unify fee amounts in miniminer_tests (glozow)f4b1b24a3b[MiniMiner] track inclusion order and add Linearize() function (glozow)004075963f[test] add case for MiniMiner working with negative fee txns (glozow)fe6332c0ba[MiniMiner] make target_feerate optional (glozow)5a83f55c96[MiniMiner] allow manual construction with non-mempool txns (glozow)e3b2e630b2[refactor] change MiniMinerMempoolEntry ctor to take values, update includes (glozow)4aa98b79b2[lint] update expected boost includes (glozow) Pull request description: This is part of #27463. It splits off the `MiniMiner`-specific changes from #26711 for ease of review, as suggested in https://github.com/bitcoin/bitcoin/pull/26711#issuecomment-1786392253. - Allow using `MiniMiner` on transactions that aren't in the mempool. - Make `target_feerate` param of `BuildMockTemplate` optional, meaning "don't stop building the template until all the transactions have been selected." - Add clarification for how this is different from `target_feerate=0` (https://github.com/bitcoin/bitcoin/pull/26711#discussion_r1377019133) - Track the order in which transactions are included in the template to get the "linearization order" of the transactions. - Tests Reviewers can take a look at #26711 to see how these functions are used to linearize the `AncestorPackage` there. ACKs for top commit: TheCharlatan: ACKd9cc99d04ekevkevinpal: reACK [d9cc99d](d9cc99d04e) achow101: re-ACKd9cc99d04eTree-SHA512: 32b80064b6679536ac573d674825c5ca0cd6245e49c2fd5eaf260dc535335a57683c74ddd7ce1f249b5b12b2683de4362a7b0f1fc0814c3b3b9f14c682665583
This commit is contained in:
@@ -23,6 +23,7 @@ EXCLUDED_DIRS = ["contrib/devtools/bitcoin-tidy/",
|
||||
]
|
||||
|
||||
EXPECTED_BOOST_INCLUDES = ["boost/date_time/posix_time/posix_time.hpp",
|
||||
"boost/multi_index/detail/hash_index_iterator.hpp",
|
||||
"boost/multi_index/hashed_index.hpp",
|
||||
"boost/multi_index/identity.hpp",
|
||||
"boost/multi_index/indexed_by.hpp",
|
||||
@@ -30,6 +31,7 @@ EXPECTED_BOOST_INCLUDES = ["boost/date_time/posix_time/posix_time.hpp",
|
||||
"boost/multi_index/sequenced_index.hpp",
|
||||
"boost/multi_index/tag.hpp",
|
||||
"boost/multi_index_container.hpp",
|
||||
"boost/operators.hpp",
|
||||
"boost/process.hpp",
|
||||
"boost/signals2/connection.hpp",
|
||||
"boost/signals2/optional_last_value.hpp",
|
||||
|
||||
Reference in New Issue
Block a user