Andrew Poelstra
60bc007ba3
Merge 32d44d2b1c into merged_master (Bitcoin PR #21000 )
2021-06-18 21:52:23 +00:00
Andrew Poelstra
6fa372e510
Merge cbe439629e into merged_master (Bitcoin PR bitcoin-core/gui#167 )
2021-06-18 21:21:02 +00:00
Andrew Poelstra
3ab6d6a7ae
Merge 280d0bd0bd into merged_master (Bitcoin PR #21010 )
2021-06-18 21:05:49 +00:00
Andrew Poelstra
6f81fd3b1d
Merge 16ae3368f2 into merged_master (Bitcoin PR #17350 )
2021-06-18 20:50:35 +00:00
Andrew Poelstra
d6c85c5620
Merge 4b15ffe991 into merged_master (Bitcoin PR #20832 )
2021-06-18 20:35:42 +00:00
Andrew Poelstra
a7f2499713
Merge b386d37360 into merged_master (Bitcoin PR #18710 )
2021-06-18 19:12:18 +00:00
Andrew Poelstra
97782ecd34
Merge d0852f39a7 into merged_master (Bitcoin PR #20998 )
2021-06-18 17:53:07 +00:00
Andrew Poelstra
411918cc67
Merge 32b191fb66 into merged_master (Bitcoin PR #20927 )
2021-06-18 17:08:20 +00:00
Andrew Poelstra
3500dec19a
Merge 4bd586607d into merged_master (Bitcoin PR #20523 )
2021-06-18 16:38:40 +00:00
Andrew Poelstra
8e4b38c61e
Merge 019aa248d9 into merged_master (Bitcoin PR #17920 )
2021-06-18 16:23:40 +00:00
Andrew Poelstra
e6aff07a8b
Merge 7f653c3b22 into merged_master (Bitcoin PR bitcoin-core/gui#176 )
2021-06-18 15:51:47 +00:00
Andrew Poelstra
1fb8fad441
Merge 53bbbe5a20 into merged_master (Bitcoin PR bitcoin-core/gui#171 )
2021-06-18 15:15:23 +00:00
Andrew Poelstra
76075ee96a
Merge 45952dab9d into merged_master (Bitcoin PR #20932 )
2021-06-18 15:00:45 +00:00
Andrew Poelstra
052e18313d
Merge 1f45e85509 into merged_master (Bitcoin PR #20972 )
2021-06-18 13:17:11 +00:00
Andrew Poelstra
d7061d9c10
Merge 85fee49c39 into merged_master (Bitcoin PR #20946 )
2021-06-18 13:02:27 +00:00
Andrew Poelstra
00d89d372d
Merge 80486e7e2d into merged_master (Bitcoin PR #20952 )
2021-06-18 03:22:42 +00:00
Andrew Poelstra
9e4190cd76
Merge bc51b99bd5 into merged_master (Bitcoin PR #20891 )
2021-06-18 02:53:26 +00:00
Andrew Poelstra
9245e976e7
Merge 43f3ada27b into merged_master (Bitcoin PR #19866 )
2021-06-18 01:38:29 +00:00
Andrew Poelstra
d9bbd295bc
Merge c763cacb88 into merged_master (Bitcoin PR #20938 )
2021-06-17 23:44:34 +00:00
Andrew Poelstra
8043eb99f4
Merge 7acda55c4f into merged_master (Bitcoin PR #20939 )
2021-06-17 23:29:49 +00:00
Andrew Poelstra
6e0871df92
Merge 32e59fc371 into merged_master (Bitcoin PR #20916 )
2021-06-17 23:00:15 +00:00
Andrew Poelstra
d2062c5730
Merge 0a1cf6c347 into merged_master (Bitcoin PR #20908 )
2021-06-17 22:43:01 +00:00
Andrew Poelstra
653212c39e
Merge f91587f050 into merged_master (Bitcoin PR #20834 )
2021-06-17 22:28:24 +00:00
Andrew Poelstra
0748caa0a7
Merge 29d2aeb4a2 into merged_master (Bitcoin PR #20828 )
...
This diff is probably extremely hard to read because it's a global
indentation change coupled with a ton of branches. But all the
changes (should be) mechanical. No actual changes.
2021-06-17 22:12:53 +00:00
Andrew Poelstra
8add337795
Merge cb2c578451 into merged_master (Bitcoin PR bitcoin-core/gui#148 )
2021-06-17 21:22:54 +00:00
Andrew Poelstra
7edece4a69
Merge 22fa9673b0 into merged_master (Bitcoin PR #20917 )
2021-06-17 21:06:43 +00:00
Andrew Poelstra
50f29236f8
Merge e7eb37128c into merged_master (Bitcoin PR #20913 )
2021-06-17 20:51:51 +00:00
Andrew Poelstra
f9d79c1220
Merge 60427ee35f into merged_master (Bitcoin PR #20811 )
2021-06-17 20:33:57 +00:00
Andrew Poelstra
81f3883b46
Merge 8ffaf5c2f5 into merged_master (Bitcoin PR #19935 )
2021-06-17 20:19:16 +00:00
Andrew Poelstra
c60d414796
Merge 7b975639ef into merged_master (Bitcoin PR #19937 )
2021-06-17 18:27:22 +00:00
Andrew Poelstra
f2ca9433fd
Merge 7838db141b into merged_master (Bitcoin PR #20495 )
2021-06-17 17:47:48 +00:00
Andrew Poelstra
89f673c0bd
Merge 6af013792f into merged_master (Bitcoin PR #19315 )
...
This uses a regtest-only RPC which checks that the chain is literally
"regtest". Since regtest is disabled in Elements (we use elementsregtest)
I weakened the check for this to just check that the chain name has
"regtest" somewhere in it. Hopefully this isn't too magical.
2021-06-17 17:31:47 +00:00
Andrew Poelstra
07f78541bc
Merge 6d81d7aa87 into merged_master (Bitcoin PR #20787 )
2021-06-17 16:46:13 +00:00
Andrew Poelstra
284da932bf
Merge 5cce607105 into merged_master (Bitcoin PR #20373 )
2021-06-17 16:31:30 +00:00
Andrew Poelstra
4b15a86287
Merge 675af2a515 into merged_master (Bitcoin PR #20852 )
2021-06-17 16:16:41 +00:00
Andrew Poelstra
85b597780d
Merge 616eace02a into merged_master (Bitcoin PR bitcoin-core/gui#161 )
2021-06-17 16:01:47 +00:00
Andrew Poelstra
acf709b3ab
Merge bd6af53e1f into merged_master (Bitcoin PR #20480 )
...
what a trainwreck of a programming language..
2021-06-17 15:15:29 +00:00
Andrew Poelstra
4daefd2f5c
Merge c4458cc3a1 into merged_master (Bitcoin PR #18819 )
2021-06-17 13:19:06 +00:00
Andrew Poelstra
e38d520c6c
Merge 0944024309 into merged_master (Bitcoin PR bitcoin-core/gui#163 )
2021-06-17 13:04:06 +00:00
Andrew Poelstra
279362dbd8
Merge 555fc0789d into merged_master (Bitcoin PR #20881 )
2021-06-17 04:05:09 +00:00
Andrew Poelstra
56178bb594
Merge 9158d6f341 into merged_master (Bitcoin PR #20786 )
2021-06-17 03:18:05 +00:00
Andrew Poelstra
80cd2ea2a3
Merge 1e078f17b5 into merged_master (Bitcoin PR #20882 )
2021-06-17 03:02:25 +00:00
Andrew Poelstra
13d5584e76
Merge 86a8b35f32 into merged_master (Bitcoin PR #14501 )
2021-06-17 02:15:46 +00:00
Andrew Poelstra
c5a022192f
Merge d7e2401c62 into merged_master (Bitcoin PR #18077 )
2021-06-17 01:59:15 +00:00
Andrew Poelstra
6afa119596
Merge b6a71b80d2 into merged_master (Bitcoin PR #19055 )
2021-06-16 22:36:48 +00:00
Andrew Poelstra
f92d11e329
Merge 3a6acd1772 into merged_master (Bitcoin PR #20789 )
2021-06-16 22:21:20 +00:00
Andrew Poelstra
7f613c9a12
Merge 4b8b71e630 into merged_master (Bitcoin PR bitcoin-core/gui#173 )
2021-06-16 22:04:54 +00:00
Andrew Poelstra
e71cc0e2ed
Merge 42675e7833 into merged_master (Bitcoin PR #20864 )
2021-06-16 21:48:16 +00:00
Andrew Poelstra
a425d345e2
Merge 8a720ced5f into merged_master (Bitcoin PR bitcoin-core/gui#165 )
2021-06-16 21:15:20 +00:00
Andrew Poelstra
e5cb4cb00e
Merge f13e03cda2 into merged_master (Bitcoin PR #20584 )
2021-06-16 20:58:56 +00:00
