Andrew Poelstra
f48bcfe313
Merge 9546a78595 into merged_master (Bitcoin PR #16621 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
b24503fe4b
Merge 085fe76299 into merged_master (Bitcoin PR #16461 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
a211435b8e
Merge d21e8aa0a9 into merged_master (Bitcoin PR #16732 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784
Merge af4100cd6f into merged_master (Bitcoin PR #16404 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
2bc7beced3
Merge db67101c74 into merged_master (Bitcoin PR #16665 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
66f2116668
Merge 910ff94cf5 into merged_master (Bitcoin PR #16690 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
6daf60610f
Merge 70b12af87e into merged_master (Bitcoin PR #16647 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
adb6d02fac
Merge bd62f8d6ee into merged_master (Bitcoin PR #16645 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
543db1b024
Merge 48e5bfe224 into merged_master (Bitcoin PR #16643 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
19def18ab9
Merge 0d65106dce into merged_master (Bitcoin PR #16383 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
04a9709d23
Merge 286332495d into merged_master (Bitcoin PR #16605 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
8d16afe159
Merge c3b605cf13 into merged_master (Bitcoin PR #16586 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
2a7e400289
Merge ac3e65204a into merged_master (Bitcoin PR #16585 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
c175966d12
Merge 32776276ef into merged_master (Bitcoin PR #16574 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
15b414d845
Merge fbe4b7665b into merged_master (Bitcoin PR #16530 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
808c6ab0f0
Merge 1063fc9cf9 into merged_master (Bitcoin PR #16536 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
db933991ff
Merge 6841b01340 into merged_master (Bitcoin PR #16394 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
2d781b0565
Merge 25f0edd59f into merged_master (Bitcoin PR #16448 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
039e455324
Merge 3f288a1c05 into merged_master (Bitcoin PR #16504 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
8dfba71046
Merge b21acab82f into merged_master (Bitcoin PR #15993 )
...
Just kept our version of Travis since I couldn't test it. We'll fix this after the fact.
2020-11-09 21:20:09 +00:00
Andrew Poelstra
bfd57fbd09
Merge 29220250c1 into merged_master (Bitcoin PR #16441 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
e29f1987af
Merge fe001925f8 into merged_master (Bitcoin PR #16455 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
431c7dce23
Merge ad4391ca38 into merged_master (Bitcoin PR #16430 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
dcd3f9fd69
Merge 59ce537a49 into merged_master (Bitcoin PR #16152 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
b57516e11a
Merge 24dbcf3808 into merged_master (Bitcoin PR #15891 )
...
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
473365d335
Merge d1fc827300 into merged_master (Bitcoin PR #16270 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
b1bb63f321
Merge 5859b7dc6f into merged_master (Bitcoin PR #16338 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
843c77a2ff
Merge 983c84844c into merged_master (Bitcoin PR #16352 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
8e3404b818
Merge e1a8d76aff into merged_master (Bitcoin PR #16347 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
1d9458e988
Merge 2b465195e0 into merged_master (Bitcoin PR #16339 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a
Merge 584168c7f9 into merged_master (Bitcoin PR #16326 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413
Merge 1212808762 into merged_master (Bitcoin PR #16257 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
14df5ad8c2
Merge fd925e9b1c into merged_master (Bitcoin PR #16313 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
b42145117d
Merge 04710b6d8c into merged_master (Bitcoin PR #15964 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
ac51ef6930
Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239 )
2020-11-06 15:20:17 +00:00
Andrew Poelstra
f36e4b9cba
Merge 32e9453818 into merged_master (Bitcoin PR #16256 )
2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8
Merge 44d8172323 into merged_master (Bitcoin PR #13756 )
...
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
2020-11-06 15:20:16 +00:00
Andrew Poelstra
83f93df4d0
Merge e2182b02b5 into merged_master (Bitcoin PR #16171 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
9e2fd1df5e
Merge f3855781fd into merged_master (Bitcoin PR #16196 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
413732c74d
Merge 47d981e827 into merged_master (Bitcoin PR #16186 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
19b3c672cb
Merge 8cbeaedee0 into merged_master (Bitcoin PR #16213 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
371b96ff51
Merge 8a503a6c6d into merged_master (Bitcoin PR #16164 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
1f80abfc06
Merge 36fb968825 into merged_master (Bitcoin PR #15461 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
683556d5e3
Merge 51858c57f0 into merged_master (Bitcoin PR #16139 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
a28d8df974
Merge abcce46a33 into merged_master (Bitcoin PR #16039 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
2788d4330e
Merge 411e5f1547 into merged_master (Bitcoin PR #16047 )
2020-10-29 23:29:14 +00:00
Andrew Poelstra
89c96d832d
Merge fe47ae168b into merged_master (Bitcoin PR #16080 )
2020-10-29 21:48:45 +00:00
Andrew Poelstra
6afd6a2a04
Merge 277abed604 into merged_master (Bitcoin PR #15922 )
2020-10-29 19:21:34 +00:00
