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

Merge branch 'master' into catchup

Browse source
This commit is contained in:
Steven Roose 2019-05-14 15:11:48 +01:00
commit dc900eb7d7
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
10 changed files with 137 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/mining.cpp
View file

@ -1034,7 +1034,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
" \"complete\": true|false (numeric) If block is complete \n"
"}\n"
"\nExamples:\n"
+ HelpExampleCli("combineblocksigs", "<hex> [\"signature1\", \"signature2\", ...]")
+ HelpExampleCli("combineblocksigs", "<hex> '[{\"pubkey\":\"hex\",\"sig\":\"hex\"}, ...]'")
);
if (!g_signed_blocks) {