Commit graph

3031 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
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
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
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
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
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
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
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
a9956489b2 Merge c54295c1a2 into merged_master (Bitcoin PR #18641) 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
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
bc49e22548 Merge f0d97cdf70 into merged_master (Elements PR #861) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
fd4ce54b94 Merge 661e8df1b6 into merged_master (Bitcoin PR #18653) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
c63e500dfd Merge 20c0e2e0f0 into merged_master (Bitcoin PR #18628) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
0dc35ccd83 Merge 6110ae8326 into merged_master (Bitcoin PR #18451) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
3ad3ea7e75 Merge e28e5353c4 into merged_master (Bitcoin PR #18545) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
c67b9f0c92 Merge d9fd7b5a67 into merged_master (Bitcoin PR #18596) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
0f61201649 Merge 4d26312c17 into merged_master (Bitcoin PR #18597) 2020-11-26 01:08:18 +00:00
Andrew Poelstra
bea14c785a Merge c49971f3c9 into merged_master (Bitcoin PR #18584) 2020-11-26 01:08:17 +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
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
f3fc8e9b77 Merge 6ab96ec546 into merged_master (Bitcoin PR #18574) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
63a52d3633 Merge 29893ec875 into merged_master (Bitcoin PR #18454) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
8078d38fd4 Merge 081dcbde66 into merged_master (Bitcoin PR #18561) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
10f14d1162 Merge 87374d80a7 into merged_master (Bitcoin PR #18566) 2020-11-26 01:08:14 +00:00
Andrew Poelstra
0a87d878fa Merge 63dad67348 into merged_master (Bitcoin PR #18546) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
d4beddb515 Merge abc145c9a4 into merged_master (Bitcoin PR #18543) 2020-11-26 01:08:12 +00:00
Andrew Poelstra
886accd6fa Merge 54d5ba3d9c into merged_master (Bitcoin PR #18540) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
1ff8f7acff Merge c0b389b335 into merged_master (Bitcoin PR #18484) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
9280951289 Merge 425a7f900e into merged_master (Bitcoin PR #18516) 2020-11-26 01:08:11 +00:00
Andrew Poelstra
3e35839fe6 Merge 299544f9c5 into merged_master (Bitcoin PR #18534) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
f3f386ffee Merge cf21293ef7 into merged_master (Bitcoin PR #18515) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
da30c131c3 Merge 94fd4a56ed into merged_master (Bitcoin PR #18496) 2020-11-26 01:08:10 +00:00
Andrew Poelstra
4fd24473ed Merge 490ae0e87b into merged_master (Bitcoin PR #18520) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
9e86b25395 Merge a3b61cf641 into merged_master (Bitcoin PR #18509) 2020-11-26 01:08:09 +00:00
Andrew Poelstra
61b65dbb0c Merge ff53433fe4 into merged_master (Bitcoin PR #18494) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
44f30e687f Merge 6bdd515ccf into merged_master (Bitcoin PR #16923) 2020-11-26 01:08:08 +00:00