removed debug statements and added voting tests

Author: IgorDurovic

src/main.cpp

@@ -333,11 +333,19 @@ bool CTransaction::IsProposal() const
     for (unsigned int i = 0; i < vout.size(); i++) {
         CScript scriptPubKey = vout[i].scriptPubKey;
         if (scriptPubKey.IsDataCarrier()) {
-            if (scriptPubKey.size() >= 5) {
+            if (scriptPubKey.size() > 0x4c) {
+                // "PROP" in ascii
+                if (scriptPubKey.at(3) == 0x70 && scriptPubKey.at(4) == 0x72 && scriptPubKey.at(5) == 0x6f &&
+                        scriptPubKey.at(6) == 0x70) {
+                    return true;
+                }
+            }
+            else if(scriptPubKey.size() > 6) {
                 // "PROP" in ascii
                 if (scriptPubKey.at(2) == 0x70 && scriptPubKey.at(3) == 0x72 && scriptPubKey.at(4) == 0x6f &&
-                        scriptPubKey.at(5) == 0x70)
+                        scriptPubKey.at(5) == 0x70) {
                     return true;
+                }
             }
         }
     }

src/miner.cpp

@@ -405,6 +405,57 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake)
             }
         }
 
+        // TODO: ADD BLOCK HEIGHT FOR VOTING HARD FORK
+        // TODO: MIGHT NEED TO CHECK BLOCK SIZE CONSTRAINTS
+        // TODO: PUT THIS IN ANOTHER METHOD TO IMPROVE MODULARIZATION AND CODE REUSE
+        if(pindexPrev->nHeight >= VOTING_START) {
+            std::vector<CTransaction> vProposalTransactions;
+            for(CTransaction tx: pblock->vtx) {
+                if(tx.IsProposal()) {
+                    vProposalTransactions.emplace_back(tx);
+                }
+            }
+
+            std::vector <CTransaction> vOrderedProposalTransactions;
+            proposalManager.GetDeterministicOrdering(pindexPrev->hashProofOfStake, vProposalTransactions,
+                                                     vOrderedProposalTransactions);
+            for (CTransaction txProposal: vOrderedProposalTransactions) {
+                // output variables
+                int nRequiredFee;
+                CVoteProposal proposal;
+                VoteLocation location;
+                CTransaction txCoinBase = pblock->vtx[0];
+
+                // Skip this txProposal if a proposal object cannot be extracted from it
+                if (!ProposalFromTransaction(txProposal, proposal)) {
+                    continue;
+                }
+
+                // input variables
+                int nTxFee = CVoteProposal::BASE_FEE; //TODO: DETERMINE THE BEST VALUE FROM TRIALS
+                int nBitCount = proposal.GetBitCount();
+                int nStartHeight = proposal.GetStartHeight();
+                int nCheckSpan = proposal.GetCheckSpan();
+
+                // If a valid voting location cannot be found then create an unaccepted proposal refund
+                if (!proposalManager.GetNextLocation(nBitCount, nStartHeight, nCheckSpan, location)) {
+                    proposalManager.AddRefundToCoinBase(proposal, nRequiredFee, nTxFee, false, txCoinBase);
+                } else {
+                    // If a fee cannot be calculated then skip this proposal without creating a refund tx
+                    proposal.SetLocation(location);
+                    if (!proposalManager.GetFee(proposal, nRequiredFee)) continue;
+
+                    // If the maximum fee provided by the proposal creator is less than the required fee
+                    // then create an unaccepted proposal refund
+                    if (nRequiredFee > proposal.GetMaxFee()) {
+                        proposalManager.AddRefundToCoinBase(proposal, nRequiredFee, nTxFee, false, txCoinBase);
+                    } else {
+                        proposalManager.AddRefundToCoinBase(proposal, nRequiredFee, nTxFee, true, txCoinBase);
+                    }
+                }
+            }
+        }
+
         nLastBlockTx = nBlockTx;
         nLastBlockSize = nBlockSize;
 

src/script.cpp

@@ -1327,13 +1327,11 @@ bool Sign1(const CKeyID& address, const CKeyStore& keystore, uint256 hash, int n
 {
     CKey key;
     if (!keystore.GetKey(address, key)) {
-        printf("could not find the right key ******************");
         return false;
     }
 
     vector<unsigned char> vchSig;
     if (!key.Sign(hash, vchSig)) {
-        printf("signing failed :( *****************");
         return false;
     }
     vchSig.push_back((unsigned char)nHashType);
@@ -1375,17 +1373,12 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash
     switch (whichTypeRet)
     {
     case TX_NONSTANDARD:
-        printf("****************** tx is not standard");
         return false;
     case TX_PUBKEY:
         keyID = CPubKey(vSolutions[0]).GetID();
-        printf("***************** tx is pubkey: %s", keyID.ToString());
-        printf("\n");
         return Sign1(keyID, keystore, hash, nHashType, scriptSigRet);
     case TX_PUBKEYHASH:
         keyID = CKeyID(uint160(vSolutions[0]));
-        printf("***************** tx is pubkeyhash: %s", uint160(vSolutions[0]));
-        printf("\n");
         if (!Sign1(keyID, keystore, hash, nHashType, scriptSigRet))
             return false;
         else
@@ -1396,15 +1389,12 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash
         }
         return true;
     case TX_SCRIPTHASH:
-        printf("***************** tx is scripthash");
         return keystore.GetCScript(uint160(vSolutions[0]), scriptSigRet);
 
     case TX_MULTISIG:
-        printf("***************** tx is multisig");
         scriptSigRet << OP_0; // workaround CHECKMULTISIG bug
         return (SignN(vSolutions, keystore, hash, nHashType, scriptSigRet));
     case TX_NULL_DATA:
-        printf("**************** tx is null data");
         return true;
     }
     return false;
@@ -1626,7 +1616,6 @@ bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CTransa
 
     txnouttype whichType;
     if (!Solver(keystore, fromPubKey, hash, nHashType, txin.scriptSig, whichType)) {
-        printf("******************** solver failed :(");
         return false;
     }