Commit graph

728 commits

Author SHA1 Message Date
Andrew Poelstra
d5082ffa37 Merge 39afe5b1c6 into merged_master (Bitcoin PR #19082) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
67f55c5173 Merge 234fabab90 into merged_master (Bitcoin PR #18210) 2020-11-26 01:08:57 +00:00
Andrew Poelstra
927a580a42 Merge 07d0e0d59f into merged_master (Bitcoin PR #19044) 2020-11-26 01:08:55 +00:00
Andrew Poelstra
b23acd5046 Merge dec067f5a0 into merged_master (Bitcoin PR #18965) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
531cdf3ca5 Merge 826fe9c667 into merged_master (Bitcoin PR #18807) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
29f0416f1c Merge e478b11db0 into merged_master (Bitcoin PR #19110) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
d79ece79c4 Merge 4af01b37d4 into merged_master (Bitcoin PR #19060) 2020-11-26 01:08:50 +00:00
Andrew Poelstra
62a9d9569c Merge 7d32cce3e7 into merged_master (Bitcoin PR #19010) 2020-11-26 01:08:50 +00:00
Andrew Poelstra
1fca452fcd Merge b5c423c48e into merged_master (Bitcoin PR #19014) 2020-11-26 01:08:49 +00:00
Andrew Poelstra
d0b2badc94 Merge ad3a61c5f5 into merged_master (Bitcoin PR #18895) 2020-11-26 01:08:48 +00:00
Andrew Poelstra
f785ad353f Merge 99e5e21b38 into merged_master (Bitcoin PR #19023) 2020-11-26 01:08:48 +00:00
Andrew Poelstra
b29efd4af5 Merge 3eda7ea9ba into merged_master (Bitcoin PR #18764) 2020-11-26 01:08:47 +00:00
Andrew Poelstra
dccd3297b0 Merge 362f9c60a5 into merged_master (Bitcoin PR #18986) 2020-11-26 01:08:45 +00:00
Andrew Poelstra
6a447f792f Merge f8123d483c into merged_master (Bitcoin PR #18952) 2020-11-26 01:08:45 +00:00
Andrew Poelstra
098fff6e44 Merge a9a6d946e4 into merged_master (Bitcoin PR #18888) 2020-11-26 01:08:43 +00:00
Andrew Poelstra
9ac62395d7 Merge e45fb7e0d2 into merged_master (Bitcoin PR #18877) 2020-11-26 01:08:42 +00:00
Andrew Poelstra
34d072006e Merge 376294cde6 into merged_master (Bitcoin PR #18866) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
e42dc5493b Merge 7bcc42b403 into merged_master (Bitcoin PR #18873) 2020-11-26 01:08:39 +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
2d0adcc65b Merge 844d2070a2 into merged_master (Bitcoin PR #18828) 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
733d5cf974 Merge e302830fae into merged_master (Bitcoin PR #18774) 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
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
b066f21047 Merge fd48e7ad99 into merged_master (Bitcoin PR #18585) 2020-11-26 01:08:30 +00:00
Andrew Poelstra
c8bf2c631b Merge d1aa0ae1ad into merged_master (Bitcoin PR #18712) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
26e416f0b6 Merge 64139803f1 into merged_master (Bitcoin PR #18690) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
acdc05d56c Merge 47b94a337e into merged_master (Bitcoin PR #18732) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
e234a42a47 Merge 9ea4d8326a into merged_master (Bitcoin PR #18704) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
042d703f0b Merge 4ad6144ed0 into merged_master (Bitcoin PR #18672) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
3d19543983 Merge dc5da7fe7b into merged_master (Bitcoin PR #18691) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
96af3c5b23 Merge d2882a012b into merged_master (Bitcoin PR #18610) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
353b2ff233 Merge b690b24eb2 into merged_master (Bitcoin PR #18633) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
11125c2961 Merge 6ae99aab5d into merged_master (Bitcoin PR #18692) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
a9956489b2 Merge c54295c1a2 into merged_master (Bitcoin PR #18641) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
c67b9f0c92 Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
79067914d8 Merge a2b282c9d0 into merged_master (Bitcoin PR #18609) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
9146c7899d Merge 59d6249290 into merged_master (Bitcoin PR #18593) 2020-11-26 01:08:17 +00:00
Andrew Poelstra
8078d38fd4 Merge 081dcbde66 into merged_master (Bitcoin PR #18561) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
1ff8f7acff Merge c0b389b335 into merged_master (Bitcoin PR #18484) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
f3f386ffee Merge cf21293ef7 into merged_master (Bitcoin PR #18515) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
87d0e26d18 Merge 67a72466e1 into merged_master (Bitcoin PR #18247) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
15d1e10a14 Merge d2db25233c into merged_master (Bitcoin PR #18474) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
f8e3be6cb7 Merge d52ba21dff into merged_master (Bitcoin PR #18481) 2020-11-26 01:08:06 +00:00
Andrew Poelstra
9587ad280d Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
e1f1d5dc40 Merge 67de1ee8bc into merged_master (Bitcoin PR #18378) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
42372ae3a5 Merge ad04f0d8a5 into merged_master (Bitcoin PR #17319) 2020-11-26 01:07:57 +00:00
Andrew Poelstra
7bc1e4d084 Merge 24a727e23e into merged_master (Bitcoin PR #18255) 2020-11-26 01:07:53 +00:00
Andrew Poelstra
bca8bce3b7 Merge caa2f3af29 into merged_master (Bitcoin PR #12134) 2020-11-26 01:07:42 +00:00