Page MenuHomePhabricator
Differential D3497

wallet: Disallow abandon of conflicted txes
ClosedPublic
Actions

Authored by Fabien on Jul 1 2019, 12:08.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rSTAGING59a64c271511: wallet: Disallow abandon of conflicted txes
rABC59a64c271511: wallet: Disallow abandon of conflicted txes
Summary
Abandon transactions that are already conflicted is a noop, so don't try
and return false/throw instead.

Backport of core PR12282
https://github.com/bitcoin/bitcoin/pull/12282/files

Test Plan
make check
./test/functional/test_runner.py wallet_abandonconflict

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Fabien created this revision.Jul 1 2019, 12:08
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 1 2019, 12:08
Herald added a reviewer: deadalnix. · View Herald Transcript
teamcity added a comment.Jul 1 2019, 12:08

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

Harbormaster failed remote builds in B6583: Diff 9840!Jul 1 2019, 12:11
teamcity added a comment.Jul 1 2019, 12:11

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

deadalnix accepted this revision.Jul 1 2019, 12:23
This revision is now accepted and ready to land.Jul 1 2019, 12:23
Fabien updated this revision to Diff 9845.Jul 1 2019, 12:41

Rebase to make the CI tests green

teamcity added a comment.Jul 1 2019, 12:41

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

teamcity added a comment.Jul 1 2019, 12:48

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

Harbormaster completed remote builds in B6586: Diff 9845.Jul 1 2019, 12:48
Closed by commit rABC59a64c271511: wallet: Disallow abandon of conflicted txes (authored by MarcoFalke <falke.marco@gmail.com>, committed by Fabien). · Explain WhyJul 1 2019, 13:17
This revision was automatically updated to reflect the committed changes.
Fabien added a commit: rABC59a64c271511: wallet: Disallow abandon of conflicted txes.
Fabien added a commit: rSTAGING59a64c271511: wallet: Disallow abandon of conflicted txes.Sep 19 2019, 00:47

Revision Contents
Changeset List

PathSize
src/
wallet/
3 lines
4 lines
test/
functional/
11 lines

Diff 9850

View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

test/functional/wallet_abandonconflict.py

Loading...