GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:43 +00:00
commit 70819cbab4
13 changed files with 140 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/rpc/client.cpp
View file

@ -27,6 +27,7 @@ public:
static const CRPCConvertParam vRPCConvertParams[] =
{
{ "setmocktime", 0, "timestamp" },
{ "mockscheduler", 0, "delta_time" },
{ "utxoupdatepsbt", 1, "descriptors" },
{ "generatetoaddress", 0, "nblocks" },
{ "generatetoaddress", 2, "maxtries" },