added fork check conditionals to proposal code and proposal consensus rules to connectblock

Author: IgorDurovic

src/main.cpp

@@ -1492,7 +1492,9 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs,
                 return DoS(100, error("ConnectInputs() : nFees out of range"));
         }
     }
-    else {
+
+    // If the given transaction is coinbase then check for correct refund outputs
+    else if (VOTING_START >= pindexBlock->nHeight){
         CBlock block;
         if (!block.ReadFromDisk(pindexBlock))
             return error("ConnectInputs() : ReadFromDisk for connect failed");
@@ -1612,7 +1614,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
     else
         nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK, CLIENT_VERSION) - (2 * GetSizeOfCompactSize(0)) + GetSizeOfCompactSize(vtx.size());
 
-    vector<uint256> vQueuedProposals;
+    vector<CTransaction> vQueuedTxProposals;
     map<uint256, CTxIndex> mapQueuedChanges;
     int64 nFees = 0;
     int64 nValueIn = 0;
@@ -1674,11 +1676,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
                     return error("Proposal was not successfully extracted from transaction. This shouldn't happen.");
                 }
 
-                int nFee = CVoteProposal::BASE_FEE;
-
-                //Needs to have the proper fee or else it will not be counted
-                if (nTxValueIn - nTxValueOut >= nFee - MIN_TXOUT_AMOUNT)
-                    vQueuedProposals.push_back(hashTx);
+                vQueuedTxProposals.push_back(tx);
             }
         }
 
@@ -1697,21 +1695,34 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
     if (fJustCheck)
         return true;
 
+    //TODO: LOG ERRORS OR TERMINATE METHOD AND RETURN ERROR?
+    vector<CTransaction> vOrderedTxProposals;
+    if(!proposalManager.GetDeterministicOrdering(pindex->pprev->hashProofOfStake, vQueuedTxProposals, vOrderedTxProposals)) {
+        printf("ConnectBlock() : encountered error when determining deterministic ordering of proposals.");
+    }
+
+    vector<CTransaction> vAcceptedTxProposals;
+    if(!proposalManager.GetAcceptedTxProposals(vtx[0], vOrderedTxProposals, vAcceptedTxProposals)) {
+        printf("ConnectBlock() : encountered error when extracting accepted proposals from coinbase");
+    }
+
     // Keep track of any vote proposals that were added to the blockchain
     CVoteDB voteDB;
