Commit graph

1701 commits

Author SHA1 Message Date
Andrew Poelstra
1a86a62d76 Merge a4a4964db1 into merged_master (Bitcoin PR #17111) 2020-11-09 21:20:39 +00:00
Andrew Poelstra
aa32926bf4 Merge dcc640811c into merged_master (Bitcoin PR #17134) 2020-11-09 21:20:39 +00:00
Andrew Poelstra
38ab54337c Merge 8261587610 into merged_master (Bitcoin PR #17102) 2020-11-09 21:20:37 +00:00
Andrew Poelstra
e414bdf90e Merge 08ed87e887 into merged_master (Bitcoin PR #16983) 2020-11-09 21:20:37 +00:00
Andrew Poelstra
5ac705735c Merge ceecefe0b0 into merged_master (Bitcoin PR #17081) 2020-11-09 21:20:35 +00:00
Andrew Poelstra
55b110cabc Merge c08bf2b574 into merged_master (Bitcoin PR #15437) 2020-11-09 21:20:35 +00:00
Andrew Poelstra
382e167ab3 Merge 520d140e6e into merged_master (Bitcoin PR #17056)
Recreated addresses for functional tests using `hal elements address create --script`
with the given script from data/rpc_bip67.json, taking the P2SH output
2020-11-09 21:20:35 +00:00
Andrew Poelstra
5044f82443 Merge 94e6e9f38d into merged_master (Bitcoin PR #17026) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
f26a171f83 Merge c90ce0f709 into merged_master (Bitcoin PR #17022) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
0fbbfe35c3 Merge a689c11907 into merged_master (Bitcoin PR #16524) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
1b3ae6c58b Merge fecc1be231 into merged_master (Bitcoin PR #16884) 2020-11-09 21:20:33 +00:00
Andrew Poelstra
862d421963 Merge ecc0f272a0 into merged_master (Bitcoin PR #17007) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
24ed0f8aa7 Merge 1f40a91286 into merged_master (Bitcoin PR #17014) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
c7eefa8ea4 Merge 4b51ed89cf into merged_master (Bitcoin PR #17002) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
04b3db567b Merge a54e52b4ae into merged_master (Bitcoin PR #16997) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
977162a889 Merge 981ec9b817 into merged_master (Bitcoin PR #15459) 2020-11-09 21:20:30 +00:00
Andrew Poelstra
c5e90d0076 Merge 26a7437045 into merged_master (Bitcoin PR #16982) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
ecd17723f2 Merge 6288f15f50 into merged_master (Bitcoin PR #16968) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
52411627ed Merge 36604b4ef5 into merged_master (Bitcoin PR #16912) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
f4b0731eda Merge 587003d380 into merged_master (Bitcoin PR #16914) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
df8fcece9d Merge 72d30d668a into merged_master (Bitcoin PR #16512) 2020-11-09 21:20:26 +00:00
Andrew Poelstra
7f749bf004 Merge f18a9065e9 into merged_master (Bitcoin PR #16812) 2020-11-09 21:20:25 +00:00
Andrew Poelstra
dd3496415c Merge 19f301def7 into merged_master (Bitcoin PR #16871) 2020-11-09 21:20:25 +00:00
Andrew Poelstra
31729410b6 Merge b0a7a76c9d into merged_master (Bitcoin PR #16873) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
183aea8254 Merge 4bfef0daeb into merged_master (Bitcoin PR #16866) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
6be382597b Merge 102998ea03 into merged_master (Bitcoin PR #15584) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
d4f4703df7 Merge a199f75225 into merged_master (Bitcoin PR #16857) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
5b89be04ff Merge 33c466a642 into merged_master (Bitcoin PR #16787) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
d73a5a5a8d Merge 33f9750b1b into merged_master (Bitcoin PR #16185) 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
Andrew Poelstra
7e0872f92c Merge fc5b756bae into merged_master (Bitcoin PR #16556) 2020-11-09 21:20:19 +00:00
Andrew Poelstra
f48bcfe313 Merge 9546a78595 into merged_master (Bitcoin PR #16621) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
b24503fe4b Merge 085fe76299 into merged_master (Bitcoin PR #16461) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
a211435b8e Merge d21e8aa0a9 into merged_master (Bitcoin PR #16732) 2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784 Merge af4100cd6f into merged_master (Bitcoin PR #16404) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
2bc7beced3 Merge db67101c74 into merged_master (Bitcoin PR #16665) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
66f2116668 Merge 910ff94cf5 into merged_master (Bitcoin PR #16690) 2020-11-09 21:20:17 +00:00
Andrew Poelstra
6daf60610f Merge 70b12af87e into merged_master (Bitcoin PR #16647) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
adb6d02fac Merge bd62f8d6ee into merged_master (Bitcoin PR #16645) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
543db1b024 Merge 48e5bfe224 into merged_master (Bitcoin PR #16643) 2020-11-09 21:20:16 +00:00
Andrew Poelstra
19def18ab9 Merge 0d65106dce into merged_master (Bitcoin PR #16383) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068 Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
04a9709d23 Merge 286332495d into merged_master (Bitcoin PR #16605) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
8d16afe159 Merge c3b605cf13 into merged_master (Bitcoin PR #16586) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
2a7e400289 Merge ac3e65204a into merged_master (Bitcoin PR #16585) 2020-11-09 21:20:13 +00:00
Andrew Poelstra
c175966d12 Merge 32776276ef into merged_master (Bitcoin PR #16574) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
15b414d845 Merge fbe4b7665b into merged_master (Bitcoin PR #16530) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
808c6ab0f0 Merge 1063fc9cf9 into merged_master (Bitcoin PR #16536) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
db933991ff Merge 6841b01340 into merged_master (Bitcoin PR #16394) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
2d781b0565 Merge 25f0edd59f into merged_master (Bitcoin PR #16448) 2020-11-09 21:20:11 +00:00