Page MenuHomePhabricator
Differential D3165

Fix wallet RPC race by waiting for callbacks in sendrawtransaction
ClosedPublic
Actions

Authored by deadalnix on May 31 2019, 07:00.

Details

Reviewers
jasonbcox
Group Reviewers
Restricted Project
Commits
rSTAGING3e582969e5b9: Fix wallet RPC race by waiting for callbacks in sendrawtransaction
rABC3e582969e5b9: Fix wallet RPC race by waiting for callbacks in sendrawtransaction
Summary

This is partial backport of Core PR10286 : https://github.com/bitcoin/bitcoin/pull/10286/commits/cb06edf938302166030db19017c27889ea5b10b6

This patch was merged with the following bug fix:

Fix sendrawtransaction hang when sending a tx already in mempool

This is a backport of Core PR11738 : https://github.com/bitcoin/bitcoin/pull/11738

Test Plan
make check
./test/functional/test_runner.py --extended

Diff Detail

Repository
rABC Bitcoin ABC
Branch
fixrpcrace
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 6090
Build 10229: Bitcoin ABC Buildbot (legacy)
Build 10228: arc lint + arc unit

Event Timeline

deadalnix created this revision.May 31 2019, 07:00
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 31 2019, 07:01
teamcity added a comment.May 31 2019, 07:02

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

teamcity added a comment.May 31 2019, 07:16

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

Harbormaster completed remote builds in B6090: Diff 9035.May 31 2019, 07:16
jasonbcox requested changes to this revision.May 31 2019, 17:35
jasonbcox added a subscriber: jasonbcox.
jasonbcox added inline comments.
src/rpc/rawtransaction.cpp
1347

else was removed here. While functionally equivalent, this doesn't match the PR and is only a potential merge conflict hazard later on. I'd prefer to keep these sorts of changes until after 2018 backports are completed.

This revision now requires changes to proceed.May 31 2019, 17:35
deadalnix requested review of this revision.May 31 2019, 17:58
deadalnix added inline comments.
src/rpc/rawtransaction.cpp
1347

Having completely unclear control flow is exactly how https://github.com/bitcoin/bitcoin/pull/11738 happened in the first place.

jasonbcox accepted this revision.May 31 2019, 21:39
This revision is now accepted and ready to land.May 31 2019, 21:39
Closed by commit rABC3e582969e5b9: Fix wallet RPC race by waiting for callbacks in sendrawtransaction (authored by Matt Corallo <git@bluematt.me>, committed by deadalnix). · Explain WhyJun 1 2019, 15:48
This revision was automatically updated to reflect the committed changes.
deadalnix added a commit: rABC3e582969e5b9: Fix wallet RPC race by waiting for callbacks in sendrawtransaction.
deadalnix added a commit: rSTAGING3e582969e5b9: Fix wallet RPC race by waiting for callbacks in sendrawtransaction.Sep 18 2019, 23:56
Fabien mentioned this in T437: Backport core PR 11738.Jan 29 2020, 07:11

Revision Contents
Changeset List

PathSize
src/
rpc/
79 lines

Diff 9035

View Options

src/rpc/rawtransaction.cpp

Loading...