From a7a67a4668a78aeefc074a03840944cbf1e5f84a Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 22 Jan 2022 23:58:10 -0500 Subject: [PATCH] remove dead code --- src/miner.cpp | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 894195c05..c0d80fdee 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -763,53 +763,8 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 return pblocktemplate.release(); } -/* - #ifdef ENABLE_WALLET - boost::optional GetMinerScriptPubKey(CReserveKey& reservekey) - #else - boost::optional GetMinerScriptPubKey() - #endif - { - CKeyID keyID; - CBitcoinAddress addr; - if (addr.SetString(GetArg("-mineraddress", ""))) { - addr.GetKeyID(keyID); - } else { - #ifdef ENABLE_WALLET - CPubKey pubkey; - if (!reservekey.GetReservedKey(pubkey)) { - return boost::optional(); - } - keyID = pubkey.GetID(); - #else - return boost::optional(); - #endif - } - CScript scriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG; - return scriptPubKey; - } - - #ifdef ENABLE_WALLET - CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey) - { - boost::optional scriptPubKey = GetMinerScriptPubKey(reservekey); - #else - CBlockTemplate* CreateNewBlockWithKey() - { - boost::optional scriptPubKey = GetMinerScriptPubKey(); - #endif - - if (!scriptPubKey) { - return NULL; - } - return CreateNewBlock(*scriptPubKey); - }*/ - -////////////////////////////////////////////////////////////////////////////// -// // Internal miner -// #ifdef ENABLE_MINING