-    if (vQueuedProposals.size()) {
-        for (const CTransaction& tx : vtx) {
-            uint256 txid = tx.GetHash();
-            if (count(vQueuedProposals.begin(), vQueuedProposals.end(), txid)) {
-                CVoteProposal proposal;
-                if (ProposalFromTransaction(tx, proposal)) {
-                    mapProposals[txid] = proposal.GetHash();
-                    if (!voteDB.WriteProposal(txid, proposal))
-                        printf("%s : failed to record proposal to db\n", __func__);
-                    else if (!proposalManager.Add(proposal))
-                        printf("%s: failed to add proposal %s to manager\n", __func__, txid.GetHex().c_str());
-                }
-            }
+    for (const CTransaction& txProposal: vAcceptedTxProposals) {
+
+        // if the proposal isn't able to be extracted from transaction then skip it
+        CVoteProposal proposal;
+        if(!ProposalFromTransaction(txProposal, proposal)) {
+            printf("Proposal was not successfully extracted from transaction. This shouldn't happen.");
+            continue;
+        }
+
+        // store proposal hash in mapProposals and store proposal on disk for later use
+        mapProposals[txProposal.GetHash()] = proposal.GetHash();
+        if (!voteDB.WriteProposal(txProposal.GetHash(), proposal)) {
+            printf("%s : failed to record proposal to db\n", __func__);
+        } else if (!proposalManager.Add(proposal)) {
+            printf("%s: failed to add proposal %s to manager\n", __func__, txProposal.GetHash().GetHex().c_str());
         }
     }
 

src/voteproposalmanager.cpp

@@ -297,13 +297,13 @@ bool CVoteProposalManager::CheckRefundTransaction(const std::vector<CTransaction
         CVoteProposal proposal;
         VoteLocation location;
 
-        // Skip this txProposal if a proposal object cannot be extracted from it
+        // return error if a proposal object cannot be extracted from the tx
         if(!ProposalFromTransaction(txProposal, proposal)) {
             return error("CheckRefundTransaction() : Proposal was not able to be extracted from transaction.");
         }
 
         // input variables
-        int nTxFee = (int)MIN_TX_FEE; //TODO: MAKE THIS HIGHER
+        int nTxFee = (int)CVoteProposal::BASE_FEE; //TODO: MAKE THIS HIGHER
         int nBitCount = proposal.GetBitCount();
         int nStartHeight = proposal.GetStartHeight();
         int nCheckSpan = proposal.GetCheckSpan();
@@ -312,7 +312,7 @@ bool CVoteProposalManager::CheckRefundTransaction(const std::vector<CTransaction
         if(!GetNextLocation(nBitCount, nStartHeight, nCheckSpan, location)) {
             AddRefundToCoinBase(proposal, nRequiredFee, nTxFee, false, txExpectedCoinBase);
         } else {
-            // If a fee cannot be calculated then skip this proposal without creating a refund tx
+            // If a fee cannot be calculated then return error
             proposal.SetLocation(location);
             if (!GetFee(proposal, nRequiredFee)) {
                 return error("CheckRefundTransaction() : Calculating fee for proposal failed.");
@@ -330,11 +330,55 @@ bool CVoteProposalManager::CheckRefundTransaction(const std::vector<CTransaction
 
     for(int i = 0; i < txCoinBase.vout.size(); i++) {
         if(txCoinBase.vout.at(i).scriptPubKey.GetID().GetHex() != txExpectedCoinBase.vout.at(i).scriptPubKey.GetID().GetHex()) {
-            return error("CheckRefundTransaction() : The scriptPubKey of the refund transaction isn't what it should be.");
+            return error("CheckRefundTransaction() : The scriptPubKey of the refund transaction isn't what it should be"
+                         "according to the deterministic ordering.");
         }
 
         if(txCoinBase.vout.at(i).nValue != txExpectedCoinBase.vout.at(i).nValue) {
-            return error("CheckRefundTransaction() : The value of the refund isn't what it should be.");
+            return error("CheckRefundTransaction() : The value of the refund isn't what it should be according to the"
+                         "deterministic ordering.");
+        }
+    }
+
+    return true;
+}
+
+bool CVoteProposalManager::GetAcceptedTxProposals(const CTransaction& txCoinBase, const std::vector<CTransaction>& vOrderedTxProposals,
+                          std::vector<CTransaction>& vAcceptedTxProposals)
+{
+    if (!txCoinBase.IsCoinBase()) {
+        return error("GetAcceptedTxProposals() : Given transaction is not a coinbase.");
+    }
+
+    vAcceptedTxProposals.clear();
+
+    for(auto txProposal: vOrderedTxProposals) {
+        // output variables
+        int nRequiredFee;
+        CVoteProposal proposal;
+        VoteLocation location;
+
+        // return error if a proposal object cannot be extracted from the tx
+        if(!ProposalFromTransaction(txProposal, proposal)) {
+            return error("GetAcceptedTxProposals() : Proposal was not able to be extracted from transaction.");
+        }
+
+        // input variables
+        int nBitCount = proposal.GetBitCount();
+        int nStartHeight = proposal.GetStartHeight();
+        int nCheckSpan = proposal.GetCheckSpan();
+
+        if(GetNextLocation(nBitCount, nStartHeight, nCheckSpan, location)){
+            // If a fee cannot be calculated then return error
+            proposal.SetLocation(location);
+            if (!GetFee(proposal, nRequiredFee)) {
+                return error("GetAcceptedTxProposals() : Calculating fee for proposal failed.");
+            }
+
+            // If the max fee provided by the txProposal exceeds the required fee the accept the tx as a valid proposal
+            if (nRequiredFee >= proposal.GetMaxFee()) {
+                vAcceptedTxProposals.emplace_back(txProposal);
+            }
         }
     }
 

src/voteproposalmanager.h

@@ -44,6 +44,8 @@ class CVoteProposalManager
     bool AddRefundToCoinBase(const CVoteProposal &proposal, const int &nRequiredFee, const int &nTxFee,
                              const bool bProposalAccepted, CTransaction &txCoinBase);
     bool CheckRefundTransaction(const std::vector<CTransaction> &vOrderedTxProposals, const CTransaction &txCoinBase);
+    bool GetAcceptedTxProposals(const CTransaction& txCoinBase, const std::vector<CTransaction>& vOrderedTxProposals,
+                                std::vector<CTransaction>& vAcceptedTxProposals);
 
     std::map<uint256, CProposalMetaData> GetAllProposals() const { return mapProposalData; };
     bool CheckProposal (const CVoteProposal& proposal);