Commit graph

26477 commits

Author SHA1 Message Date
Andrew Poelstra
a88d2747bb Merge 551dc7f664 into merged_master (Bitcoin PR #18806) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
e991e7713b Merge d96fdc2a39 into merged_master (Bitcoin PR #18741) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
e5faae4af6 Merge 60091d20f9 into merged_master (Bitcoin PR #9381) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
d1fbd3b167 Merge fbd522721c into merged_master (Bitcoin PR #18885) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
ca6053c5e5 Merge 52ce396b2a into merged_master (Bitcoin PR #18879) 2020-11-26 01:08:38 +00:00
Andrew Poelstra
5a58efd0a5 Merge ec79b5f86b into merged_master (Bitcoin PR #18782) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
028afdac4a Merge e727c2bdca into merged_master (Bitcoin PR #18088) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
a6d19d39c7 Merge b549cb1bd2 into merged_master (Bitcoin PR #18443) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
d4711bdf91 Merge 23c926d859 into merged_master (Bitcoin PR #18699) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
8c572c898e Merge 42fd503819 into merged_master (Bitcoin PR #18786) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
315d2556f2 Merge 0a729b0e42 into merged_master (Bitcoin PR #18783) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
335af1e4c4 Merge 74a1152f25 into merged_master (Bitcoin PR #18859) 2020-11-26 01:08:36 +00:00
Andrew Poelstra
783673416d Merge afa577c323 into merged_master (Bitcoin PR #15768) 2020-11-26 01:08:36 +00:00
Andrew Poelstra
e58322b8aa Merge 2e6a16b968 into merged_master (Bitcoin PR #18855) 2020-11-26 01:08:36 +00:00
Andrew Poelstra
cdc4c006f4 Merge cce034b028 into merged_master (Bitcoin PR #18839) 2020-11-26 01:08:36 +00:00
Andrew Poelstra
c0fda0cc05 Merge ddc0a600b3 into merged_master (Bitcoin PR #18617)
For reasons I do not really grok, this PR changes the timing behavior of the
functional tests to reliably expose a deadlock in the claimpegin RPC that has
existed since the 0.17 rebase.

The mechanism is: in `claimpegin` in src/wallet/rpcwallet.cpp:5873, we call
`AcceptToMemoryPoolWorker`. This requires cs_main to be locked, which it is
not (contrast Core's `testmempoolaccept` RPC, which similarly calls
`AcceptToMemoryPoolWorker` from the RPC thread, and locks cs_main immediately
before).

We do *say* that it is locked, in the `LockAssertion` one the line above, but
this was added in ad3d496d78 during the 0.17
rebase (PR #620), apparently to shut up some linter on OSX, and as near as I
can tell it was never true.

Anyway, `AcceptToMemoryPoolWorker` calls through a couple layers which assume
cs_main is locked, to `AcceptSingleTransaction`, which locks m_pool.cs on line
src/validation.cpp:1101. It then calls `PreChecks`, which on line 784 calls
::ChainActive(), which _actually_ locks cs_main, though only briefly. This
line is the deadlock, because we locked m_pool.cs followed by cs_main...

...meanwhile, in src/net_processing.cpp, we lock cs_main at the top of the
`PeerLogicValidation::SendMessages` loop (src/net_processing.cpp:3628). In the
same loop, in the `feefilter` message processing, we call CTxMemPool::GetMinFee
(src/net_processing.cpp:4137), which locks m_pool.cs. Deadlock.

Anyway, that explains the change to locking behavior that I added to an
otherwise test-only PR.
2020-11-26 01:08:36 +00:00
Andrew Poelstra
9ea76b54aa Merge 68ef9523d1 into merged_master (Bitcoin PR #18413) 2020-11-26 01:08:36 +00:00
Andrew Poelstra
2d0adcc65b Merge 844d2070a2 into merged_master (Bitcoin PR #18828) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
4414990576 Merge 608359b071 into merged_master (Bitcoin PR #16426) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
d4125a30a6 Merge e5b9308920 into merged_master (Bitcoin PR #18829) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
0d9a090459 Merge ef8ef31fd2 into merged_master (Bitcoin PR #18775) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
503f615f81 Merge a66ba6d029 into merged_master (Bitcoin PR #18576) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
ebfbe923c7 Merge 00c1a4d9a9 into merged_master (Bitcoin PR #18809) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
bbb81f8d58 Merge cf5e3be5ea into merged_master (Bitcoin PR #18825) 2020-11-26 01:08:35 +00:00
Andrew Poelstra
0a22e1a6e6 Merge 64673b1037 into merged_master (Bitcoin PR #18780) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
b86c297529 Merge afed2e98b0 into merged_master (Bitcoin PR #18810) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
2cee434502 Merge 35ef3c15ef into merged_master (Bitcoin PR #18591) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
7ba9c3d6ea Merge 63d5ed2fc4 into merged_master (Bitcoin PR #18437) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
87ae5b27e7 Merge 36c0abd8f6 into merged_master (Bitcoin PR #18726) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
cd480d07b3 Merge 95a9165016 into merged_master (Bitcoin PR #18736) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
5ae752cb8f Merge 0f204dd3f2 into merged_master (Bitcoin PR #18727) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
252c3a223c Merge 978c5a2122 into merged_master (Bitcoin PR #18485) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
a47016dcdb Merge ab91a0e0fc into merged_master (Bitcoin PR #18798) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
733d5cf974 Merge e302830fae into merged_master (Bitcoin PR #18774) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
c6d6e49475 Merge af2ec6b037 into merged_master (Bitcoin PR #18759) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
9df3a34c65 Merge ecca2ea1d5 into merged_master (Bitcoin PR #18785) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
e5f1b2cdaa Merge 0ef0d33f75 into merged_master (Bitcoin PR #18038) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
48d43d0a8a Merge ba348dbc51 into merged_master (Bitcoin PR #18805) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
8ef5b8bb7f Merge 6a60bfc76c into merged_master (Bitcoin PR #18765) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
5e18722f6a Merge a483ffd689 into merged_master (Bitcoin PR #18735) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
fc6627d3b8 Merge 6e3fc7492a into merged_master (Bitcoin PR #18663) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
f9443bf23f Merge ad04130742 into merged_master (Bitcoin PR #18799) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
7f7cc92e27 Merge 9fb95ae8e3 into merged_master (Bitcoin PR #18779) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
e0c28ff3f2 Merge b9ba76f1c9 into merged_master (Bitcoin PR #18769) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
60b8726cbb Merge 65fb3dfc8d into merged_master (Bitcoin PR #18556) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
da37cc0993 Merge ac21090f20 into merged_master (Bitcoin PR #18629) 2020-11-26 01:08:32 +00:00
Andrew Poelstra
bd525a9dcd Merge 5352d14b37 into merged_master (Bitcoin PR #18778) 2020-11-26 01:08:31 +00:00
Andrew Poelstra
91aca85a2a Merge 8bdb2134fc into merged_master (Bitcoin PR #18777) 2020-11-26 01:08:31 +00:00
Andrew Poelstra
1c12ae1719 Merge eef90c14ed into merged_master (Bitcoin PR #16528)
This is the 43-commit descriptor wallet PR. It was remarkably easy to merge, given
its magnitude. With this commit Elements supports importing Bitcoin descriptors
and deriving (Bitcoin) addresses, though of course it does not support blinding
yet. That is a post-rebase project.

The material changes were:

1. Changing constants in the tests (super annoying but nothing surprising)

2. Adding a missing "skip if this coin is not ours" check in src/script/sign.cpp
   which was causing us to erroneously remove existing witnesses from transactions.
   This wasn't a problem before this commit since we would only ask specific
   scriptpubkeymans to sign, and we'd never ask any to sign inputs we didn't
   own. Andy simplified the logic here to always try every scriptpubkeyman,
   which means they have to play a bit more nicely with each other.

Other than that, this was a big diff with many conflicts but literally all of
them were "we both added code" and the resolution was to take both sides.
2020-11-26 01:08:31 +00:00
Andrew Poelstra
7f37d52c1a Merge ae32e5ce3d into merged_master (Bitcoin PR #18669) 2020-11-26 01:08:31 +00:00