diff --git a/src/coins.h b/src/coins.h index b699bdfae..7f1fc6124 100644 --- a/src/coins.h +++ b/src/coins.h @@ -522,7 +522,7 @@ public: double GetPriority(const CTransaction &tx, int nHeight) const; const CTxOut &GetOutputFor(const CTxIn& input) const; - const CTxOut &GetSpendFor(const CTxIn& input) const; + const CScript &GetSpendFor(const CTxIn& input) const; friend class CCoinsModifier; diff --git a/src/main.cpp b/src/main.cpp index 43269534b..8d5324a30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2053,7 +2053,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); - if ( pindex->nHeight > 40000 ) // "testnet" + if ( pindex->nHeight > 50000 ) // "testnet" return(false); // Do not allow blocks that contain transactions which 'overwrite' older transactions, // unless those are already completely spent.