Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
0b6056198d
Merge 35fff5be60 into merged_master (Bitcoin PR #17825 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
8d23feca6c
Merge 0cda557340 into merged_master (Bitcoin PR #17751 )
2020-11-14 16:52:01 +00:00
Andrew Poelstra
ff582f396c
Merge 988eaf2fcb into merged_master (Bitcoin PR #17752 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
296a86e215
Merge c3628e4483 into merged_master (Bitcoin PR #17743 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
b8ba5257bb
Merge 8a01450b64 into merged_master (Bitcoin PR #17598 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
d86e1a77cd
Merge 14dafcbc13 into merged_master (Bitcoin PR #17713 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
2f0b1e883c
Merge 2126d6ce69 into merged_master (Bitcoin PR #17561 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
02ef3faa7a
Merge 5622d8f315 into merged_master (Bitcoin PR #17671 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
1b46c58527
Merge 4fb82e916b into merged_master (Bitcoin PR #17567 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
18b511b048
Merge 12230529e3 into merged_master (Bitcoin PR #17596 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
434dfec482
Merge 7463181798 into merged_master (Bitcoin PR #17538 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
0e349f28b2
Merge 239d199667 into merged_master (Bitcoin PR #17574 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
d9dcd52ea5
Merge 33c103e2fe into merged_master (Bitcoin PR #17539 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
810568e0fa
Merge a6f5b6f47d into merged_master (Bitcoin PR #17550 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
c2c76d3738
Merge 6496bb87af into merged_master (Bitcoin PR #17008 )
2020-11-09 23:10:13 +00:00
Andrew Poelstra
db065548fc
Merge b4a1da9ef8 into merged_master (Bitcoin PR #17515 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
9871fbe71e
Merge 92db280817 into merged_master (Bitcoin PR #17411 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
a648df2425
Merge 2065ef66ee into merged_master (Bitcoin PR #17265 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
a6974cb1af
Merge 6fde676f64 into merged_master (Bitcoin PR #16669 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
bce97903cf
Merge 1028882eea into merged_master (Bitcoin PR #17437 )
2020-11-09 23:10:10 +00:00
Andrew Poelstra
f94f8bdfe9
Merge cef7df37ce into merged_master (Bitcoin PR #17410 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
3efa6823d7
Merge adceca2ba5 into merged_master (Bitcoin PR #17422 )
2020-11-09 23:10:09 +00:00
Andrew Poelstra
4febd3655e
Merge 4e21f72980 into merged_master (Bitcoin PR #17370 )
2020-11-09 21:20:53 +00:00
Andrew Poelstra
4262cdaf35
Merge d35b12107e into merged_master (Bitcoin PR #17044 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
c3b2f1d8c0
Merge bdda137878 into merged_master (Bitcoin PR #16766 )
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
b607d68347
Merge 463eab5e14 into merged_master (Bitcoin PR #17285 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
cd3935c4c9
Merge c737839471 into merged_master (Bitcoin PR #17309 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
1f56eedcbb
Merge a6abc94e93 into merged_master (Bitcoin PR #17281 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
0aba8c6168
Merge 341e8d355d into merged_master (Bitcoin PR #17291 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
466ecf5506
Merge d91af4768c into merged_master (Bitcoin PR #17165 )
...
This commit removes BIP70 support. Since this was the only thing our
payment sernver supported (we had previously dropped support for
bitcoin: urls) I also dropped all the paymentrequest logic.
2020-11-09 21:20:45 +00:00
Andrew Poelstra
1f76aeb999
Merge d7134ead84 into merged_master (Bitcoin PR #17239 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
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
