Commit graph

34132 commits

Author SHA1 Message Date
Andrew Poelstra
372cbb86e1 Merge 2711559845 into merged_master (Bitcoin PR bitcoin/bitcoin#22365) 2021-07-30 18:13:29 +00:00
Andrew Poelstra
1dd57b5dc3 Merge c609e10545 into merged_master (Bitcoin PR bitcoin/bitcoin#22292) 2021-07-30 17:34:54 +00:00
Andrew Poelstra
da77159924 Merge 7a49fdc581 into merged_master (Bitcoin PR bitcoin/bitcoin#22388) 2021-07-30 16:55:54 +00:00
Andrew Poelstra
47164a1e9c Merge ddc6979b8b into merged_master (Bitcoin PR bitcoin/bitcoin#19438) 2021-07-30 16:16:50 +00:00
Andrew Poelstra
dbd482d595 Merge a926d6dfd2 into merged_master (Bitcoin PR bitcoin/bitcoin#22310) 2021-07-30 12:39:04 +00:00
Andrew Poelstra
395c82efeb Merge 091d35c70e into merged_master (Bitcoin PR bitcoin-core/gui#377) 2021-07-30 05:03:59 +00:00
Andrew Poelstra
eb214706d4 Merge 2749613020 into merged_master (Bitcoin PR bitcoin/bitcoin#22348) 2021-07-30 04:25:59 +00:00
Andrew Poelstra
31c675389f Merge 185acdb5e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22334) 2021-07-30 03:47:55 +00:00
Andrew Poelstra
9863e0bbb5 Merge fa46e48982 into merged_master (Bitcoin PR bitcoin/bitcoin#22379) 2021-07-30 03:09:49 +00:00
Andrew Poelstra
b563c202ff Merge 3ef2d400fa into merged_master (Bitcoin PR bitcoin/bitcoin#22376) 2021-07-30 02:31:43 +00:00
Andrew Poelstra
dce5ea8d1d Merge 333ec8be82 into merged_master (Bitcoin PR bitcoin-core/gui#330) 2021-07-30 01:53:47 +00:00
Andrew Poelstra
bccdd19229 Merge 34f554dbd3 into merged_master (Bitcoin PR bitcoin-core/gui#366) 2021-07-30 01:15:27 +00:00
Andrew Poelstra
59bf2ee204 Merge 5a95c5179c into merged_master (Bitcoin PR bitcoin/bitcoin#20191)
This broke functional tests; had to forward-port #22379 (which will be
merged in a couple PRs) to fix it.
2021-07-30 00:37:08 +00:00
Andrew Poelstra
3c24e4c1b5 Merge 045bb06ebd into merged_master (Bitcoin PR bitcoin/bitcoin#19651) 2021-07-29 23:12:48 +00:00
Andrew Poelstra
8a158e3e93 Merge 722776c0fd into merged_master (Bitcoin PR bitcoin/bitcoin#21329) 2021-07-29 22:11:13 +00:00
Andrew Poelstra
f953b53465 Merge 3fc20abab0 into merged_master (Bitcoin PR bitcoin/bitcoin#22353) 2021-07-29 16:56:42 +00:00
Andrew Poelstra
29a49051ba Merge e1a13f12e1 into merged_master (Bitcoin PR bitcoin/bitcoin#18096) 2021-07-29 16:18:42 +00:00
Andrew Poelstra
35df56002a Merge bfd910cae4 into merged_master (Bitcoin PR bitcoin/bitcoin#18568) 2021-07-29 15:40:49 +00:00
Andrew Poelstra
f7a568bd1c Merge a000cb013c into merged_master (Bitcoin PR bitcoin/bitcoin#22361) 2021-07-29 15:02:54 +00:00
Andrew Poelstra
4d0fe73399 Merge e0face9235 into merged_master (Bitcoin PR bitcoin/bitcoin#22358) 2021-07-29 14:25:02 +00:00
Andrew Poelstra
cac878cf89 Merge 8071ec179d into merged_master (Bitcoin PR bitcoin/bitcoin#21789) 2021-07-29 12:55:13 +00:00
Andrew Poelstra
9fc1ba6008 Merge 3f56ef7bef into merged_master (Bitcoin PR bitcoin/bitcoin#22146) 2021-07-29 07:14:19 +00:00
Andrew Poelstra
e577745980 Merge 8cdf91735f into merged_master (Bitcoin PR bitcoin/bitcoin#22349) 2021-07-29 06:36:50 +00:00
Andrew Poelstra
0c75e5a6e7 Merge ac238f76bf into merged_master (Bitcoin PR bitcoin/bitcoin#22339) 2021-07-29 05:59:10 +00:00
Andrew Poelstra
a523f13fc5 Merge 9c3751a0c9 into merged_master (Bitcoin PR bitcoin/bitcoin#22342) 2021-07-29 05:21:20 +00:00
Andrew Poelstra
62fd272e28 Merge 3e306ee1d5 into merged_master (Bitcoin PR bitcoin/bitcoin#19362) 2021-07-29 04:43:41 +00:00
Andrew Poelstra
9a6ea2c704 Merge 246daf1f53 into merged_master (Bitcoin PR bitcoin/bitcoin#22322) 2021-07-29 04:06:09 +00:00
Andrew Poelstra
505e45c12f Merge b2f5c38333 into merged_master (Bitcoin PR bitcoin/bitcoin#22327) 2021-07-29 03:27:27 +00:00
Andrew Poelstra
b3bba59059 Merge 0553d75268 into merged_master (Bitcoin PR bitcoin/bitcoin#22154) 2021-07-29 02:50:04 +00:00
Andrew Poelstra
a1f89ca048 Merge b7565c708d into merged_master (Bitcoin PR bitcoin/bitcoin#22250) 2021-07-29 00:25:20 +00:00
Andrew Poelstra
635abda3e9 Merge e59ea87954 into merged_master (Bitcoin PR bitcoin/bitcoin#22311) 2021-07-28 23:48:22 +00:00
Andrew Poelstra
083e08cf82 Merge d6a59166a1 into merged_master (Bitcoin PR bitcoin/bitcoin#22257)
Just as mechanical and annoying as it looks.
2021-07-28 21:06:57 +00:00
Andrew Poelstra
91ecc65c31 Merge c31161f4f7 into merged_master (Bitcoin PR bitcoin/bitcoin#22320) 2021-07-28 19:32:30 +00:00
Andrew Poelstra
043b76e919 Merge bfa885898a into merged_master (Bitcoin PR bitcoin/bitcoin#22306) 2021-07-28 18:55:40 +00:00
Andrew Poelstra
bb8e5d1ce4 Merge a196c89317 into merged_master (Bitcoin PR bitcoin/bitcoin#22270)
Some PRs ago (in #19937) the bitcoin-util binary was added, which we
didn't notice and didn't rename to elements-util. This commit adds
some tests for it, which made me notice it ... so rename it here.
2021-07-28 18:18:31 +00:00
Andrew Poelstra
3c48d95401 Merge 7317e14a44 into merged_master (Bitcoin PR bitcoin/bitcoin#22263) 2021-07-28 16:09:13 +00:00
Andrew Poelstra
6d72443536 Merge c0e30933e0 into merged_master (Bitcoin PR bitcoin/bitcoin#22323) 2021-07-28 15:20:02 +00:00
Andrew Poelstra
a503005be7 Merge 567670bec5 into merged_master (Bitcoin PR bitcoin/bitcoin#22166) 2021-07-28 14:42:42 +00:00
Andrew Poelstra
e8b84fa091 Merge d6e0d78c31 into merged_master (Bitcoin PR bitcoin/bitcoin#20966) 2021-07-28 14:05:54 +00:00
Andrew Poelstra
f8ca439f8f Merge 03aa59a4e5 into merged_master (Bitcoin PR bitcoin/bitcoin#22313) 2021-07-28 13:29:17 +00:00
Andrew Poelstra
01766fafdf Merge c93e123dc7 into merged_master (Bitcoin PR bitcoin/bitcoin#22308) 2021-07-28 12:52:10 +00:00
Andrew Poelstra
c86aff975c Merge 327e2691f6 into merged_master (Bitcoin PR bitcoin/bitcoin#22309) 2021-07-28 05:27:00 +00:00
Andrew Poelstra
2a28a2f2d1 Merge 672870ab7b into merged_master (Bitcoin PR bitcoin/bitcoin#22201) 2021-07-28 04:50:06 +00:00
Andrew Poelstra
01feb5521a Merge 398dd67833 into merged_master (Bitcoin PR bitcoin/bitcoin#22296) 2021-07-28 04:13:16 +00:00
Andrew Poelstra
8e462c9a98 Merge 74013641e0 into merged_master (Bitcoin PR bitcoin/bitcoin#22089) 2021-07-28 03:33:26 +00:00
Andrew Poelstra
a83d2595bc Merge 6556da77d7 into merged_master (Bitcoin PR bitcoin/bitcoin#21056) 2021-07-28 02:41:57 +00:00
Andrew Poelstra
c0a9e5c872 Merge 6a67366fdc into merged_master (Bitcoin PR bitcoin/bitcoin#19033) 2021-07-28 01:39:59 +00:00
Andrew Poelstra
53951df7ef Merge f6a25bea82 into merged_master (Bitcoin PR bitcoin/bitcoin#22147) 2021-07-28 00:28:42 +00:00
Andrew Poelstra
95858637f6 Merge a305a687e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22244) 2021-07-27 23:51:48 +00:00
Andrew Poelstra
374930ee5a Merge 965e937434 into merged_master (Bitcoin PR bitcoin/bitcoin#22279)
Hey look, it's one of mine, from this rebase :)
2021-07-27 23:14:41 +00:00