Andrew Poelstra
18b511b048
Merge 12230529e3 into merged_master (Bitcoin PR #17596 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
a6da77f108
Merge 89a1f7a250 into merged_master (Bitcoin PR #17592 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
e281d39855
Merge e6f167bfdf into merged_master (Bitcoin PR #17569 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
434dfec482
Merge 7463181798 into merged_master (Bitcoin PR #17538 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
0e349f28b2
Merge 239d199667 into merged_master (Bitcoin PR #17574 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
60735c16e6
Merge 2eeacdfe44 into merged_master (Bitcoin PR #17527 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
7a8b5877f2
Merge 9cbd87d8ee into merged_master (Bitcoin PR #17518 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
026518a36f
Merge 2c98e2024d into merged_master (Bitcoin PR #17571 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
d9dcd52ea5
Merge 33c103e2fe into merged_master (Bitcoin PR #17539 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
dbec7759bf
Merge 0b79caf658 into merged_master (Bitcoin PR #17447 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
6da00c1830
Merge 4effd67bf4 into merged_master (Bitcoin PR #17387 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
810568e0fa
Merge a6f5b6f47d into merged_master (Bitcoin PR #17550 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
94e0266084
Merge 2a97d2b1a5 into merged_master (Bitcoin PR #17553 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
58ed0240e9
Merge 7127c31020 into merged_master (Bitcoin PR #17237 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
ba08079170
Merge 0aa72061e5 into merged_master (Bitcoin PR #16944 )
2020-11-14 16:51:47 +00:00
Andrew Poelstra
9239882c43
Merge 8aac85d71e into merged_master (Bitcoin PR #17371 )
2020-11-14 16:51:41 +00:00
Andrew Poelstra
240f03f586
Merge cef87f7a48 into merged_master (Bitcoin PR #17290 )
...
This one took a little bit of work. Basically everywhere that Andy's new code
didn't compile, I looked for a similarly shaped line in the pre-PR diff between
Bitcoin and Elements and adjusted it in the same way. Was pretty typical; all
CAmounts become CAmountMaps, etc.
I then spent about 7 hours chasing down a coin selection failure in the blocksign
functional tests, which ultimately turned out to be a Core issue. I added a
stopgap fix (commented, search for "stopgap" in wallet.cpp), and opened the issue
https://github.com/bitcoin/bitcoin/issues/20347
There was also a bug where we were not estimating change output sizes correctly
in case we had massive blinded outputs, which I had to fix to get the functional
tests to pass.
2020-11-10 21:59:56 +00:00
Andrew Poelstra
f1f5409705
Merge bb862d7864 into merged_master (Bitcoin PR #14384 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
bbc86542de
Merge 03f6f408ab into merged_master (Bitcoin PR #17545 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
bfaa86212b
Merge b983e7e172 into merged_master (Bitcoin PR #17542 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
8746cbf50b
Merge a739d207a3 into merged_master (Bitcoin PR #17519 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
9fdb7c094a
Merge 69a6f1ad1f into merged_master (Bitcoin PR #17513 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
fcc3e6c04c
Merge ae6943620a into merged_master (Bitcoin PR #17407 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
01f4eb2404
Merge 5ff798c39b into merged_master (Bitcoin PR #17439 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
5c15120d59
Merge b7bc9b8330 into merged_master (Bitcoin PR #17444 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
d575b88283
Merge 41162c0ba0 into merged_master (Bitcoin PR #17423 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
98572cad67
Merge a8d9f7dfa7 into merged_master (Bitcoin PR #17420 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
2720aad76b
Merge 3671c5721d into merged_master (Bitcoin PR #17532 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
247ac78e37
Merge 76e777df83 into merged_master (Bitcoin PR #16161 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
cc8547e53a
Merge fe27ef834e into merged_master (Elements PR #786 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
0fcd6cfb21
Merge 26744ae189 into merged_master (Bitcoin PR #17446 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
38f8a01825
Merge 36191a8bb5 into merged_master (Bitcoin PR #12461 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
c2c76d3738
Merge 6496bb87af into merged_master (Bitcoin PR #17008 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
db065548fc
Merge b4a1da9ef8 into merged_master (Bitcoin PR #17515 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
4cc150cd4a
Merge e1df922132 into merged_master (Bitcoin PR #17497 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
9871fbe71e
Merge 92db280817 into merged_master (Bitcoin PR #17411 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
a648df2425
Merge 2065ef66ee into merged_master (Bitcoin PR #17265 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
ae457ceaeb
Merge 30521302f9 into merged_master (Bitcoin PR #17136 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
d11943ce50
Merge 397c6d32c8 into merged_master (Bitcoin PR #17503 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
a6974cb1af
Merge 6fde676f64 into merged_master (Bitcoin PR #16669 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
f9acc8330d
Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
6c4c8e6695
Merge 63fac52f31 into merged_master (Bitcoin PR #17328 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
21cb153472
Merge 24647a09e7 into merged_master (Bitcoin PR #17470 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
02ab9f3180
Merge 0bb37e437e into merged_master (Bitcoin PR #17270 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
00e4058715
Merge 1baf7d1819 into merged_master (Bitcoin PR #17466 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
7d48dceb4a
Merge 94f0749f91 into merged_master (Bitcoin PR #17436 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
38292491a5
Merge 7dbc33f617 into merged_master (Bitcoin PR #17499 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
424e279937
Merge b90dad5143 into merged_master (Bitcoin PR #17486 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
2037872d1e
Merge 1ed3e071df into merged_master (Bitcoin PR #17455 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
061d0ea050
Merge f92e750eb4 into merged_master (Bitcoin PR #17480 )
2020-11-09 23:10:11 +00:00
