Commit graph

26212 commits

Author SHA1 Message Date
Andrew Poelstra
b6af50f657 Merge 5f19155e5b into merged_master (Bitcoin PR #18724) 2020-11-26 01:08:30 +00:00
Andrew Poelstra
b50c37d404 Merge a215c61333 into merged_master (Bitcoin PR #18756) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
6ecadd8588 Merge 29637a5c56 into merged_master (Bitcoin PR #18745) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
870e7097a9 Merge 8c0f86f284 into merged_master (Bitcoin PR #18757) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
1aa7a373b8 Merge 7812889849 into merged_master (Bitcoin PR #18157) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
c8bf2c631b Merge d1aa0ae1ad into merged_master (Bitcoin PR #18712) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
f2f45831bf Merge 85bae24d06 into merged_master (Bitcoin PR #18752) 2020-11-26 01:08:29 +00:00
Andrew Poelstra
1f15eb6ffc Merge d8ca51db5d into merged_master (Bitcoin PR #18589) 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
6990af3107 Merge e890c15e2c into merged_master (Bitcoin PR #18671) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
1ea940a2e2 Merge 4f802e59a0 into merged_master (Bitcoin PR #17509) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
acdc05d56c Merge 47b94a337e into merged_master (Bitcoin PR #18732) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
75c70539ba Merge fb89af26d8 into merged_master (Bitcoin PR #18733) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
4b1d94e736 Merge a7a6f1ff41 into merged_master (Bitcoin PR #18575) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
08d74600ea Merge 5dcb061589 into merged_master (Bitcoin PR #18702) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
d958ef77a9 Merge ce4e1f0282 into merged_master (Bitcoin PR #18553) 2020-11-26 01:08:28 +00:00
Andrew Poelstra
89c3236c58 Merge 9e8e813df5 into merged_master (Bitcoin PR #18410) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
b6c2e38caa Merge acb4fa0741 into merged_master (Bitcoin PR #18665) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
ba95deb36c Merge 19032c750c into merged_master (Bitcoin PR #18612) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
594ded326b Merge be2540a4b9 into merged_master (Elements PR #870) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
87d7c2cf71 Merge c90a9e6fff into merged_master (Bitcoin PR #18713) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
8a080384c6 Merge 7d1a3bda21 into merged_master (Bitcoin PR #18709) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
82c6828181 Merge b6a5dc90bf into merged_master (Bitcoin PR #18384) 2020-11-26 01:08:27 +00:00
Andrew Poelstra
e234a42a47 Merge 9ea4d8326a into merged_master (Bitcoin PR #18704) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
11c3deeb82 Merge 977328338e into merged_master (Bitcoin PR #18721) 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
627184ba0d Merge c4c3f110eb into merged_master (Bitcoin PR #18190) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
8218d55a47 Merge 56d2ff8a8f into merged_master (Bitcoin PR #18676) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
442dfa8bff Merge fc00e651e4 into merged_master (Bitcoin PR #18705) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
873db53fe3 Merge 3be119c0f6 into merged_master (Bitcoin PR #17579) 2020-11-26 01:08:26 +00:00
Andrew Poelstra
222f2e2184 Merge 5e5dd9918e into merged_master (Bitcoin PR #17831) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
2a59ec026d Merge da4cbb7927 into merged_master (Bitcoin PR #18544) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
3d19543983 Merge dc5da7fe7b into merged_master (Bitcoin PR #18691) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
569c68a0f2 Merge f8102d9088 into merged_master (Bitcoin PR #18601) 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
b7307be8cd Merge b470c75847 into merged_master (Bitcoin PR #15761) 2020-11-26 01:08:25 +00:00
Andrew Poelstra
b75123826a Merge a998c5185b into merged_master (Bitcoin PR #18675) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
353b2ff233 Merge b690b24eb2 into merged_master (Bitcoin PR #18633) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
94afad7401 Merge d65631171c into merged_master (Bitcoin PR #18695) 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
9192999921 Merge bbb1ba1814 into merged_master (Bitcoin PR #17219)
This modifies the CreateTransaction loop in a way not remotely worth the complexity,
and includes an absurdly fragile test where I had to add a bunch of trace statements
and tweak pretty-much every single hardcoded number. Not to name names, but it was
Sjors. (In fairness, the PR is a pure simplification of the CreateTransaction logic,
and it wasn't hard to merge even. It was just the test that caused my grief.)

Adapting the "use a dummy CTxDestination in the case that we cannot retrieve one from
the wallet" logic to our `mapScriptChange` map was not trivial. On my first attempt I
incorrectly assigned a positive vout index to the dummy script, which caused us to
call `ReturnDestination` later on the (unused) dummy destination. This is harmless now,
but when descriptor wallets are introduced in #16528, they introduce an edge case where
returning a null destination can incorrectly mark the 0th key of a BIP32 range as
unused. This triggered a test failure much later, in #19504, which uses descriptor
wallets in fundrawtransaction. The bug was that we'd import a descriptor, mark the
first key as being used, lock the wallet, call `fundrawtransaction` on a transaction
that did not require change (incorrectly marking the first key as unused but leaving
it in the descriptor ScriptPubKeyMan's cache), then call `fundrawtransaction` again
on a transaction that *did* require change. The wallet would then incorrectly retrieve
the "unused" key from cache and use it for change, rather than correctly failing and
advising the user that it could not produce change with a locked wallet and empty
keypool. This was not a fun bug to track down.

Another interesting observation is that branch-and-bound uses the CT size-overestimate
for change when trying to create changeless outputs, while our normal dust detection
uses Core's unchanged "an output is 133 bytes" logic. So when BnB is used we're willing
to delete a far bigger change output than we are when we don't use BnB.

Lest you think this works in Core, they're also inconsistent because BnB uses a
normal fee estimate for gauging change cost, while non-BnB uses the discardfee rate.

My advice is to hold your nose, pull stuff in from Core as it comes in, and thanks
to Andy's efforts things are getting better. Don't bother reviewing this too closely.
2020-12-03 00:58:01 +00:00
Andrew Poelstra
ecbc68cc87 Merge 895c71e535 into merged_master (Bitcoin PR #18682) 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
51efdc2d8b Merge d7bdba460c into merged_master (Bitcoin PR #18683) 2020-11-26 01:08:24 +00:00
Andrew Poelstra
86082b9846 Merge 244daa4821 into merged_master (Bitcoin PR #18607) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
2ef6b9b646 Merge ecc2e4e363 into merged_master (Bitcoin PR #18664) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
a1367df7d3 Merge c2e53ff064 into merged_master (Bitcoin PR #18467) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
7acaa0481b Merge c189bfd260 into merged_master (Bitcoin PR #17824) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
0471fb918b Merge 4a71c46905 into merged_master (Bitcoin PR #18670) 2020-11-26 01:08:22 +00:00