diff options
| author | Pieter Wuille <[email protected]> | 2017-08-22 18:02:33 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2017-09-06 13:07:45 -0700 |
| commit | 5c8ff0d448ffdc6340b195ddfa2128d5f21a839b (patch) | |
| tree | 63a83a0708303a8d8382739c283bb41e07bdc5fe /src/rpc/mining.cpp | |
| parent | Merge #10596: Add vConnect to CConnman::Options (diff) | |
| download | discoin-5c8ff0d448ffdc6340b195ddfa2128d5f21a839b.tar.xz discoin-5c8ff0d448ffdc6340b195ddfa2128d5f21a839b.zip | |
Introduce wrappers around CBitcoinAddress
This patch removes the need for the intermediary Base58 type
CBitcoinAddress, by providing {Encode,Decode,IsValid}Destination
function that directly operate on the conversion between strings
and CTxDestination.
Diffstat (limited to 'src/rpc/mining.cpp')
| -rw-r--r-- | src/rpc/mining.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 73860f375..980988370 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -176,12 +176,13 @@ UniValue generatetoaddress(const JSONRPCRequest& request) nMaxTries = request.params[2].get_int(); } - CBitcoinAddress address(request.params[1].get_str()); - if (!address.IsValid()) + CTxDestination destination = DecodeDestination(request.params[1].get_str()); + if (!IsValidDestination(destination)) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Error: Invalid address"); + } std::shared_ptr<CReserveScript> coinbaseScript = std::make_shared<CReserveScript>(); - coinbaseScript->reserveScript = GetScriptForDestination(address.Get()); + coinbaseScript->reserveScript = GetScriptForDestination(destination); return generateBlocks(coinbaseScript, nGenerate, nMaxTries, false); } |