Andrew Poelstra
ff7aedd1dd
Merge 543693b92b into merged_master (Bitcoin PR #20378 )
2020-12-02 14:34:42 +00:00
Andrew Poelstra
e198740eb1
Merge d9f5132736 into merged_master (Bitcoin PR #20344 )
2020-12-02 07:51:12 +00:00
Andrew Poelstra
7ec1f12f7c
Merge 1dfe19e284 into merged_master (Bitcoin PR #20153 )
2020-12-02 06:52:54 +00:00
Andrew Poelstra
2d1adacaf2
Merge 663fd92b28 into merged_master (Bitcoin PR #20266 )
2020-12-02 06:16:37 +00:00
Andrew Poelstra
6a6ed8d6f1
Merge 26d7941224 into merged_master (Bitcoin PR #20230 )
2020-12-01 21:22:22 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
6a979f902a
Merge 9efa55c715 into merged_master (Bitcoin PR #20130 )
2020-11-30 18:50:04 +00:00
Andrew Poelstra
1b85209c18
Merge 1769828684 into merged_master (Bitcoin PR #19501 )
...
Adds "verbose" flag to a bunch of RPC that pass through to SendMoney. I also
added it to sendtomainchain and destroyamount.
2020-11-30 02:17:54 +00:00
Andrew Poelstra
07d50b2951
Merge c95784e3d3 into merged_master (Bitcoin PR #20016 )
2020-11-29 22:31:43 +00:00
Andrew Poelstra
7a8f77d7ad
Merge 9e217f5a6f into merged_master (Bitcoin PR #19572 )
2020-11-29 19:44:31 +00:00
Andrew Poelstra
9c308f094f
Merge be375b2206 into merged_master (Bitcoin PR #19919 )
2020-11-29 03:17:26 +00:00
Andrew Poelstra
239cea1d22
Merge 78cb45d722 into merged_master (Bitcoin PR #19738 )
2020-11-29 00:26:50 +00:00
Andrew Poelstra
d4e8eb56b0
Merge 56d47e19ed into merged_master (Bitcoin PR #19619 )
2020-11-29 00:21:17 +00:00
Andrew Poelstra
646aa14168
Merge a0a422c34c into merged_master (Bitcoin PR #19754 )
2020-11-28 22:31:57 +00:00
Andrew Poelstra
afe472121a
Merge a1d14f522c into merged_master (Bitcoin PR #19671 )
2020-11-28 19:48:53 +00:00
Andrew Poelstra
5f6eb8ee3f
Merge f98872f127 into merged_master (Bitcoin PR #18244 )
2020-11-28 18:55:44 +00:00
Andrew Poelstra
a6e69db203
Merge 7721b31809 into merged_master (Bitcoin PR #19773 )
2020-11-28 18:22:47 +00:00
Andrew Poelstra
4087c88a7e
Merge 269a7ccb27 into merged_master (Bitcoin PR #19099 )
2020-11-28 17:53:38 +00:00
Andrew Poelstra
2217632a3e
Merge 21eda43cde into merged_master (Bitcoin PR #19828 )
2020-11-28 17:02:25 +00:00
Andrew Poelstra
de97906fad
Merge 91af7ef831 into merged_master (Bitcoin PR #19289 )
2020-11-28 14:31:34 +00:00
Andrew Poelstra
ddd9b819bb
Merge a2a250c7d0 into merged_master (Bitcoin PR #19743 )
2020-11-28 00:53:18 +00:00
Andrew Poelstra
f197c02e18
Merge c831e105c5 into merged_master (Bitcoin PR #14582 )
2020-11-27 23:36:05 +00:00
Andrew Poelstra
229e81e10c
Merge f269165edc into merged_master (Bitcoin PR #17458 )
2020-11-27 20:32:05 +00:00
Andrew Poelstra
f3a6693ff5
Merge c0b1706964 into merged_master (Bitcoin PR #19568 )
...
Reduction in duplicated code -and- in Elements/Bitcoin diff :)
2020-11-27 18:54:38 +00:00
Andrew Poelstra
7297f932a0
Merge 9d4b3d86b6 into merged_master (Bitcoin PR #19334 )
2020-11-26 17:07:31 +00:00
Andrew Poelstra
c2e804e75b
Merge 32302e5c88 into merged_master (Bitcoin PR #19490 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
fc95b9bd68
Merge 89899a3448 into merged_master (Bitcoin PR #19046 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
5f6468f6b8
Merge 4fc9224ee7 into merged_master (Bitcoin PR #18850 )
2020-11-26 01:09:24 +00:00
Andrew Poelstra
9942d6f945
Merge 171f4a516b into merged_master (Bitcoin PR #19324 )
2020-11-26 01:09:19 +00:00
Andrew Poelstra
d664527f5a
Merge a24806c25d into merged_master (Bitcoin PR #19215 )
2020-11-26 01:09:18 +00:00
Andrew Poelstra
9ac0c98505
Merge 7173a3c73b into merged_master (Bitcoin PR #19396 )
2020-11-26 01:09:18 +00:00
Andrew Poelstra
357c4d5d39
Merge 5c3c7cc50c into merged_master (Bitcoin PR #19300 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
4839db857d
Merge c27330897d into merged_master (Bitcoin PR #18027 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
8dcff8b5c8
Merge 6bb5f6d8e3 into merged_master (Bitcoin PR #16377 )
...
Note that this is a breaking change in Core's RPC -- if you add pegins
to createfundedpsbt then it won't do coin selection unless you provide
the additional new add_inputs option.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
235e1f0ec5
Merge 3faf3429e9 into merged_master (Bitcoin PR #19299 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
c639197de0
Merge 23b2a68df5 into merged_master (Bitcoin PR #18275 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
0663613ea7
Merge eac65d99dd into merged_master (Bitcoin PR #19261 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
3aaeae55ea
Merge f8364df250 into merged_master (Bitcoin PR #19176 )
2020-11-26 01:09:02 +00:00
Andrew Poelstra
c8459659ed
Merge 3657aee2d2 into merged_master (Bitcoin PR #18982 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
d38085da61
Merge 520e435b5e into merged_master (Bitcoin PR #18918 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
5dcf991eba
Merge df303ceb65 into merged_master (Bitcoin PR #18787 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
d0b2badc94
Merge ad3a61c5f5 into merged_master (Bitcoin PR #18895 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
b7d3244d47
Merge 88b2652fad into merged_master (Bitcoin PR #18853 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
e5faae4af6
Merge 60091d20f9 into merged_master (Bitcoin PR #9381 )
2020-11-26 01:08:38 +00:00
Andrew Poelstra
d4711bdf91
Merge 23c926d859 into merged_master (Bitcoin PR #18699 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
4414990576
Merge 608359b071 into merged_master (Bitcoin PR #16426 )
2020-11-26 01:08:35 +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
569c68a0f2
Merge f8102d9088 into merged_master (Bitcoin PR #18601 )
2020-11-26 01:08:25 +00:00
