finished up dynamic fee process. still testing (debug print statements in code)

Author: IgorDurovic

src/main.cpp

@@ -1483,7 +1483,7 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs,
     }
 
     // If the given transaction is coinbase then check for correct refund outputs
-    else if (VOTING_START >= pindexBlock->nHeight){
+    else if (pindexBlock->nHeight >= VOTING_START){
         CBlock block;
         if (!block.ReadFromDisk(pindexBlock))
             return error("ConnectInputs() : ReadFromDisk for connect failed");
@@ -4433,6 +4433,18 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake)
 
             // Size limits
             unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
+
+            // If the transaction is a proposal then the size of the refund output must be accounted for
+            if (pindexPrev->nHeight >= VOTING_START && tx.IsProposal()) {
+                int nRefundSize;
+                if (!proposalManager.GetRefundOutputSize(tx, nRefundSize)) {
+                    printf("Couldn't calculate refund output size for the given transaction.");
+                    continue;
+                }
+
+                nTxSize += nRefundSize;
+            }
+
             if (nBlockSize + nTxSize >= nBlockMaxSize)
                 continue;
 

src/script.cpp

@@ -1358,12 +1358,16 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
 bool Sign1(const CKeyID& address, const CKeyStore& keystore, uint256 hash, int nHashType, CScript& scriptSigRet)
 {
     CKey key;
-    if (!keystore.GetKey(address, key))
+    if (!keystore.GetKey(address, key)) {
+        printf("could not find the right key ******************");
         return false;
+    }
 
     vector<unsigned char> vchSig;
-    if (!key.Sign(hash, vchSig))
+    if (!key.Sign(hash, vchSig)) {
+        printf("signing failed :( *****************");
         return false;
+    }
     vchSig.push_back((unsigned char)nHashType);
     scriptSigRet << vchSig;
 
@@ -1403,12 +1407,17 @@ 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
@@ -1419,13 +1428,16 @@ 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:
-         return true;
+        printf("**************** tx is null data");
+        return true;
     }
     return false;
 }
@@ -1645,8 +1657,10 @@ bool SignSignature(const CKeyStore &keystore, const CScript& fromPubKey, CTransa
     uint256 hash = SignatureHash(fromPubKey, txTo, nIn, nHashType);
 
     txnouttype whichType;
-    if (!Solver(keystore, fromPubKey, hash, nHashType, txin.scriptSig, whichType))
+    if (!Solver(keystore, fromPubKey, hash, nHashType, txin.scriptSig, whichType)) {
+        printf("******************** solver failed :(");
         return false;
+    }
 
     if (whichType == TX_SCRIPTHASH)
     {

src/voteproposal.h

@@ -78,6 +78,8 @@ class CVoteProposal
         this->strDescription = strDescription;
         this->nMaxFee = nMaxFee;
         this->strRefundAddress = strRefundAddress;
+        //VoteLocation location;
+        this->bitLocation = VoteLocation();
 
         //VoteLocation will be set when the proposal is accepted by the network and the dynamic fee is determined
     }

src/voteproposalmanager.cpp

@@ -170,6 +170,8 @@ namespace
                 continue;
             vConflictingTime.emplace_back(data);
         }
+
+        return vConflictingTime;
     }
 }
 
@@ -384,4 +386,28 @@ bool CVoteProposalManager::GetNextLocation(int nBitCount, int nStartHeight, int
         }
     }
     return false;
-}
+}
+
+bool CVoteProposalManager::GetRefundOutputSize(const CTransaction& txProposal, int& nSize) const
+{
+
+    CTransaction txEmpty;
+    unsigned int nBaseSize = ::GetSerializeSize(txEmpty, SER_NETWORK, PROTOCOL_VERSION);
+
+    if (!txProposal.IsProposal()) {
+        return error("GetRefundOutputSize() : Given transaction must be a proposal.");
+    }
+
+    CVoteProposal proposal;
+    if (!ProposalFromTransaction(txProposal, proposal)) {
+        return error("GetRefundOutputSize() : Failed to extract proposal from transaction.");
+    }
+
+    // Every refund output should increase the size of the coinbase tx by the same amount.
+    // 0, 0, and false are just filler values.
+    proposalManager.AddRefundToCoinBase(proposal, 0, 0, false, txEmpty);
+
+    nSize = ::GetSerializeSize(txEmpty, SER_NETWORK, PROTOCOL_VERSION) - nBaseSize;
+
+    return true;
+}

src/voteproposalmanager.h

@@ -46,6 +46,7 @@ class CVoteProposalManager
     bool CheckRefundTransaction(const std::vector<CTransaction> &vOrderedTxProposals, const CTransaction &txCoinBase);
     bool GetAcceptedTxProposals(const CTransaction& txCoinBase, const std::vector<CTransaction>& vOrderedTxProposals,
                                 std::vector<CTransaction>& vAcceptedTxProposals);
+    bool GetRefundOutputSize(const CTransaction& txProposal, int& nSize) const;
 
     std::map<uint256, CProposalMetaData> GetAllProposals() const { return mapProposalData; };
 };

src/wallet.cpp

@@ -2585,8 +2585,10 @@ bool CWallet::SendProposal(const CVoteProposal& proposal, uint256& txid)
         //!Lookup the address of one of the inputs and return the change to that address
         uint256 hashBlock;
         CTransaction txPrev;
-        if(!::GetTransaction(wtx.vin[0].prevout.hash, txPrev, hashBlock))
+        if(!::GetTransaction(wtx.vin[0].prevout.hash, txPrev, hashBlock)) {
+            printf("failed to select coins");
             return error("%s: Failed to select coins", __func__);
+        }
 
         CScript scriptReturn = txPrev.vout[wtx.vin[0].prevout.n].scriptPubKey;
         CTxOut out(nChange, scriptReturn);
@@ -2598,14 +2600,18 @@ bool CWallet::SendProposal(const CVoteProposal& proposal, uint256& txid)
     //! Sign the transaction
     int nIn = 0;
     for (const pair<const CWalletTx*,unsigned int>& coin : setCoins) {
-        if (!SignSignature(*this, *coin.first, wtx, nIn++))
+        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))
+    if (!CommitTransaction(wtx, reserveKey)) {
+        printf("failed to commit transaction");
         return error("%s: Failed to commit transaction", __func__);
+    }
 
     txid = wtx.GetHash();