Differential D13116

miner: Remove use of CPFP in CreateNewBlock
ClosedPublic
Actions

Authored by Fabien on Feb 9 2023, 15:03.

Details

Reviewers

sdulfari

Group Reviewers

Restricted Project

Commits

rABC3899ab994eb2: miner: Remove use of CPFP in CreateNewBlock

Summary

This removes the use of CPFP during block generation. Instead, transactions
are evaluated for block inclusion on individual bases by modified fee rate.

Port of bchn#1078.

The code has been largely massaged, with 2 main differences:

We use CTxMempoolEntry at some places instead of the iterator, because this is what our API returns/expects.
The 1-time lambdas are removed to make the code easier to read (with a single exception).

There will be more cleaning up in a follow up.

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Fabien created this revision.Feb 9 2023, 15:03

Herald added a reviewer: Restricted Project. · View Herald TranscriptFeb 9 2023, 15:03

Fabien requested review of this revision.Feb 9 2023, 15:03

teamcity edited the summary of this revision. (Show Details)Feb 9 2023, 15:03

Harbormaster completed remote builds in B21968: Diff 37865.Feb 9 2023, 15:20

Fabien added a child revision: D13121: mempool: Evict transactions by modified feerate.Feb 10 2023, 11:43

It is difficult to provide meaningful feedback since the starting code is difficult to read and reason. This seems to move in the right direction since the logic is simplified and there are more removals than additions. The ideal state is a BlockAssembler that pulls packages "off the top" so to speak from the mempool instead of the selection business that it's doing now.