Commit graph

2031 commits

Author SHA1 Message Date
Andrew Poelstra
31aa2513fb Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd Merge d960d5ca99 into merged_master (Bitcoin PR #16362) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
3712040104 Merge 0626b8cbdf into merged_master (Bitcoin PR #16445) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
4619326139 Merge 67923d6b3c into merged_master (Bitcoin PR #16366) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e0c1107d3 Merge 065401bc63 into merged_master (Elements PR #674) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
04f0e67e67 Merge 51a6e2c419 into merged_master (Bitcoin PR #15681) 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
bae56b4d8e Merge 89d7229c9c into merged_master (Bitcoin PR #16420) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e09e584fd Merge 0515406acb into merged_master (Bitcoin PR #16374) 2020-11-09 21:20:06 +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
47aaf203e4 Merge 8f9725c83f into merged_master (Bitcoin PR #16390) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
3a0de44d90 Merge 0822b44d8a into merged_master (Bitcoin PR #15282) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
3b2e901b3e Merge 536590f358 into merged_master (Bitcoin PR #16334) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
7774f13936 Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
f245eedfcc Merge 345f42a9e3 into merged_master (Bitcoin PR #14505) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
15f0fb459f Merge 4882040182 into merged_master (Bitcoin PR #16291) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2cfd0717bc Merge b5fa2319d8 into merged_master (Bitcoin PR #15687) 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
13fa126076 Merge 1088b90cba into merged_master (Bitcoin PR #16327) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
3845f53ef3 Merge 1381ddbcfc into merged_master (Bitcoin PR #16329) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
7bcd9637cf Merge 11de669d8b into merged_master (Bitcoin PR #16325) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
c755b376d1 Merge 9339008a9d into merged_master (Bitcoin PR #15483) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
5faac4d177 Merge e06067387e into merged_master (Bitcoin PR #16250) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
16a3be0fc8 Merge 2f717fb5cd into merged_master (Bitcoin PR #15427) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
1750fbd46c Merge 545836e5b1 into merged_master (Elements PR #655) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
969b50e413 Merge 1212808762 into merged_master (Bitcoin PR #16257) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
d97e53163b Merge e7f3450b7d into merged_master (Bitcoin PR #16302) 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
bb82340205 Merge 7b302eb99d into merged_master (Elements PR #663) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f59cc8301d Merge a409d015e9 into merged_master (Elements PR #661) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f68fbc1a56 Merge fd333e15a5 into merged_master (Bitcoin PR #16226) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
c995586189 Merge 303ec103ba into merged_master (Bitcoin PR #16026) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
399dd855d9 Merge ea45967e85 into merged_master (Bitcoin PR #16234) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
6515bef81f Merge 413e438ea9 into merged_master (Bitcoin PR #16243) 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
1b9fe24406 Merge ac4d38c337 into merged_master (Bitcoin PR #16236) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
e596f32b6f Merge 0853d8d2fd into merged_master (Bitcoin PR #16112) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0 Merge e2182b02b5 into merged_master (Bitcoin PR #16171) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
66474e84c9 Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
046cf94f99 Merge d9bafca20c into merged_master (Bitcoin PR #15982) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
0e110f2b6e Merge fce4123242 into merged_master (Bitcoin PR #16217) 2020-11-06 15:20:15 +00:00
Andrew Poelstra
e33ff205ee Merge 1a274bce4b into merged_master (Bitcoin PR #16205) 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
25946f0bae Merge 431d81b61c into merged_master (Bitcoin PR #15991) 2020-11-06 15:20:14 +00:00
Andrew Poelstra
2834091bbf Merge 5d2ccf0ce9 into merged_master (Bitcoin PR #15024)
lol thank Steven for hal
2020-11-06 15:20:13 +00:00
Andrew Poelstra
daa130fe7b Merge ee642f5862 into merged_master (Elements PR #658) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
738a42292f Merge 52ec4c64e8 into merged_master (Bitcoin PR #16144) 2020-11-06 15:20:12 +00:00
Andrew Poelstra
55de6ee0b7 Merge d8247a4143 into merged_master (Elements PR #640) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
bbc59975b0 Merge 4858d36163 into merged_master (Elements PR #639) 2020-11-06 15:20:11 +00:00