Paths

Table of Contentst

Differential D8865

[validation interface] Remove vtxConflicted from BlockConnected
ClosedPublic
Actions

Authored by PiRK on Jan 11 2021, 10:35.

Details

Reviewers

majcosta

Group Reviewers

Restricted Project

Commits

rABCf5d5ae637eb0: [validation interface] Remove vtxConflicted from BlockConnected

Summary

The wallet now uses TransactionRemovedFromMempool to be notified about
conflicted wallet, and no other clients use vtxConflicted.

This is a backport of Core PR17477 [2/6]

https://github.com/bitcoin/bitcoin/pull/17477/commits/cdb893443cc16edf974f099b8485e04b3db1b1d7

Depends on D8864

See D6653 for differences in validationinterface.cpp

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Jan 11 2021, 10:35

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 11 2021, 10:35

PiRK requested review of this revision.Jan 11 2021, 10:35

teamcity edited the summary of this revision. (Show Details)Jan 11 2021, 10:35

PiRK added a child revision: D8866: [validation] Remove conflictedTxs from PerBlockConnectTrace.Jan 11 2021, 10:36

Harbormaster completed remote builds in B14691: Diff 26835.Jan 11 2021, 10:53

majcosta accepted this revision.Jan 11 2021, 11:40

This revision is now accepted and ready to land.Jan 11 2021, 11:40

Closed by commit rABCf5d5ae637eb0: [validation interface] Remove vtxConflicted from BlockConnected (authored by John Newbery <john@johnnewbery.com>, committed by PiRK). · Explain WhyJan 11 2021, 14:20

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABCf5d5ae637eb0: [validation interface] Remove vtxConflicted from BlockConnected.

Revision Contents
Changeset List

Path

Size

src/

index/

base.h

6 lines

base.cpp

5 lines

interfaces/

5 lines

9 lines

6 lines

3 lines

test/

validation_block_tests.cpp

6 lines

validation.cpp

3 lines

validationinterface.h

12 lines

validationinterface.cpp

9 lines

wallet/

wallet.h

4 lines

wallet.cpp

4 lines

zmq/

zmqnotificationinterface.h

6 lines

zmqnotificationinterface.cpp

3 lines

Diff 26850

View Options

src/index/base.h

View Options

src/index/base.cpp

View Options

src/interfaces/chain.h

View Options

src/interfaces/chain.cpp

View Options

src/net_processing.h

View Options

src/net_processing.cpp

View Options

src/test/validation_block_tests.cpp

View Options

src/validation.cpp

View Options

src/validationinterface.h

View Options

src/validationinterface.cpp

View Options

src/wallet/wallet.h

View Options

src/wallet/wallet.cpp

View Options

src/zmq/zmqnotificationinterface.h

View Options

src/zmq/zmqnotificationinterface.cpp

[validation interface] Remove vtxConflicted from BlockConnectedClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26850

src/index/base.h

src/index/base.cpp

src/interfaces/chain.h

src/interfaces/chain.cpp

src/net_processing.h

src/net_processing.cpp

src/test/validation_block_tests.cpp

src/validation.cpp

src/validationinterface.h

src/validationinterface.cpp

src/wallet/wallet.h

src/wallet/wallet.cpp

src/zmq/zmqnotificationinterface.h

src/zmq/zmqnotificationinterface.cpp

[validation interface] Remove vtxConflicted from BlockConnected
ClosedPublic
Actions

Revision Contents
Changeset List