Andrew Poelstra
aef7078adf
Merge 107b8559c5 into merged_master (Bitcoin PR #18638 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
37cb4fdaba
Merge a4eb6a51a7 into merged_master (Bitcoin PR #19469 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
e96a115bab
Merge f6072e601a into merged_master (Bitcoin PR #19368 )
2020-11-26 01:09:16 +00:00
Andrew Poelstra
31f5cfcef7
Merge 02b26ba1c1 into merged_master (Bitcoin PR #19200 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
24f4a02a03
Merge 0afbeb73cc into merged_master (Bitcoin PR #19153 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
cd430597f1
Merge 5af16a4db7 into merged_master (Bitcoin PR #16756 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
55d166627c
Merge b33136b6ba into merged_master (Bitcoin PR #19083 )
2020-11-26 01:09:03 +00:00
Andrew Poelstra
dd4616946d
Merge 85f7db2284 into merged_master (Bitcoin PR #19239 )
2020-11-26 01:09:03 +00:00
Andrew Poelstra
9e70adf13e
Merge 6762a627ec into merged_master (Bitcoin PR #19230 )
2020-11-26 01:09:02 +00:00
Andrew Poelstra
d5082ffa37
Merge 39afe5b1c6 into merged_master (Bitcoin PR #19082 )
2020-11-26 01:08:58 +00:00
Andrew Poelstra
67f55c5173
Merge 234fabab90 into merged_master (Bitcoin PR #18210 )
2020-11-26 01:08:57 +00:00
Andrew Poelstra
b23acd5046
Merge dec067f5a0 into merged_master (Bitcoin PR #18965 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
9ac62395d7
Merge e45fb7e0d2 into merged_master (Bitcoin PR #18877 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
bda1054131
Merge 7a5767423f into merged_master (Bitcoin PR #18808 )
2020-11-26 01:08:41 +00:00
Andrew Poelstra
503f615f81
Merge a66ba6d029 into merged_master (Bitcoin PR #18576 )
2020-11-26 01:08:35 +00:00
Andrew Poelstra
252c3a223c
Merge 978c5a2122 into merged_master (Bitcoin PR #18485 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
733d5cf974
Merge e302830fae into merged_master (Bitcoin PR #18774 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
e5f1b2cdaa
Merge 0ef0d33f75 into merged_master (Bitcoin PR #18038 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
1c12ae1719
Merge eef90c14ed into merged_master (Bitcoin PR #16528 )
...
This is the 43-commit descriptor wallet PR. It was remarkably easy to merge, given
its magnitude. With this commit Elements supports importing Bitcoin descriptors
and deriving (Bitcoin) addresses, though of course it does not support blinding
yet. That is a post-rebase project.
The material changes were:
1. Changing constants in the tests (super annoying but nothing surprising)
2. Adding a missing "skip if this coin is not ours" check in src/script/sign.cpp
which was causing us to erroneously remove existing witnesses from transactions.
This wasn't a problem before this commit since we would only ask specific
scriptpubkeymans to sign, and we'd never ask any to sign inputs we didn't
own. Andy simplified the logic here to always try every scriptpubkeyman,
which means they have to play a bit more nicely with each other.
Other than that, this was a big diff with many conflicts but literally all of
them were "we both added code" and the resolution was to take both sides.
2020-11-26 01:08:31 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
5f85d5672b
Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
63a52d3633
Merge 29893ec875 into merged_master (Bitcoin PR #18454 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
9587ad280d
Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
bdd87dc5fa
Merge 694f4cbd78 into merged_master (Bitcoin PR #18312 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
ff1454245a
Merge d478a737db into merged_master (Bitcoin PR #18392 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
e1f1d5dc40
Merge 67de1ee8bc into merged_master (Bitcoin PR #18378 )
2020-11-26 01:07:59 +00:00
Andrew Poelstra
ad33c3a204
Merge 309b0c4c19 into merged_master (Bitcoin PR #13693 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
f19177a927
Merge 1a97c9a483 into merged_master (Bitcoin PR #15443 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
6b887e82dc
Merge d0601e67f1 into merged_master (Bitcoin PR #17812 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
1f0738f05f
Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
bca8bce3b7
Merge caa2f3af29 into merged_master (Bitcoin PR #12134 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
ca0936ab69
Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
7776084b8f
Merge 988fe5b1ad into merged_master (Bitcoin PR #12763 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
f9acc8330d
Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
1d3555cdaf
Merge b05b28183c into merged_master (Bitcoin PR #16899 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
3875efaaa2
Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
371868fdac
Merge 4258fd7377 into merged_master (Bitcoin PR #17091 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
e413b2ebbb
Merge ca97d292ce into merged_master (Bitcoin PR #16551 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
29e73c226a
Merge 5e202382a9 into merged_master (Bitcoin PR #16624 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
b81a29337a
Merge b80cdfec9a into merged_master (Bitcoin PR #16618 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
19def18ab9
Merge 0d65106dce into merged_master (Bitcoin PR #16383 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
c7076b25b0
Merge e00501e00c into merged_master (Bitcoin PR #16561 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89
Merge 67be6d7a17 into merged_master (Bitcoin PR #16248 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
84a62eb305
Merge c77f7cdbd1 into merged_master (Bitcoin PR #16197 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
62ce823f8f
Merge c67ef2938c into merged_master (Elements PR #600 )
...
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
9a159f8617
Merge c606e6fc53 into merged_master (Bitcoin PR #15996 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
31aa2513fb
Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
04f0e67e67
Merge 51a6e2c419 into merged_master (Bitcoin PR #15681 )
2020-11-09 21:20:07 +00:00
