Differential D3711

Merge #12118: Sort mempool by min(feerate, ancestor_feerate)
ClosedPublic
Actions

Authored by nakihito on Jul 22 2019, 23:24.

Tags

None

Subscribers

None

Details

Reviewers

deadalnix
Fabien
jasonbcox

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rSTAGINGe62ca5b8f82e: Merge #12118: Sort mempool by min(feerate, ancestor_feerate)
rABCe62ca5b8f82e: Merge #12118: Sort mempool by min(feerate, ancestor_feerate)

Summary

0a22a52 Use mempool's ancestor sort in transaction selection (Suhas Daftuar)
7abfa53 Add test for new ancestor feerate sort behavior (Suhas Daftuar)
9a51319 Sort mempool by min(feerate, ancestor_feerate) (Suhas Daftuar)
6773f92 Refactor CompareTxMemPoolEntryByDescendantScore (Suhas Daftuar)

Pull request description:

This more closely approximates the desirability of a given transaction for
mining, and should result in less re-sorting when transactions get removed from
the mempool after being mined.

I measured this as approximately a 5% speedup in removeForBlock.

Tree-SHA512: ffa36b567c5dfe3e8908c545a459b6a5ec0de26e7dc81b1050dd235cac9046564b4409a3f8c5ba97bd8b30526e8fec8f78480a912e317979467f32305c3dd37b

Backport of Core PR12118
https://github.com/bitcoin/bitcoin/pull/12118/

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

nakihito created this revision.Jul 22 2019, 23:24

Owners added a reviewer: Restricted Owners Package.Jul 22 2019, 23:24

Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 22 2019, 23:24

nakihito planned changes to this revision.Jul 22 2019, 23:24

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster completed remote builds in B6913: Diff 10391.Jul 22 2019, 23:34

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

nakihito requested review of this revision.Jul 31 2019, 18:45

nakihito added inline comments.

src/test/mempool_tests.cpp
597 ↗	(On Diff #10391)	Added because of https://reviews.bitcoinabc.org/D1615

nakihito added a child revision: D3789: Merge #12225: Mempool cleanups.Jul 31 2019, 19:06

deadalnix accepted this revision.Aug 4 2019, 08:01

This revision is now accepted and ready to land.Aug 4 2019, 08:01

Closed by commit rABCe62ca5b8f82e: Merge #12118: Sort mempool by min(feerate, ancestor_feerate) (authored by nakihito). · Explain WhyAug 5 2019, 20:03

This revision was automatically updated to reflect the committed changes.

Nico Guiton <nico@bitframe.org> added a commit: rABCe62ca5b8f82e: Merge #12118: Sort mempool by min(feerate, ancestor_feerate).

Nico Guiton <nico@bitframe.org> added a commit: rSTAGINGe62ca5b8f82e: Merge #12118: Sort mempool by min(feerate, ancestor_feerate).Sep 19 2019, 01:38

Revision Contents
Changeset List

Path

Size

src/

23 lines

3 lines

test/

mempool_tests.cpp

19 lines

72 lines

Diff 10616

src/miner.h

Loading...

src/miner.cpp

Loading...

src/test/mempool_tests.cpp

Loading...

src/txmempool.h

Loading...