Merge remote-tracking branch 'janko33bd/Blackcoin-Lore' into wallet-updates-0.13

2018-01-08 19:45:45 +03:00
parent aefae306e5 26cbe6bc72
commit 261efcf69a
66 changed files with 1433 additions and 832 deletions
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -50,7 +50,7 @@ static void add_coin(const CAmount& nValue, int nAge = 6*24, bool fIsFromMe = fa
        wtx->fDebitCached = true;
        wtx->nDebitCached = 1;
    }
-    COutput output(wtx, nInput, nAge, true);
+    COutput output(wtx, nInput, nAge, true, true);
    vCoins.push_back(output);
    wtxn.emplace_back(std::move(wtx));
 }