Removing not needed CBlock::payee member.

furszy · furszy · commit 7893818cf92f · 2020-09-02T00:17:03.000-03:00
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -160,9 +160,7 @@ bool CreateCoinbaseTx(CBlock* pblock, const CScript& scriptPubKeyIn, CBlockIndex
 
     txNew.vin[0].scriptSig = CScript() << pindexPrev->nHeight + 1 << OP_0;
     //Make payee
-    if (txNew.vout.size() > 1) {
-        pblock->payee = txNew.vout[1].scriptPubKey;
-    } else {
+    if (txNew.vout.size() == 1) {
         CAmount blockValue = GetBlockValue(pindexPrev->nHeight);
         txNew.vout[0].nValue = blockValue;
     }
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -88,7 +88,6 @@ class CBlock : public CBlockHeader
     std::vector<unsigned char> vchBlockSig;
 
     // memory only
-    mutable CScript payee;
     mutable bool fChecked;
 
     CBlock()
@@ -117,7 +116,6 @@ class CBlock : public CBlockHeader
         CBlockHeader::SetNull();
         vtx.clear();
         fChecked = false;
-        payee = CScript();
         vchBlockSig.clear();
     }
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -624,18 +624,6 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight + 1)));
     result.push_back(Pair("votes", aVotes));
-
-
-    if (pblock->payee != CScript()) {
-        CTxDestination address1;
-        ExtractDestination(pblock->payee, address1);
-        result.push_back(Pair("payee", EncodeDestination(address1).c_str()));
-        result.push_back(Pair("payee_amount", (int64_t)pblock->vtx[0].vout[1].nValue));
-    } else {
-        result.push_back(Pair("payee", ""));
-        result.push_back(Pair("payee_amount", ""));
-    }
-
     result.push_back(Pair("enforce_masternode_payments", true));
 
     return result;
