Multiple changes for critical update, including random locks and activation at 12800. Test for utxos.

2018-05-26 04:00:17 -07:00
parent 4a1afe0bc5
commit 74329e19f8
9 changed files with 86 additions and 15 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2069,7 +2069,7 @@ namespace Consensus {
                if (fCoinbaseEnforcedProtectionEnabled &&
                    consensusParams.fCoinbaseMustBeProtected &&
                    !tx.vout.empty() &&
-                    (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080))) {
+                    (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 12800 && coins->nHeight >= 12800))) {
                    return state.Invalid(
                                         error("CheckInputs(): tried to spend coinbase with transparent outputs"),
                                         REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs");