Commit graph

29954 commits

Author SHA1 Message Date
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
Andrew Poelstra
4b58cd7c0a Merge 0856c15706 into merged_master (Bitcoin PR #18262) 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
e6c67f94cc Merge 969ee85494 into merged_master (Bitcoin PR #18662) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
d1bc380279 Merge 8f2497941e into merged_master (Bitcoin PR #18598) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
2119e3a935 Merge 447f8676b2 into merged_master (Bitcoin PR #18667) 2020-11-26 01:08:22 +00:00
Andrew Poelstra
30adb9243b Merge d8dfcea5d9 into merged_master (Bitcoin PR #17669) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
cf039bc4dd Merge 18fadbafcc into merged_master (Elements PR #863) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
90d6e1ff84 Merge a19c972098 into merged_master (Elements PR #865) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
bf709b0d4b Merge f4c0ad4aef into merged_master (Bitcoin PR #18660) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
fd4ce54b94 Merge 661e8df1b6 into merged_master (Bitcoin PR #18653) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
2bf8400edc Merge 79b0459648 into merged_master (Bitcoin PR #18650) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
1b585cf0c3 Merge e16718a8b3 into merged_master (Bitcoin PR #18401) 2020-11-26 01:08:21 +00:00
Andrew Poelstra
ce73c2d3ba Merge af23572fe7 into merged_master (Elements PR #860) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
2016bea80a Merge 544709763e into merged_master (Bitcoin PR #18571)
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
2020-11-26 01:08:20 +00:00
Andrew Poelstra
713ff5a8b6 Merge e84a5f0004 into merged_master (Bitcoin PR #18645) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
5f636536ce Merge 6db8ef2431 into merged_master (Bitcoin PR #18640) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
82a7313818 Merge 4bd6bc5cb4 into merged_master (Bitcoin PR #18615) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
c63e500dfd Merge 20c0e2e0f0 into merged_master (Bitcoin PR #18628) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
0593f0267b Merge 18f11fb24b into merged_master (Bitcoin PR #18646) 2020-11-26 01:08:20 +00:00
Andrew Poelstra
70749cc743 Merge e831f18b1e into merged_master (Bitcoin PR #18619) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
3fc4c319be Merge 5447d57bff into merged_master (Bitcoin PR #18624) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
93b6aa5c70 Merge ae486b263c into merged_master (Bitcoin PR #17929) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
8df275dcb1 Merge 903be99ee6 into merged_master (Bitcoin PR #18621) 2020-11-26 01:08:19 +00:00
Andrew Poelstra
e8fb7a235f Merge 4d793bcfe8 into merged_master (Bitcoin PR #18632) 2020-11-26 01:08:19 +00:00