set hardfork block numbers and remove auxpow on qubit

This commit is contained in:
nzsquirrell
2015-08-16 21:54:07 +12:00
parent 95327e8fef
commit dad2e8b0f9
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -43,11 +43,11 @@ static const int BLOCK_VERSION_CHAIN_START = (1 << 16);
static const int BLOCK_VERSION_CHAIN_END = (1 << 30);
static const int AUXPOW_CHAIN_ID = 0x005A;
static const int AUXPOW_START_MAINNET = 1333000;
static const int AUXPOW_START_MAINNET = 1400000;
static const int AUXPOW_START_TESTNET = 1;
static const int Phase2Timespan_Start = 1333010;
static const int GeoAvgWork_Start = 1333020;
static const int Phase2Timespan_Start = 1400010;
static const int GeoAvgWork_Start = 1400020;
inline int GetAlgo(int nVersion)
{
+1 -1
View File
@@ -1524,7 +1524,7 @@ bool CBlockHeader::CheckProofOfWork(int nHeight) const
{
int algo = GetAlgo();
if ( (nHeight >= GetAuxPowStartBlock()) &&
((algo == ALGO_SHA256D) || (algo == ALGO_SCRYPT) || (algo == ALGO_QUBIT)) )
((algo == ALGO_SHA256D) || (algo == ALGO_SCRYPT))
{
// Prevent same work from being submitted twice:
// - this block must have our chain ID