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
2f2c49cd6b
Merge 52d84a45e2 into merged_master (Bitcoin PR #20987 )
2021-06-18 19:27:17 +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
0249d0613b
Merge f707fcde9a into merged_master (Bitcoin PR #20958 )
2021-06-18 17:38:26 +00:00
Andrew Poelstra
a38a31cba4
Merge e31af1065e into merged_master (Bitcoin PR #20989 )
2021-06-18 17:23:26 +00:00
Andrew Poelstra
411918cc67
Merge 32b191fb66 into merged_master (Bitcoin PR #20927 )
2021-06-18 17:08:20 +00:00
Andrew Poelstra
1eb4acb495
Merge b7e12b350d into merged_master (Bitcoin PR #20985 )
2021-06-18 16:53:31 +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
43990bcae3
Merge d6c3c43ef8 into merged_master (Bitcoin PR #20983 )
2021-06-18 16:08:47 +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
a9ab76769e
Merge 11cbd4bb54 into merged_master (Bitcoin PR #17556 )
...
This PR eliminates "strange regtest=0 behavior" in a test which had forced
us to disable the test for Elements. Can re-enable now :)
I also removed the `chain_in_args` parameter to `TestNode`, which Steven added
in https://github.com/ElementsProject/elements/pull/533 (which itself replaces
unconditionally adding chain={} on the command-line, which was added in #458 ).
These were added in the 0.17 rebase to deal with the job of starting bitcoind,
which then did not support the `chain=` command-line arg as well as elementsd,
which back then required this command-line arg.
This was causing some issues with the "check -acceptnonstdtxn doesn't work on
mainnet" test because it would add -chain=elementsregtest to the command-line
of a daemon that was supposed to be connecting to mainnet/liquidv1. It is
possible to override this behavior, but since 0.20+ versions of elementsd and
bitcoind have essentially the same support for chain= options, it seemed
cleaner to just eliminate the diff.
2021-06-18 14:40:09 +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
6f0f1d4268
Merge 3734adba39 into merged_master (Bitcoin PR #20953 )
2021-06-18 03:37:39 +00:00
Andrew Poelstra
00d89d372d
Merge 80486e7e2d into merged_master (Bitcoin PR #20952 )
2021-06-18 03:22:42 +00:00
Andrew Poelstra
10af791eb8
Merge 977bec1d93 into merged_master (Bitcoin PR #20937 )
2021-06-18 03:08:03 +00:00
Andrew Poelstra
9e4190cd76
Merge bc51b99bd5 into merged_master (Bitcoin PR #20891 )
2021-06-18 02:53:26 +00:00
Andrew Poelstra
f2ae9bd8c7
Merge dd545c53a5 into merged_master (Bitcoin PR #20906 )
2021-06-18 01:53:49 +00:00
Andrew Poelstra
9245e976e7
Merge 43f3ada27b into merged_master (Bitcoin PR #19866 )
2021-06-18 01:38:29 +00:00
Andrew Poelstra
275ad72c87
Merge f7fd76bcc0 into merged_master (Bitcoin PR #20880 )
2021-06-18 01:10:19 +00:00
Andrew Poelstra
424c469e10
Merge ca8218301b into merged_master (Bitcoin PR #20884 )
2021-06-18 00:29:08 +00:00
Andrew Poelstra
98341856ab
Merge 991e612c3b into merged_master (Bitcoin PR #20955 )
2021-06-17 23:59:48 +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
d660da8655
Merge 30e664dcce into merged_master (Bitcoin PR #20945 )
2021-06-17 23:15:03 +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
752c398094
Merge ad571bd354 into merged_master (Bitcoin PR #20931 )
2021-06-17 21:37: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
bf8b9387ba
Merge 18017152c2 into merged_master (Bitcoin PR #20619 )
2021-06-17 18:02:38 +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
