Andrew Poelstra
d504893530
Merge 12a1c3ad1a into merged_master (Bitcoin PR #20107 )
2020-11-30 17:06:15 +00:00
Andrew Poelstra
d3cbe231b7
Merge 6854dbdc88 into merged_master (Bitcoin PR #20076 )
2020-11-30 17:00:03 +00:00
Andrew Poelstra
77c3300ae3
Merge df2129a234 into merged_master (Bitcoin PR #19991 )
...
I had to make up an onion service target port for Liquid and for our custom
params, so I chose 37041 and 37040 to roughly match how signet just adds
30000 to its normal port.
2020-11-30 04:44:21 +00:00
Andrew Poelstra
350d1098f1
Merge a0185d90a7 into merged_master (Bitcoin PR #18309 )
2020-11-30 03:53:02 +00:00
Andrew Poelstra
fb606bb6ad
Merge 72affcb16c into merged_master (Bitcoin PR #19802 )
2020-11-30 03:03:08 +00:00
Andrew Poelstra
33a0d5e270
Merge 301959fa74 into merged_master (Bitcoin PR #20043 )
2020-11-30 02:42:44 +00:00
Andrew Poelstra
3a833cdb0e
Merge e36aa351a3 into merged_master (Bitcoin PR #19969 )
2020-11-29 23:45:31 +00:00
Andrew Poelstra
e20126cae4
Merge 2552702000 into merged_master (Bitcoin PR #15367 )
2020-11-29 23:02:09 +00:00
Andrew Poelstra
65b01321e2
Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725 )
2020-11-29 22:09:36 +00:00
Andrew Poelstra
a34b91cda7
Merge 8235dca621 into merged_master (Bitcoin PR #19979 )
2020-11-29 19:50:32 +00:00
Andrew Poelstra
7a8f77d7ad
Merge 9e217f5a6f into merged_master (Bitcoin PR #19572 )
2020-11-29 19:44:31 +00:00
Andrew Poelstra
c1f937fe53
Merge 8219893825 into merged_master (Bitcoin PR #19993 )
2020-11-29 18:52:06 +00:00
Andrew Poelstra
81a3dda09b
Merge c30f79d418 into merged_master (Bitcoin PR #19940 )
2020-11-29 14:00:02 +00:00
Andrew Poelstra
a7602fb56d
Merge 652c45fdbb into merged_master (Bitcoin PR #15454 )
2020-11-29 06:12:28 +00:00
Andrew Poelstra
afd00d41af
Merge 5d5e335f96 into merged_master (Bitcoin PR #19903 )
2020-11-29 04:39:03 +00:00
Andrew Poelstra
5e62edcf8e
Merge ffaac6e614 into merged_master (Bitcoin PR #16378 )
...
Adds a new "send" RPC which I didn't really look at too closely to match
our other RPC modifications. In particular our backport of #17211 adds a
"solving_data" field to other transaction-creation RPCs, but not this
one. (But I checked the current status of #17211 and Andy hasn't updated
upstream either, just passes NullUniValue to FundTransaction from `send`.
So that's what I did here.)
2020-11-29 04:33:22 +00:00
Andrew Poelstra
246b11ff76
Merge dffefda21d into merged_master (Bitcoin PR #19870 )
2020-11-29 02:54:55 +00:00
Andrew Poelstra
532e650b1d
Merge 23d3ae7acc into merged_master (Bitcoin PR #19405 )
2020-11-28 22:56:34 +00:00
Andrew Poelstra
646aa14168
Merge a0a422c34c into merged_master (Bitcoin PR #19754 )
2020-11-28 22:31:57 +00:00
Andrew Poelstra
b28ab82f99
Merge 3a3e21dafb into merged_master (Bitcoin PR #14687 )
2020-11-28 20:23:56 +00:00
Andrew Poelstra
b306593374
Merge bab4cce1b0 into merged_master (Bitcoin PR #19668 )
2020-11-28 19:57:58 +00:00
Andrew Poelstra
afe472121a
Merge a1d14f522c into merged_master (Bitcoin PR #19671 )
2020-11-28 19:48:53 +00:00
Andrew Poelstra
5f6eb8ee3f
Merge f98872f127 into merged_master (Bitcoin PR #18244 )
2020-11-28 18:55:44 +00:00
Andrew Poelstra
19dc3ee256
Merge 8d6224fefe into merged_master (Bitcoin PR #19628 )
2020-11-28 12:24:29 +00:00
Andrew Poelstra
33ae4adbbd
Merge 7f609f68d8 into merged_master (Bitcoin PR #19731 )
2020-11-28 04:26:09 +00:00
Andrew Poelstra
c3a261adfa
Merge 27eeb0337b into merged_master (Bitcoin PR #19550 )
2020-11-28 01:58:59 +00:00
Andrew Poelstra
ddd9b819bb
Merge a2a250c7d0 into merged_master (Bitcoin PR #19743 )
2020-11-28 00:53:18 +00:00
Andrew Poelstra
e10dd69c55
Merge a0e75bd31d into merged_master (Bitcoin PR #15937 )
2020-11-27 20:39:27 +00:00
Andrew Poelstra
6ae18f374c
Merge 6d5a9fec2d into merged_master (Bitcoin PR #19605 )
2020-11-27 05:29:59 +00:00
Andrew Poelstra
f92a3d1ed4
Merge 6ea7348122 into merged_master (Bitcoin PR #19638 )
2020-11-27 03:15:08 +00:00
Andrew Poelstra
d124975ffd
Merge 82127d27c9 into merged_master (Bitcoin PR #19667 )
2020-11-27 02:41:18 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
66b52025b1
Merge 8443fb11ad into merged_master (Bitcoin PR #19637 )
2020-11-26 23:37:01 +00:00
Andrew Poelstra
0ddf4fafae
Merge f7c73b03d9 into merged_master (Bitcoin PR #19569 )
2020-11-26 23:15:28 +00:00
Andrew Poelstra
0f9a38732c
Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011 )
2020-11-26 21:44:11 +00:00
Andrew Poelstra
e377f4f773
Merge f4cfa6d019 into merged_master (Bitcoin PR #15935 )
2020-11-26 18:11:36 +00:00
Andrew Poelstra
c6cb7be640
Merge c57dc566b0 into merged_master (Bitcoin PR #16525 )
2020-11-26 12:15:14 +00:00
Andrew Poelstra
69313c4329
Merge 21209c9cce into merged_master (Bitcoin PR #19512 )
2020-11-26 05:14:51 +00:00
Andrew Poelstra
10eade5ba9
Merge b93c4244b9 into merged_master (Bitcoin PR #19464 )
2020-11-26 02:44:00 +00:00
Andrew Poelstra
ca9a164968
Merge 37485baa27 into merged_master (Bitcoin PR #19483 )
2020-11-26 02:21:01 +00:00
Andrew Poelstra
74108c6a87
Merge 4db44acf2d into merged_master (Bitcoin PR #18202 )
...
What a pain. Again, not naming names, but it was Sjors again.
2020-11-26 01:46:05 +00:00
Andrew Poelstra
52c243844d
Merge ca055885c6 into merged_master (Bitcoin PR #19474 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
37cb4fdaba
Merge a4eb6a51a7 into merged_master (Bitcoin PR #19469 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
09f5846d79
Merge fd9db45c3e into merged_master (Bitcoin PR #19258 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
874de6a557
Merge cc9d09e73d into merged_master (Bitcoin PR #19191 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
d7e7e5201c
Merge 45f58dbc9b into merged_master (Bitcoin PR #19452 )
2020-11-26 01:09:21 +00:00
Andrew Poelstra
ceefa62cdb
Merge abdfd2d0e3 into merged_master (Bitcoin PR #19219 )
2020-11-26 01:09:20 +00:00
Andrew Poelstra
95afc45f8b
Merge 85a68952f8 into merged_master (Bitcoin PR #19408 )
2020-11-26 01:09:17 +00:00
Andrew Poelstra
8d7360e77e
Merge fb87f6d168 into merged_master (Bitcoin PR #19367 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
3ca5870220
Merge 2f54c76050 into merged_master (Bitcoin PR #19390 )
2020-11-26 01:09:14 +00:00
