Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
473008e9e0
Merge f1d3d3430e into merged_master (Bitcoin PR #17714 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
9709d02c23
Merge fae94785d9 into merged_master (Bitcoin PR #17524 )
...
lol converting the psbt test vector to a pset one was pretty brutal. Conversion to
hex using rust-bitcoin and then manual hex-editing in vim.
2020-11-14 16:51:56 +00:00
Andrew Poelstra
c7bf5baf96
Merge 526e802d69 into merged_master (Elements PR #755 )
...
This Elements PR includes components of Core PR #17211 , which since the
refactors to use effective value landed, no longer provides the right
error message when a user provides an unowned input from a wallet tx.
See https://github.com/bitcoin/bitcoin/pull/17211#pullrequestreview-528389011
This breaks a functional test which was included in this PR, but which
conveniently has been changed in the current version of the Core PR. I
fixed the behavior (commented, in SelectCoins) rather than updating the
test to the most recent version.
2020-11-14 16:51:53 +00:00
Andrew Poelstra
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
1df4f4164c
Merge 0ee914ba9e into merged_master (Bitcoin PR #17584 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
9239882c43
Merge 8aac85d71e into merged_master (Bitcoin PR #17371 )
2020-11-14 16:51:41 +00:00
Andrew Poelstra
8746cbf50b
Merge a739d207a3 into merged_master (Bitcoin PR #17519 )
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
70e702083b
Merge ef4231fc00 into merged_master (Elements PR #776 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
f5036e8b4b
Merge 45e65376ac into merged_master (Bitcoin PR #17382 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
1d3555cdaf
Merge b05b28183c into merged_master (Bitcoin PR #16899 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
00d30ddc6c
Merge 94a26b192f into merged_master (Bitcoin PR #17318 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
7ad62f5527
Merge c4b8dd2060 into merged_master (Bitcoin PR #17297 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
b607d68347
Merge 463eab5e14 into merged_master (Bitcoin PR #17285 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
cda20329e8
Merge cab94cc074 into merged_master (Bitcoin PR #16943 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
e03eb1d06b
Merge b334392946 into merged_master (Elements PR #758 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
61e1882a27
Merge 1ff3a39d11 into merged_master (Elements PR #753 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
839ad47472
Merge 9ae468a6d5 into merged_master (Bitcoin PR #17192 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
dea0647042
Merge 048e456fc4 into merged_master (Bitcoin PR #17119 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
4f50591181
Merge 0d2832a6d1 into merged_master (Elements PR #741 )
...
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
8e5a97e8f0
Merge 06209ba03d into merged_master (Elements PR #709 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
1fed52eeb2
Merge 073cb3cb94 into merged_master (Elements PR #732 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
423b32563f
Merge b0f4cb397a into merged_master (Elements PR #745 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
56e1710af4
Merge 8fd1b52f9d into merged_master (Elements PR #744 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
ad6c1498ae
Merge 81fd79ab94 into merged_master (Elements PR #739 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
e25e16c65e
Merge ccaef6c28b into merged_master (Bitcoin PR #16908 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
a3139d9501
Merge 280c33f865 into merged_master (Elements PR #723 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
f2240a15bf
Merge a6c8aed1f1 into merged_master (Bitcoin PR #16817 )
2020-11-09 21:20:29 +00:00
Andrew Poelstra
e87be41b02
Merge 742cd77f6f into merged_master (Bitcoin PR #16929 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
5b97b7115a
Merge 630ec7bf41 into merged_master (Bitcoin PR #16900 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
244335056c
Merge 0ee0474234 into merged_master (Bitcoin PR #16521 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
df8fcece9d
Merge 72d30d668a into merged_master (Bitcoin PR #16512 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
183aea8254
Merge 4bfef0daeb into merged_master (Bitcoin PR #16866 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
2e67acfabe
Merge 2296fe65f5 into merged_master (Bitcoin PR #16251 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
74dba6e6ce
Merge d75d1f3331 into merged_master (Elements PR #704 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
5b89be04ff
Merge 33c466a642 into merged_master (Bitcoin PR #16787 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
5253addec0
Merge d8fe24cbfb into merged_master (Bitcoin PR #16489 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
f90ae69f01
Merge 08bb4c3156 into merged_master (Bitcoin PR #16285 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
15573b7a25
Merge 46494b08e2 into merged_master (Bitcoin PR #16798 )
2020-11-09 21:20:22 +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
d73a5a5a8d
Merge 33f9750b1b into merged_master (Bitcoin PR #16185 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
adceec0ffe
Merge a6878b8080 into merged_master (Elements PR #696 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
206311142a
Merge d8fc997913 into merged_master (Bitcoin PR #16695 )
2020-11-09 21:20:19 +00:00
