diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-03-02 10:04:10 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-03-02 10:11:35 +0100 |
| commit | 37f236acc6de08745118ac6cb4268bb5206e67c6 (patch) | |
| tree | fdf15f5fc73e9b240b8e7136e916e0caddc8adae | |
| parent | f9dbb319d26f41c2b0b56982a79639844ddf1e9d (diff) | |
| parent | 9586157c0f9c12d3cfa55926ccc6c022324fa60a (diff) | |
| download | bitcoin-37f236acc6de08745118ac6cb4268bb5206e67c6.tar.xz | |
Merge #15510: [rpc] deriveaddresses: add range to CRPCConvertParam
9586157c0f9c12d3cfa55926ccc6c022324fa60a [rpc] deriveaddresses: add range to CRPCConvertParam (Sjors Provoost)
Pull request description:
Missing from #15497
Tree-SHA512: 469de3f896bcd3435a480685e5257c51ba895df0311329d5e5a3cb2e1894e5358324473d998ea45221776aefe8836a7af6c4f12198a36d2d10bf6761991cfd60
| -rw-r--r-- | src/rpc/client.cpp | 3 | ||||
| -rw-r--r-- | src/rpc/misc.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 1cdc9f87a7..82424ab521 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -68,8 +68,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "sendmany", 4, "subtractfeefrom" }, { "sendmany", 5 , "replaceable" }, { "sendmany", 6 , "conf_target" }, - { "deriveaddresses", 1, "begin" }, - { "deriveaddresses", 2, "end" }, + { "deriveaddresses", 1, "range" }, { "scantxoutset", 1, "scanobjects" }, { "addmultisigaddress", 0, "nrequired" }, { "addmultisigaddress", 1, "keys" }, diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 765fd772fe..822a0beef9 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -603,7 +603,7 @@ static const CRPCCommand commands[] = { "control", "logging", &logging, {"include", "exclude"}}, { "util", "validateaddress", &validateaddress, {"address"} }, { "util", "createmultisig", &createmultisig, {"nrequired","keys","address_type"} }, - { "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"} }, |