Re-enable FillBlockPayee for mnpayments, fix CreateNewBlock calculati…

…ons (#811) * Reenable FillBlockPayee for mnpayments, fix CreateNewBlock calculations * revert blockchain.py fix #772
dashpay · May 26, 2016 · 6698d2c · 6698d2c
1 parent 5411d78
commit 6698d2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py
@@ -49,11 +49,11 @@ def _test_gettxoutsetinfo(self):
         node = self.nodes[0]
         res = node.gettxoutsetinfo()
 
-        assert_equal(res[u'total_amount'], Decimal('98178.57142879'))
+        assert_equal(res[u'total_amount'], Decimal('98214.28571450'))
         assert_equal(res[u'transactions'], 200)
         assert_equal(res[u'height'], 200)
         assert_equal(res[u'txouts'], 200)
-        assert_equal(res[u'bytes_serialized'], 14277),
+        assert_equal(res[u'bytes_serialized'], 14273),
         assert_equal(len(res[u'bestblock']), 64)
         assert_equal(len(res[u'hash_serialized']), 64)
 

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -284,6 +284,7 @@ void FillBlockPayee(CMutableTransaction& txNew, CAmount nFees)
     // } else {
     //     mnpayments.FillBlockPayee(txNew, nFees);
     // }
+    mnpayments.FillBlockPayee(txNew, nFees);
 }
 
 std::string GetRequiredPaymentsString(int nBlockHeight)
@@ -336,7 +337,7 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, CAmount nFe
         ExtractDestination(payee, address1);
         CBitcoinAddress address2(address1);
 
-        LogPrintf("Masternode payment to %s\n", address2.ToString());
+        LogPrintf("Masternode payment %d to %s\n", masternodePayment, address2.ToString());
     }
 }
 

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -286,7 +286,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
         LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOps);
 
         // Compute final coinbase transaction.
-        txNew.vout[0].nValue = nFees + GetBlockSubsidy(pindexPrev->nBits, nHeight, chainparams.GetConsensus());
+        // Should already be calculated in FillBlockPayee
+        // txNew.vout[0].nValue = nFees + GetBlockSubsidy(pindexPrev->nBits, nHeight, chainparams.GetConsensus());
         txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
         pblock->vtx[0] = txNew;
         pblocktemplate->vTxFees[0] = -nFees;