Use CBitcoinAddress wrappers in Zcash-specific code

2018-04-20 15:09:23 +01:00
parent 07444da1db
commit b6be3e88bb
12 changed files with 78 additions and 80 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -395,9 +395,9 @@ boost::optional<CScript> GetMinerScriptPubKey()
 #endif
 {
    CKeyID keyID;
-    CBitcoinAddress addr;
-    if (addr.SetString(GetArg("-mineraddress", ""))) {
-        addr.GetKeyID(keyID);
+    CTxDestination addr = DecodeDestination(GetArg("-mineraddress", ""));
+    if (IsValidDestination(addr)) {
+        keyID = boost::get<CKeyID>(addr);
    } else {
 #ifdef ENABLE_WALLET
        CPubKey pubkey;