Andrew Poelstra
a47016dcdb
Merge ab91a0e0fc into merged_master (Bitcoin PR #18798 )
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
c6d6e49475
Merge af2ec6b037 into merged_master (Bitcoin PR #18759 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
9df3a34c65
Merge ecca2ea1d5 into merged_master (Bitcoin PR #18785 )
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
48d43d0a8a
Merge ba348dbc51 into merged_master (Bitcoin PR #18805 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
8ef5b8bb7f
Merge 6a60bfc76c into merged_master (Bitcoin PR #18765 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
5e18722f6a
Merge a483ffd689 into merged_master (Bitcoin PR #18735 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
fc6627d3b8
Merge 6e3fc7492a into merged_master (Bitcoin PR #18663 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
f9443bf23f
Merge ad04130742 into merged_master (Bitcoin PR #18799 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
7f7cc92e27
Merge 9fb95ae8e3 into merged_master (Bitcoin PR #18779 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
e0c28ff3f2
Merge b9ba76f1c9 into merged_master (Bitcoin PR #18769 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
60b8726cbb
Merge 65fb3dfc8d into merged_master (Bitcoin PR #18556 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
da37cc0993
Merge ac21090f20 into merged_master (Bitcoin PR #18629 )
2020-11-26 01:08:32 +00:00
Andrew Poelstra
bd525a9dcd
Merge 5352d14b37 into merged_master (Bitcoin PR #18778 )
2020-11-26 01:08:31 +00:00
Andrew Poelstra
91aca85a2a
Merge 8bdb2134fc into merged_master (Bitcoin PR #18777 )
2020-11-26 01:08:31 +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
7f37d52c1a
Merge ae32e5ce3d into merged_master (Bitcoin PR #18669 )
2020-11-26 01:08:31 +00:00
Andrew Poelstra
e678252c81
Merge 9ddfce6712 into merged_master (Bitcoin PR #18753 )
2020-11-26 01:08:31 +00:00
Andrew Poelstra
56711e565a
Merge 3cf464de2e into merged_master (Bitcoin PR #18770 )
2020-11-26 01:08:31 +00:00
Andrew Poelstra
2dd753afe1
Merge 65276c7737 into merged_master (Bitcoin PR #18744 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
78d6aba9f3
Merge 3e7c118d65 into merged_master (Bitcoin PR #18688 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
d92b52da42
Merge bab81f7e4d into merged_master (Bitcoin PR #18739 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
b066f21047
Merge fd48e7ad99 into merged_master (Bitcoin PR #18585 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
8710909d88
Merge 6f51f6f357 into merged_master (Bitcoin PR #18754 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
22cee70001
Merge 9fac600aba into merged_master (Bitcoin PR #17383 )
2020-11-26 01:08:30 +00:00
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
870e7097a9
Merge 8c0f86f284 into merged_master (Bitcoin PR #18757 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
1aa7a373b8
Merge 7812889849 into merged_master (Bitcoin PR #18157 )
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
1f15eb6ffc
Merge d8ca51db5d into merged_master (Bitcoin PR #18589 )
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
6990af3107
Merge e890c15e2c into merged_master (Bitcoin PR #18671 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
1ea940a2e2
Merge 4f802e59a0 into merged_master (Bitcoin PR #17509 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
acdc05d56c
Merge 47b94a337e into merged_master (Bitcoin PR #18732 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
75c70539ba
Merge fb89af26d8 into merged_master (Bitcoin PR #18733 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
4b1d94e736
Merge a7a6f1ff41 into merged_master (Bitcoin PR #18575 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
08d74600ea
Merge 5dcb061589 into merged_master (Bitcoin PR #18702 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
d958ef77a9
Merge ce4e1f0282 into merged_master (Bitcoin PR #18553 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
89c3236c58
Merge 9e8e813df5 into merged_master (Bitcoin PR #18410 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
b6c2e38caa
Merge acb4fa0741 into merged_master (Bitcoin PR #18665 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
ba95deb36c
Merge 19032c750c into merged_master (Bitcoin PR #18612 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
594ded326b
Merge be2540a4b9 into merged_master (Elements PR #870 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
87d7c2cf71
Merge c90a9e6fff into merged_master (Bitcoin PR #18713 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
8a080384c6
Merge 7d1a3bda21 into merged_master (Bitcoin PR #18709 )
2020-11-26 01:08:27 +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
