Merge branch 'jl777' into FSM

# Conflicts: # src/main.cpp
2018-08-24 14:02:07 -11:00
parent 0f05fc9ae5 6009e3ef8d
commit 7cb141476c
5 changed files with 196 additions and 81 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1123,7 +1123,10 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
        }
        if ( txout.scriptPubKey.size() > IGUANA_MAXSCRIPTSIZE )
            return state.DoS(100, error("CheckTransaction(): txout.scriptPubKey.size() too big"),REJECT_INVALID, "bad-txns-vout-negative");
+<<<<<<< HEAD
  
+=======
+>>>>>>> jl777
        nValueOut += txout.nValue;
        if (!MoneyRange(nValueOut))
            return state.DoS(100, error("CheckTransaction(): txout total out of range"),