Andrew Poelstra
7187ea2de7
Merge 3f1966ead6 into merged_master (Bitcoin PR #17705 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
c9585d0fde
Merge 3d6752779f into merged_master (Bitcoin PR #17633 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
11487538e9
Merge df2b743759 into merged_master (Bitcoin PR #17675 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
5a48ca16e3
Merge fee01bb053 into merged_master (Bitcoin PR #17517 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
4cc150cd4a
Merge e1df922132 into merged_master (Bitcoin PR #17497 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
2b6199bf17
Merge c7709cbf4c into merged_master (Bitcoin PR #17469 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
3613ae283d
Merge f60e0684d1 into merged_master (Elements PR #773 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
132dcf17c7
Merge 54a337478d into merged_master (Bitcoin PR #17378 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
7494bc176f
Merge bc38bb9a60 into merged_master (Bitcoin PR #17288 )
2020-11-09 21:20:51 +00:00
Andrew Poelstra
a19375575a
Merge 222b7d0ca7 into merged_master (Bitcoin PR #17330 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
cda20329e8
Merge cab94cc074 into merged_master (Bitcoin PR #16943 )
2020-11-09 21:20:48 +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
2f310a3a3e
Merge 029c65e04c into merged_master (Bitcoin PR #17141 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c
Merge d6f304a462 into merged_master (Elements PR #684 )
...
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
5574cf1730
Merge 6c7da0736d into merged_master (Bitcoin PR #17108 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
e73c3f2c3f
Merge 866fd2888f into merged_master (Bitcoin PR #17030 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
0fbbfe35c3
Merge a689c11907 into merged_master (Bitcoin PR #16524 )
2020-11-09 21:20:33 +00:00
Andrew Poelstra
eab90a6495
Merge 13377b7a69 into merged_master (Bitcoin PR #16918 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
98c5244de1
Merge a73775e4d5 into merged_master (Bitcoin PR #16917 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
b24be4b1a7
Merge 59c138d2f1 into merged_master (Bitcoin PR #16898 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
8b487a91fb
Merge 3c8aacee72 into merged_master (Elements PR #712 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
e413b2ebbb
Merge ca97d292ce into merged_master (Bitcoin PR #16551 )
2020-11-09 21:20:24 +00:00
Andrew Poelstra
bc7f2f6de6
Merge 04d9939f46 into merged_master (Bitcoin PR #16850 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
8fa52e84b0
Merge 8af835a72d into merged_master (Bitcoin PR #16796 )
2020-11-09 21:20:23 +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
2cdfea1aa4
Merge cbde2bc806 into merged_master (Bitcoin PR #16804 )
2020-11-09 21:20:21 +00:00
Andrew Poelstra
39d8aa865c
Merge cc40b55da7 into merged_master (Bitcoin PR #16726 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
9343f1e349
Merge 6dfa9efa3f into merged_master (Bitcoin PR #16656 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
e62e563c84
Merge 27ee0cc5a6 into merged_master (Bitcoin PR #16646 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
a825f2c9ef
Merge 8bd5e0af99 into merged_master (Bitcoin PR #16465 )
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
0d445414a6
Merge 05ccbe9a29 into merged_master (Bitcoin PR #16598 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
d576fc5aeb
Merge 62117f9f36 into merged_master (Bitcoin PR #16363 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
a93a689a14
Merge d5ea8f4bf3 into merged_master (Bitcoin PR #16509 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
3dbeccf1c9
Merge 79816278e2 into merged_master (Bitcoin PR #16470 )
2020-11-09 21:20:11 +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
dcd3f9fd69
Merge 59ce537a49 into merged_master (Bitcoin PR #16152 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
3a0de44d90
Merge 0822b44d8a into merged_master (Bitcoin PR #15282 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
046cf94f99
Merge d9bafca20c into merged_master (Bitcoin PR #15982 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
bbc59975b0
Merge 4858d36163 into merged_master (Elements PR #639 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
0eedc2c45b
Merge 63b9efa73d into merged_master (Bitcoin PR #16042 )
2020-10-29 22:39:10 +00:00
Andrew Poelstra
b8e90ed29c
Merge df7addc4c6 into merged_master (Bitcoin PR #15990 )
2020-10-29 18:38:42 +00:00
Andrew Poelstra
c3cd785c26
Merge 3503a69ba2 into merged_master (Bitcoin PR #15963 )
2020-10-29 17:09:46 +00:00
Andrew Poelstra
13b3e5bcc3
Merge c459c5f701 into merged_master (Bitcoin PR #15664 )
2020-10-29 04:36:59 +00:00
Andrew Poelstra
0929a00ac5
Merge 8ec7121a45 into merged_master (Bitcoin PR #15927 )
2020-10-29 02:32:33 +00:00
Andrew Poelstra
30390b2eba
Merge ce6762030f into merged_master (Bitcoin PR #15897 )
2020-10-29 02:05:13 +00:00
Andrew Poelstra
f3ba240a58
Merge f73a3c618b into merged_master (Bitcoin PR #15895 )
2020-10-28 22:34:16 +00:00
