Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails.
ClosedPublic
Actions

Authored by nakihito on Dec 16 2019, 19:26.

Details

Reviewers

deadalnix
Fabien
jasonbcox
markblundeberg

Group Reviewers

Restricted Owners Package	(Owns No Changed Paths)
Restricted Project

Commits

rSTAGING38a81f1665db: Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails.
rABC38a81f1665db: Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails.

Summary

6ef86c9 Do not un-mark fInMempool on wallet txn if ATMP fails. (Matt Corallo)

Pull request description:

Irrespective of the failure reason, un-marking fInMempool
out-of-order is incorrect - it should be unmarked when
TransactionRemovedFromMempool fires.

Clean up of #11839, which I think was the wrong fix.

Tree-SHA512: 580731297eeac4c4c99ec695e15b09febf62249237bc367fcd1830fc811d3166f9336e7aba7f2f6f8601960984ae22cebed781200db0f04e7cd2008db1a83f64

Backport of Core PR11866
https://github.com/bitcoin/bitcoin/pull/11866/

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

nakihito created this revision.Dec 16 2019, 19:26

Owners added a reviewer: Restricted Owners Package.Dec 16 2019, 19:26

Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 16 2019, 19:26

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8570: Diff 14875.Dec 16 2019, 19:40

Fabien accepted this revision.Dec 17 2019, 10:34

This revision is now accepted and ready to land.Dec 17 2019, 10:34

markblundeberg accepted this revision.Dec 17 2019, 10:49

Closed by commit rABC38a81f1665db: Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails. (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by nakihito). · Explain WhyDec 17 2019, 18:42

This revision was automatically updated to reflect the committed changes.

nakihito added a commit: rABC38a81f1665db: Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails..

nakihito added a commit: rSTAGING38a81f1665db: Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails..Apr 7 2020, 22:06

Revision Contents
Changeset List

Path

Size

src/

wallet/

wallet.cpp

7 lines

Diff 14925

View Options

Merge #11866: Do not un-mark fInMempool on wallet txn if ATMP fails.ClosedPublicActions