Auto merge of #1965 - str4d:1955-single-address-mining, r=bitcartel

Switch miner to P2PKH, add -mineraddress option Closes #945 and #1955.
2017-02-09 20:58:00 +00:00
parent 253c610783 9bba9b37c8
commit 0c78782662
8 changed files with 344 additions and 57 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1059,7 +1059,7 @@ public:
    }

    void ReturnKey();
-    bool GetReservedKey(CPubKey &pubkey);
+    virtual bool GetReservedKey(CPubKey &pubkey);
    void KeepKey();
 };