Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports 0.18 pr19 #4642

Merged
merged 8 commits into from
May 29, 2022
Merged

Backports 0.18 pr19 #4642

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3794c9
Merge #15510: [rpc] deriveaddresses: add range to CRPCConvertParam
laanwj Mar 2, 2019
8a62dfc
Merge #15477: doc: Remove misleading hint in getrawtransaction
laanwj Feb 27, 2019
d3d2d5f
Merge #15456: Enable PID file creation on WIN
laanwj Feb 25, 2019
26d6ace
Merge #14212: build: Remove libssl from LDADD unless gui
Sep 15, 2018
a557022
Merge #14092: tests: Dry run bench_bitcoin as part "make check" to al…
Nov 5, 2018
15df1dc
Merge #13966: gui: When private key is disabled, only show watch-only…
laanwj Dec 1, 2018
3dbc611
Merge #14993: rpc: Fix data race (UB) in InterruptRPC()
laanwj Dec 19, 2018
22ae9fd
Merge #14794: tests: Add AddressSanitizer (ASan) Travis build
Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Merge bitcoin#15510: [rpc] deriveaddresses: add range to CRPCConvertP… 
…aram

9586157 [rpc] deriveaddresses: add range to CRPCConvertParam (Sjors Provoost)

Pull request description:

  Missing from bitcoin#15497

Tree-SHA512: 469de3f896bcd3435a480685e5257c51ba895df0311329d5e5a3cb2e1894e5358324473d998ea45221776aefe8836a7af6c4f12198a36d2d10bf6761991cfd60
  • Loading branch information
@laanwj @Munkybooty
laanwj authored and Munkybooty committed May 17, 2022
commit c3794c9e86065d9742670e04ed5fd19168e334ea
3 changes: 1 addition & 2 deletions src/rpc/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "sendmany", 6, "use_is" },
{ "sendmany", 7, "use_cj" },
{ "sendmany", 8, "conf_target" },
{ "deriveaddresses", 1, "begin" },
{ "deriveaddresses", 2, "end" },
{ "deriveaddresses", 1, "range" },
{ "scantxoutset", 1, "scanobjects" },
{ "addmultisigaddress", 0, "nrequired" },
{ "addmultisigaddress", 1, "keys" },
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ static const CRPCCommand commands[] =
{ "control", "logging", &logging, {"include", "exclude"}},
{ "util", "validateaddress", &validateaddress, {"address"} },
{ "util", "createmultisig", &createmultisig, {"nrequired","keys"} },
{ "util", "deriveaddresses", &deriveaddresses, {"descriptor", "begin", "end"} },
{ "util", "deriveaddresses", &deriveaddresses, {"descriptor", "range"} },
{ "util", "getdescriptorinfo", &getdescriptorinfo, {"descriptor"} },
{ "util", "verifymessage", &verifymessage, {"address","signature","message"} },
{ "util", "signmessagewithprivkey", &signmessagewithprivkey, {"privkey","message"} },
Expand Down