Andrew Poelstra
|
6cb16b5c8e
|
Merge 16d0051c6a into merged_master (Bitcoin PR bitcoin/bitcoin#21688)
|
2021-07-03 18:51:29 +00:00 |
|
Andrew Poelstra
|
16e3fcba46
|
Merge a7a193789e into merged_master (Bitcoin PR bitcoin/bitcoin#21804)
|
2021-07-03 17:11:33 +00:00 |
|
Andrew Poelstra
|
e300bdf641
|
Merge 1daca9f9a9 into merged_master (Bitcoin PR bitcoin/bitcoin#21738)
|
2021-07-03 15:30:12 +00:00 |
|
Andrew Poelstra
|
6b565b9878
|
Merge fb66dbe786 into merged_master (Bitcoin PR bitcoin/bitcoin#21762)
|
2021-07-03 13:46:53 +00:00 |
|
Andrew Poelstra
|
a02abbc35a
|
Merge 7f37a1d560 into merged_master (Bitcoin PR bitcoin/bitcoin#21785)
|
2021-07-03 08:56:11 +00:00 |
|
Andrew Poelstra
|
b58c89e582
|
Merge 2cbb4ab7a9 into merged_master (Bitcoin PR bitcoin/bitcoin#21658)
|
2021-07-03 07:17:41 +00:00 |
|
Andrew Poelstra
|
10ee57280a
|
Merge 4cfe6c37d9 into merged_master (Bitcoin PR bitcoin/bitcoin#18847)
|
2021-07-03 05:39:04 +00:00 |
|
Andrew Poelstra
|
4b9e6df7a5
|
Merge 328da33557 into merged_master (Bitcoin PR bitcoin-core/gui#18)
|
2021-07-02 20:34:29 +00:00 |
|
Andrew Poelstra
|
ae471dc6a5
|
Merge 549d20a31b into merged_master (Bitcoin PR bitcoin/bitcoin#20772)
|
2021-07-02 14:19:51 +00:00 |
|
Andrew Poelstra
|
ac9594fd74
|
Merge bd2e2d5c64 into merged_master (Elements PR ElementsProject/elements#1012)
Took the non-backported version of base_encode_decode from https://github.com/bitcoin/bitcoin/pull/22279
|
2021-07-02 03:42:38 +00:00 |
|
Andrew Poelstra
|
d51f42534f
|
Merge e45863166f into merged_master (Bitcoin PR bitcoin/bitcoin#21169)
Adds fuzztests for RPC. FIXME there is a crash; I just disabled the
test for now and we can revisit in a future PR.
|
2021-07-01 17:04:41 +00:00 |
|
Steven Roose
|
bd2e2d5c64
|
Merge ElementsProject/elements#1012: fuzz: backport fixes to fuzzer errors
0896d0a278 util: Properly handle -noincludeconf on command line (MarcoFalke)
5f18d337d4 Cleanup -includeconf error message (MarcoFalke)
99b86594df Fix crash when parsing command line with -noincludeconf=0 (MarcoFalke)
c98902bd1b fuzz: add missing ECCVerifyHandle to base_encode_decode (Andrew Poelstra)
Pull request description:
Backport of https://github.com/bitcoin/bitcoin/pull/22279 and https://github.com/bitcoin/bitcoin/pull/22002 and https://github.com/bitcoin/bitcoin/pull/22137
ACKs for top commit:
jonasnick:
utACK 0896d0a278
Tree-SHA512: 7a9c4a20fc51ac3e66fd0b8d6f28200b9342774fcb003c561e277fab4a68c3ebd2cab4c3081170199a51aabf3956e0f7248fa6c853c8aa971645fb9039adc688
|
2021-07-01 16:58:21 +01:00 |
|
Andrew Poelstra
|
02a627ac8d
|
Merge edf679503c into merged_master (Bitcoin PR bitcoin/bitcoin#21783)
|
2021-07-01 14:17:54 +00:00 |
|
Andrew Poelstra
|
d9730235a4
|
Merge bce09da122 into merged_master (Bitcoin PR bitcoin/bitcoin#21773)
|
2021-07-01 14:05:24 +00:00 |
|
Andrew Poelstra
|
6f238f5ad9
|
Merge c6d6bc8abb into merged_master (Bitcoin PR bitcoin/bitcoin#21523)
|
2021-07-01 13:43:23 +00:00 |
|
Andrew Poelstra
|
5f0c45b568
|
Merge ac219dcbcc into merged_master (Bitcoin PR bitcoin/bitcoin#19160)
|
2021-07-01 13:29:36 +00:00 |
|
Andrew Poelstra
|
95ab1aa7cb
|
Merge 19a56d1519 into merged_master (Bitcoin PR bitcoin/bitcoin#21009)
|
2021-07-01 04:00:30 +00:00 |
|
Andrew Poelstra
|
33d8878160
|
Merge f8f55522c4 into merged_master (Bitcoin PR bitcoin/bitcoin#21746)
|
2021-07-01 03:48:03 +00:00 |
|
Andrew Poelstra
|
e8fbb8c8bd
|
Merge 683dda2a70 into merged_master (Bitcoin PR bitcoin/bitcoin#21777)
|
2021-07-01 03:35:37 +00:00 |
|
Andrew Poelstra
|
ff1af2ca5d
|
Merge 74a960a220 into merged_master (Bitcoin PR bitcoin/bitcoin#21714)
|
2021-07-01 03:22:26 +00:00 |
|
Andrew Poelstra
|
11f8520ec2
|
Merge 0a0a95b9d6 into merged_master (Bitcoin PR bitcoin/bitcoin#21707)
|
2021-07-01 02:52:46 +00:00 |
|
Andrew Poelstra
|
3479bcceec
|
Merge c4571a0c39 into merged_master (Bitcoin PR bitcoin-core/gui#284)
|
2021-07-01 02:40:15 +00:00 |
|
Andrew Poelstra
|
931655f99d
|
Merge 8f80092d78 into merged_master (Bitcoin PR bitcoin/bitcoin#21563)
|
2021-07-01 02:07:23 +00:00 |
|
Andrew Poelstra
|
0f00842a22
|
Merge 66fd3b28e8 into merged_master (Bitcoin PR bitcoin/bitcoin#21732)
|
2021-07-01 01:54:34 +00:00 |
|
Andrew Poelstra
|
827081b134
|
Merge 4b5659c6b1 into merged_master (Bitcoin PR bitcoin/bitcoin#19801)
|
2021-07-01 01:35:09 +00:00 |
|
Andrew Poelstra
|
ba678ce2f3
|
Merge aaf66413e1 into merged_master (Bitcoin PR bitcoin/bitcoin#21564)
|
2021-07-01 01:12:06 +00:00 |
|
Andrew Poelstra
|
f1c8929947
|
Merge e7776e20ed into merged_master (Bitcoin PR bitcoin-core/gui#286)
|
2021-07-01 00:59:40 +00:00 |
|
Andrew Poelstra
|
06129d0540
|
Merge e16f8720dc into merged_master (Bitcoin PR #21655)
|
2021-07-01 00:46:45 +00:00 |
|
Andrew Poelstra
|
0e8bf9479e
|
Merge e507acb118 into merged_master (Bitcoin PR #20353)
|
2021-07-01 00:33:27 +00:00 |
|
Andrew Poelstra
|
dd87547295
|
Merge 2bce9329e8 into merged_master (Bitcoin PR bitcoin/bitcoin#21719)
|
2021-07-01 00:20:39 +00:00 |
|
Andrew Poelstra
|
7d4d030ccc
|
Merge f385ad7651 into merged_master (Bitcoin PR bitcoin-core/gui#263)
|
2021-07-01 00:05:46 +00:00 |
|
Andrew Poelstra
|
a04f19cbf2
|
Merge bca00942ed into merged_master (Bitcoin PR bitcoin/bitcoin#21731)
|
2021-06-30 23:48:23 +00:00 |
|
Andrew Poelstra
|
d58adf1d3b
|
Merge 90e0faaa44 into merged_master (Bitcoin PR #21694)
|
2021-06-30 23:11:36 +00:00 |
|
Andrew Poelstra
|
a4e1fd2f33
|
Merge 0180453471 into merged_master (Bitcoin PR #21595)
|
2021-06-30 22:59:13 +00:00 |
|
Andrew Poelstra
|
7a6382c3ac
|
Merge 30a86bb814 into merged_master (Bitcoin PR bitcoin/bitcoin#21733)
|
2021-06-30 22:46:44 +00:00 |
|
Andrew Poelstra
|
d6417d70e8
|
Merge 572b36d4ff into merged_master (Bitcoin PR bitcoin/bitcoin#21736)
|
2021-06-30 22:34:04 +00:00 |
|
Andrew Poelstra
|
579df93eb7
|
Merge 906ecb87c8 into merged_master (Bitcoin PR #21238)
|
2021-06-30 22:21:20 +00:00 |
|
Andrew Poelstra
|
d273c001cc
|
Merge de77cbc9d8 into merged_master (Bitcoin PR bitcoin/bitcoin#21691)
|
2021-06-30 22:08:56 +00:00 |
|
Andrew Poelstra
|
6995de8b1a
|
Merge a839303edc into merged_master (Bitcoin PR #21244)
|
2021-06-30 21:56:22 +00:00 |
|
Andrew Poelstra
|
f3e6a1cdcf
|
Merge 67a359313f into merged_master (Bitcoin PR #21728)
|
2021-06-30 21:42:07 +00:00 |
|
Andrew Poelstra
|
73880cb3b2
|
Merge 13d27b452d into merged_master (Bitcoin PR bitcoin-core/gui#276)
|
2021-06-30 21:29:29 +00:00 |
|
Andrew Poelstra
|
3853f8f7d4
|
Merge cfec4a1dad into merged_master (Bitcoin PR bitcoin/bitcoin#21280)
|
2021-06-30 21:17:01 +00:00 |
|
Andrew Poelstra
|
b791c544d7
|
Merge 83c715415a into merged_master (Bitcoin PR #20857)
|
2021-06-30 21:04:37 +00:00 |
|
Andrew Poelstra
|
b9a6573841
|
Merge d4300a10dd into merged_master (Bitcoin PR #21679)
|
2021-06-30 20:52:10 +00:00 |
|
Andrew Poelstra
|
40c1bcbee1
|
Merge 17b51cd5cb into merged_master (Bitcoin PR #21713)
|
2021-06-30 20:16:23 +00:00 |
|
Andrew Poelstra
|
13cb5b5be2
|
Merge ed133fe005 into merged_master (Bitcoin PR #21615)
|
2021-06-30 20:03:30 +00:00 |
|
Andrew Poelstra
|
2905d3d747
|
Merge a47ae618a0 into merged_master (Bitcoin PR #21718)
|
2021-06-30 19:33:08 +00:00 |
|
Andrew Poelstra
|
13aa8af68b
|
Merge 0dd7b23489 into merged_master (Bitcoin PR #21391)
|
2021-06-30 19:20:29 +00:00 |
|
Andrew Poelstra
|
4ea4b46b9a
|
Merge 4a1751a929 into merged_master (Bitcoin PR bitcoin-core/gui#277)
|
2021-06-30 18:40:08 +00:00 |
|
Andrew Poelstra
|
fa8b9c084f
|
Merge f5e8bcf985 into merged_master (Bitcoin PR #21689)
|
2021-06-30 18:27:35 +00:00 |
|