Andrew Poelstra
e536f17cb2
Merge bce44089db into merged_master (Bitcoin PR #17547 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
4522262447
Merge e354db7877 into merged_master (Bitcoin PR #17637 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
1b4ef5d628
Merge 54b12e425b into merged_master (Bitcoin PR #17555 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
255c478c5a
Merge 1fdaa04ceb into merged_master (Bitcoin PR #17641 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
df14d3c511
Merge 1705f1949a into merged_master (Bitcoin PR #17549 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
c3c860b38a
Merge 69ca6cdd66 into merged_master (Bitcoin PR #17599 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
05bbc1a822
Merge 2b6575d989 into merged_master (Bitcoin PR #17643 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
f5606e5e2b
Merge 35eda631ed into merged_master (Bitcoin PR #17634 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
27de4bdecf
Merge 19698ac6bc into merged_master (Bitcoin PR #17568 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
5ae9f8e2dc
Merge 2ecb7e1556 into merged_master (Bitcoin PR #17521 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
02fbc40c11
Merge abb30de63f into merged_master (Bitcoin PR #17587 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
45e9b96648
Merge 114e89e596 into merged_master (Bitcoin PR #17624 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
84702646f3
Merge 23cecd6cd5 into merged_master (Bitcoin PR #17604 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
b4d7d9d503
Merge 1f59885d27 into merged_master (Bitcoin PR #17361 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
1b46c58527
Merge 4fb82e916b into merged_master (Bitcoin PR #17567 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
cc2097087c
Merge dd1478870c into merged_master (Elements PR #791 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
16744f7ec2
Merge f2ab130961 into merged_master (Bitcoin PR #17606 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
569c46ca22
Merge 6d00035cae into merged_master (Elements PR #778 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
28623acd36
Merge 45f04d9753 into merged_master (Elements PR #784 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
3b10648977
Merge 4d5bd19fa0 into merged_master (Elements PR #785 )
...
Manually applied this one
2020-11-14 16:51:50 +00:00
Andrew Poelstra
d133c5b353
Merge 4895540b2f into merged_master (Elements PR #788 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
1df4f4164c
Merge 0ee914ba9e into merged_master (Bitcoin PR #17584 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
0e603ca0d7
Merge 2c1c43754b into merged_master (Bitcoin PR #17591 )
2020-11-14 16:51:49 +00:00
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
