Merge remote-tracking branch 'origin/jl777' into cctests

2018-08-10 23:45:24 +02:00
parent ae55065235 7a0727d585
commit b5d4eaf3ab
1 changed files with 25 additions and 22 deletions
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -266,6 +266,8 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3
        {
            txid = out.tx->GetHash();
            vout = out.i;
+            if ( GetTransaction(txid,tx,hashBlock,false) != 0 && tx.vout.size() > 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
                if ( mtx.vin.size() > 0 )
                {
                    for (i=0; i<mtx.vin.size(); i++)
@@ -293,6 +295,7 @@ int64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,int64_t total,int3
                }
            }
        }
+    }
    remains = total;
    for (i=0; i<maxinputs && n>0; i++)
    {