Merge latest from Komodo, including POS

2018-05-08 17:57:03 -07:00
parent ea340a1443 ccb805c993
commit 32d8c6d015
13 changed files with 155 additions and 56 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2708,9 +2708,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
        if (!tx.IsCoinBase())
        {
            if (!view.HaveInputs(tx))
+            {
                return state.DoS(100, error("ConnectBlock(): inputs missing/spent"),
                                 REJECT_INVALID, "bad-txns-inputs-missingorspent");
-            
+            }
            // are the JoinSplit's requirements met?
            if (!view.HaveJoinSplitRequirements(tx))
                return state.DoS(100, error("ConnectBlock(): JoinSplit requirements not met"),