DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Introduce wrappers around CZCPaymentAddress

Browse Source 
This patch removes the need for the intermediary Base58 type
CZCPaymentAddress, by providing {Encode,Decode}PaymentAddress
functions that directly operate on the conversion between strings
and libzcash::PaymentAddress.
This commit is contained in:
Jack Grigg
2018-04-24 15:01:45 +01:00
parent f146029b0a
commit 80ed13d545
15 changed files with 135 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpcmisc.cpp
View File

@@ -235,27 +235,23 @@ UniValue z_validateaddress(const UniValue& params, bool fHelp)
LOCK(cs_main);
#endif
bool isValid = false;
bool isMine = false;
std::string payingKey, transmissionKey;
string strAddress = params[0].get_str();
try {
CZCPaymentAddress address(strAddress);
libzcash::PaymentAddress addr = address.Get();
auto isValid = DecodePaymentAddress(strAddress);
if (isValid) {
libzcash::PaymentAddress addr = *isValid;
#ifdef ENABLE_WALLET
isMine = pwalletMain->HaveSpendingKey(addr);
#endif
payingKey = addr.a_pk.GetHex();
transmissionKey = addr.pk_enc.GetHex();
isValid = true;
} catch (std::runtime_error e) {
// address is invalid, nop here as isValid is false.
}
UniValue ret(UniValue::VOBJ);
ret.push_back(Pair("isvalid", isValid));
ret.push_back(Pair("isvalid", static_cast<bool>(isValid)));
if (isValid)
{
ret.push_back(Pair("address", strAddress));