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/script.cpp

@@ -1359,13 +1359,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);
@@ -1407,17 +1405,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
@@ -1428,15 +1421,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;
@@ -1658,7 +1648,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;
     }
 

src/test/voting_tests.cpp

@@ -21,10 +21,6 @@ bool CVoteProposal::IsValid() const
         return error("Abstract needs to be between 1 and %d characters long", MAX_CHAR_ABSTRACT);
     }
 
-    if (nStartHeight <= nBestHeight || nStartHeight > nBestHeight + MAX_BLOCKS_IN_FUTURE) {
-        return error("Start height needs to be greater than current height (%d) and less than %d.", nBestHeight, (nStartHeight + MAX_BLOCKS_IN_FUTURE));
-    }
-
     if (!nCheckSpan || nCheckSpan > MAX_CHECKSPAN) {
         return error("Voting length needs to be between 1 and %d blocks", MAX_CHECKSPAN);
     }
@@ -84,7 +80,9 @@ bool ProposalFromTransaction(const CTransaction& tx, CVoteProposal& proposal)
     vector<unsigned char> vchProposal;
 
     CScript scriptProposal = tx.vout[0].scriptPubKey;
-    vchProposal.insert(vchProposal.end(), scriptProposal.begin() + 6, scriptProposal.end());
+
+    vchProposal.insert(vchProposal.end(), scriptProposal.begin() + (scriptProposal.size() > 0x04c ? 7 : 6), scriptProposal.end());
+
     CDataStream ss(vchProposal, SER_NETWORK, 0);
 
     try {

src/voteproposal.cpp

@@ -202,25 +202,24 @@ bool CVoteProposalManager::GetFee(const CVoteProposal& proposal, int& nFee)
     return true;
 }
 
-bool CVoteProposalManager::GetDeterministicOrdering(const uint256 &proofhash, std::vector<CTransaction> &vProposalTransactions,
+bool CVoteProposalManager::GetDeterministicOrdering(const uint256 &proofhash, std::vector<CTransaction> vProposalTransactions,
                                                     std::vector<CTransaction> &vOrderedProposalTransactions)
 {
-    int nMask = 0x000FFFFF;
-    int nSegmentSize = 20;
+    uint256 nMask(0x000FFFFF);
     int nSegmentOffset = 0;
     while(!vProposalTransactions.empty()) {
-        uint256 nFormattedMask = nMask << (nSegmentOffset * nSegmentSize);
-        int segment = (int)((proofhash & nFormattedMask) >> (nSegmentOffset * nSegmentOffset)).Get64();
+        uint256 nFormattedMask = nMask << (nSegmentOffset);
+        int segment = (int)((proofhash & nFormattedMask) >> (nSegmentOffset)).Get64();
         int index = (int)(segment % vProposalTransactions.size());
 
         if(segment < 0 || index < 0) {
             return error("Generated index is invalid");
         }
 
         vOrderedProposalTransactions.emplace_back(vProposalTransactions.at(index));
-        vProposalTransactions.erase(vProposalTransactions.begin() + index);
 
-        nSegmentOffset = (nSegmentOffset + nSegmentSize) % 256;
+        vProposalTransactions.erase(vProposalTransactions.begin() + index);
+        nSegmentOffset = (nSegmentOffset + segment) % 235;
     }
 
     return true;
@@ -256,6 +255,9 @@ bool CVoteProposalManager::CheckRefundTransaction(const std::vector<CTransaction
     }
 
     CTransaction txExpectedCoinBase;
+    txExpectedCoinBase.vin.resize(1);
+    txExpectedCoinBase.vin[0].prevout.SetNull();
+    txExpectedCoinBase.vout.resize(1);
 
     for(auto txProposal: vOrderedTxProposals) {
         // output variables
@@ -294,6 +296,10 @@ bool CVoteProposalManager::CheckRefundTransaction(const std::vector<CTransaction
         }
     }
 
+    if (txCoinBase.vout.size() != txExpectedCoinBase.vout.size()) {
+        return error("CheckRefundTransaction() : The output vector of the coinbase transaction isn't the correct size.");
+    }
+
     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"

src/voteproposalmanager.cpp

@@ -38,7 +38,7 @@ class CVoteProposalManager
 
     //methods used in dynamic fee calculation
     bool GetFee(const CVoteProposal& proposal, int& nFee);
-    bool GetDeterministicOrdering(const uint256& proofhash, std::vector<CTransaction>& vProposalTransactions,
+    bool GetDeterministicOrdering(const uint256& proofhash, std::vector<CTransaction> vProposalTransactions,
                                     std::vector<CTransaction>& vOrderedProposalTransactions);
     bool GetNextLocation(int nBitCount, int nStartHeight, int nCheckSpan, VoteLocation& location);
     bool AddRefundToCoinBase(const CVoteProposal &proposal, const int &nRequiredFee, const int &nTxFee,

src/voteproposalmanager.h

@@ -2586,7 +2586,6 @@ bool CWallet::SendProposal(const CVoteProposal& proposal, uint256& txid)
         uint256 hashBlock;
         CTransaction txPrev;
         if(!::GetTransaction(wtx.vin[0].prevout.hash, txPrev, hashBlock)) {
-            printf("failed to select coins");
             return error("%s: Failed to select coins", __func__);
         }
 
@@ -2601,15 +2600,13 @@ bool CWallet::SendProposal(const CVoteProposal& proposal, uint256& txid)
     int nIn = 0;
     for (const pair<const CWalletTx*,unsigned int>& coin : setCoins) {
         if (!SignSignature(*this, *coin.first, wtx, nIn++)) {
-            printf("could not sign transaction");
             return false;
         }
     }
 
     //! Broadcast the transaction to the network
     CReserveKey reserveKey = CReserveKey(this);
     if (!CommitTransaction(wtx, reserveKey)) {
-        printf("failed to commit transaction");
         return error("%s: Failed to commit transaction", __func__);
     }