Commit graph

3196 commits

Author SHA1 Message Date
Andrew Poelstra
1b85209c18 Merge 1769828684 into merged_master (Bitcoin PR #19501)
Adds "verbose" flag to a bunch of RPC that pass through to SendMoney. I also
added it to sendtomainchain and destroyamount.
2020-11-30 02:17:54 +00:00
Andrew Poelstra
64bfdd9af8 Merge 8aa6178961 into merged_master (Bitcoin PR #20003) 2020-11-30 00:24:10 +00:00
Andrew Poelstra
7c68cb4fb0 Merge 6af9b31bfc into merged_master (Bitcoin PR #19107) 2020-11-29 23:52:21 +00:00
Andrew Poelstra
3a833cdb0e Merge e36aa351a3 into merged_master (Bitcoin PR #19969) 2020-11-29 23:45:31 +00:00
Andrew Poelstra
1da43aaaf0 Merge 7ea649946d into merged_master (Bitcoin PR #20028) 2020-11-29 23:39:40 +00:00
Andrew Poelstra
62ec516ac7 Merge e7e6f0bf18 into merged_master (Bitcoin PR #20026) 2020-11-29 22:25:26 +00:00
Andrew Poelstra
67531848a8 Merge 055abfbc5a into merged_master (Bitcoin PR #20023) 2020-11-29 22:19:20 +00:00
Andrew Poelstra
65b01321e2 Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725) 2020-11-29 22:09:36 +00:00
Andrew Poelstra
614dbd26f4 Merge 8aa3a4a498 into merged_master (Bitcoin PR #20022) 2020-11-29 22:04:07 +00:00
Andrew Poelstra
52c2d8e525 Merge 78f912c901 into merged_master (Bitcoin PR #19804) 2020-11-29 21:58:22 +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
7892a185b5 Merge b1291b2e8f into merged_master (Bitcoin PR #19963) 2020-11-29 18:29:03 +00:00
Andrew Poelstra
f9355ded4a Merge bca68fe713 into merged_master (Elements PR #906) 2020-11-29 18:17:16 +00:00
Andrew Poelstra
455f61c0db Merge 8c5f68118c into merged_master (Bitcoin PR #18267)
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.

I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
592ecdc084 Merge c0c409dcd3 into merged_master (Bitcoin PR #19697) 2020-11-29 14:42:20 +00:00
Andrew Poelstra
ca42c615f0 Merge b99a1633b2 into merged_master (Bitcoin PR #19781) 2020-11-29 14:25:26 +00:00
Andrew Poelstra
81a3dda09b Merge c30f79d418 into merged_master (Bitcoin PR #19940) 2020-11-29 14:00:02 +00:00
Andrew Poelstra
28c2a096e4 Merge 967be53aee into merged_master (Bitcoin PR #19971) 2020-11-29 06:18:11 +00:00
Andrew Poelstra
a7602fb56d Merge 652c45fdbb into merged_master (Bitcoin PR #15454) 2020-11-29 06:12:28 +00:00
Andrew Poelstra
b2cc574f87 Merge a518b1c26b into merged_master (Bitcoin PR #19936) 2020-11-29 05:48:24 +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
af5429c8ac Merge f2d9934381 into merged_master (Bitcoin PR #19922) 2020-11-29 03:11:53 +00:00
Andrew Poelstra
3f50e404e0 Merge 564e1ab0f3 into merged_master (Bitcoin PR #19800) 2020-11-29 02:37:47 +00:00
Andrew Poelstra
d4e8eb56b0 Merge 56d47e19ed into merged_master (Bitcoin PR #19619) 2020-11-29 00:21:17 +00:00
Andrew Poelstra
735ead6bdd Merge af8135e369 into merged_master (Bitcoin PR #19897) 2020-11-28 23:53:49 +00:00
Andrew Poelstra
15764533c6 Merge c91f955f44 into merged_master (Bitcoin PR #19887) 2020-11-28 23:42:28 +00:00
Andrew Poelstra
532e650b1d Merge 23d3ae7acc into merged_master (Bitcoin PR #19405) 2020-11-28 22:56:34 +00:00
Andrew Poelstra
897f8be4ef Merge bd60a9a8ed into merged_master (Bitcoin PR #19818) 2020-11-28 22:14:15 +00:00
Andrew Poelstra
c67e668003 Merge 4053de04e2 into merged_master (Bitcoin PR #19859) 2020-11-28 21:56:01 +00:00
Andrew Poelstra
f5f5be3203 Merge 136fe4c5e9 into merged_master (Bitcoin PR #19816) 2020-11-28 21:25:31 +00:00
Andrew Poelstra
9a200a587e Merge 505b39e72b into merged_master (Bitcoin PR #19610) 2020-11-28 20:35:13 +00:00
Andrew Poelstra
ef13698934 Merge 48c1083632 into merged_master (Bitcoin PR #19105) 2020-11-28 20:18:13 +00:00
Andrew Poelstra
afe472121a Merge a1d14f522c into merged_master (Bitcoin PR #19671) 2020-11-28 19:48:53 +00:00
Andrew Poelstra
aba7e8ce09 Merge e796fdd4cb into merged_master (Bitcoin PR #19507) 2020-11-28 19:42:25 +00:00
Andrew Poelstra
ad7f014d11 Merge 89a8299a14 into merged_master (Bitcoin PR #19717) 2020-11-28 19:34:51 +00:00
Andrew Poelstra
55ff198606 Merge c1e0c2ad3b into merged_master (Bitcoin PR #19813) 2020-11-28 19:05:58 +00:00
Andrew Poelstra
5f6eb8ee3f Merge f98872f127 into merged_master (Bitcoin PR #18244) 2020-11-28 18:55:44 +00:00
Andrew Poelstra
f4b291f821 Merge 28f4e53e16 into merged_master (Bitcoin PR #19752) 2020-11-28 14:17:23 +00:00
Andrew Poelstra
244842d053 Merge 30568d3f1e into merged_master (Bitcoin PR #19778) 2020-11-28 14:10:06 +00:00
Andrew Poelstra
66ad009d69 Merge e80e5b3e4f into merged_master (Bitcoin PR #19760) 2020-11-28 13:25:26 +00:00
Andrew Poelstra
33ae4adbbd Merge 7f609f68d8 into merged_master (Bitcoin PR #19731) 2020-11-28 04:26:09 +00:00
Andrew Poelstra
d259272d65 Merge d254e6e795 into merged_master (Bitcoin PR #19722) 2020-11-28 03:42:57 +00:00
Andrew Poelstra
c3a261adfa Merge 27eeb0337b into merged_master (Bitcoin PR #19550) 2020-11-28 01:58:59 +00:00
Andrew Poelstra
d8cd6721bf Merge 70d7ddbcbb into merged_master (Bitcoin PR #19727) 2020-11-28 01:52:15 +00:00
Andrew Poelstra
ddd9b819bb Merge a2a250c7d0 into merged_master (Bitcoin PR #19743) 2020-11-28 00:53:18 +00:00
Andrew Poelstra
fa471ad724 Merge e6e277f9ed into merged_master (Bitcoin PR #19756)
lol
2020-11-28 00:31:20 +00:00
Andrew Poelstra
f197c02e18 Merge c831e105c5 into merged_master (Bitcoin PR #14582) 2020-11-27 23:36:05 +00:00
Andrew Poelstra
96355612d7 Merge a57af897ec into merged_master (Bitcoin PR #19564) 2020-11-27 21:49:18 +00:00
Andrew Poelstra
5282cc36d3 Merge 3ab2582c7f into merged_master (Bitcoin PR #19730) 2020-11-27 21:43:55 +00:00