Andrew Poelstra
369ebdda10
Merge 4f5ae52738 into merged_master (Bitcoin PR #20006 )
2020-11-30 02:35:18 +00:00
Andrew Poelstra
e3853b414c
Merge 5c435c78e3 into merged_master (Bitcoin PR #20036 )
2020-11-30 02:29:24 +00:00
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
2d56dfbcbd
Merge 36f5a58c02 into merged_master (Bitcoin PR #19960 )
2020-11-30 00:52:00 +00:00
Andrew Poelstra
b64dffc7ec
Merge c7ad94428a into merged_master (Bitcoin PR #19958 )
2020-11-30 00:42:46 +00:00
Andrew Poelstra
6356801582
Merge de4b7f25ac into merged_master (Bitcoin PR #20015 )
2020-11-30 00:36:53 +00:00
Andrew Poelstra
c364bcefad
Merge 9e6f56f6ea into merged_master (Bitcoin PR #19984 )
2020-11-30 00:30:38 +00:00
Andrew Poelstra
64bfdd9af8
Merge 8aa6178961 into merged_master (Bitcoin PR #20003 )
2020-11-30 00:24:10 +00:00
Andrew Poelstra
5a731b1c03
Merge d82b2c6e65 into merged_master (Bitcoin PR #19898 )
2020-11-30 00:17:21 +00:00
Andrew Poelstra
61e047512c
Merge ec9b4492eb into merged_master (Bitcoin PR #19630 )
2020-11-30 00:08:23 +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
1f47015ba6
Merge 5db44c740e into merged_master (Bitcoin PR #20014 )
2020-11-29 23:32:59 +00:00
Andrew Poelstra
850b0e367b
Merge 655937ebcb into merged_master (Bitcoin PR #19845 )
2020-11-29 23:08:29 +00:00
Andrew Poelstra
e20126cae4
Merge 2552702000 into merged_master (Bitcoin PR #15367 )
2020-11-29 23:02:09 +00:00
Andrew Poelstra
d105732185
Merge ec9b28e089 into merged_master (Elements PR #910 )
2020-11-29 22:55:33 +00:00
Andrew Poelstra
07d50b2951
Merge c95784e3d3 into merged_master (Bitcoin PR #20016 )
2020-11-29 22:31:43 +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
5f5f4279ed
Merge 1b313cacc9 into merged_master (Bitcoin PR #19927 )
2020-11-29 21:07:46 +00:00
Andrew Poelstra
029320f540
Merge 43305e9810 into merged_master (Bitcoin PR #19868 )
2020-11-29 21:00:57 +00:00
Andrew Poelstra
915a1a4182
Merge 5e14fafb31 into merged_master (Bitcoin PR #19994 )
...
We have a couple RPC hacks in src/wallet/rpcwallet.cpp that were a bit annoying
to adapt, but nothing too bad.
Found a misspelling of `ignoreblindfail` in the `sendtoaddress` args, and a
discrepancy in the `createrawpegin`/`createpegin` args
2020-11-29 20:51:00 +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
7892a185b5
Merge b1291b2e8f into merged_master (Bitcoin PR #19963 )
2020-11-29 18:29:03 +00:00
Andrew Poelstra
b260d5c229
Merge c7eb85d005 into merged_master (Bitcoin PR #19959 )
2020-11-29 18:23:10 +00:00
Andrew Poelstra
f9355ded4a
Merge bca68fe713 into merged_master (Elements PR #906 )
2020-11-29 18:17:16 +00:00
Andrew Poelstra
5c1a330c57
Merge d692d192cd into merged_master (Bitcoin PR #19849 )
...
More RPC cleanups. This one discovered that the `createpsbt` and
`rawblindrawtransaction` RPCs had incorrect argument lists :)
2020-11-29 17:58:59 +00:00
Andrew Poelstra
1c0f4b7a7d
Merge 77376034d4 into merged_master (Bitcoin PR #17785 )
2020-11-29 17:04:21 +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
a1b43a0ae5
Merge 38fd1bdcd4 into merged_master (Bitcoin PR #18949 )
2020-11-29 14:19:15 +00:00
Andrew Poelstra
0a093f742b
Merge 831b0ecea9 into merged_master (Bitcoin PR #13686 )
2020-11-29 14:12:27 +00:00
Andrew Poelstra
8804910783
Merge 83b23848f7 into merged_master (Bitcoin PR #18790 )
2020-11-29 14:06:06 +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
42ec9ecdbe
Merge be3af4f310 into merged_master (Bitcoin PR #19934 )
2020-11-29 05:54:04 +00:00
Andrew Poelstra
b2cc574f87
Merge a518b1c26b into merged_master (Bitcoin PR #19936 )
2020-11-29 05:48:24 +00:00
Andrew Poelstra
28f22e39af
Merge 1c4f59728c into merged_master (Bitcoin PR #19879 )
2020-11-29 05:32:13 +00:00
Andrew Poelstra
3a620fbb0a
Merge 62e3eb9888 into merged_master (Bitcoin PR #19241 )
...
This caused a segfault because we have no checkpoints. Added a NULL check
which jnewbery suggested on the original PR, but for some reason didn't
get in.
2020-11-29 05:16:14 +00:00
Andrew Poelstra
510dbdf232
Merge 48a9968e50 into merged_master (Bitcoin PR #19558 )
2020-11-29 04:52:57 +00:00
Andrew Poelstra
e62380314d
Merge a33651866c into merged_master (Bitcoin PR #19643 )
2020-11-29 04:45:04 +00:00
Andrew Poelstra
afd00d41af
Merge 5d5e335f96 into merged_master (Bitcoin PR #19903 )
2020-11-29 04:39:03 +00:00
