From 9ee74c61f66ec43800b35298e5e523304ec9a685 Mon Sep 17 00:00:00 2001 From: John Doering Date: Wed, 2 Aug 2017 15:24:37 +0000 Subject: [PATCH] Phoenixcoin v0.6.6.1 Maintenance release. --- LICENCE | 2 +- README.md | 2 +- phoenixcoin-qt.pro | 2 +- src/main.cpp | 2 +- src/qt/forms/aboutdialog.ui | 2 +- src/qt/miningpage.cpp | 4 ++-- src/version.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENCE b/LICENCE index e1d08e8..ab29249 100644 --- a/LICENCE +++ b/LICENCE @@ -1,6 +1,6 @@ Copyright (c) 2009-2012 Bitcoin Developers Copyright (c) 2011-2012 Litecoin Developers -Copyright (c) 2013-2014 Phoenixcoin Developers +Copyright (c) 2013-2017 Phoenixcoin Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 5f3def8..97bc358 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Phoenixcoin (PXC) is a decentralised open source digital currency. - NeoScrypt (N = 128, r = 2, p = 1, etc.) - ~98 million total coins - block target is 1.5 minutes - - block reward is 50 coins + - block reward is 25 coins - block reward halves every 1 million blocks - retargets every 20 blocks (~30 minutes) - 2% max. change on every retarget diff --git a/phoenixcoin-qt.pro b/phoenixcoin-qt.pro index 2e39675..90d7286 100644 --- a/phoenixcoin-qt.pro +++ b/phoenixcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = phoenixcoin-qt -VERSION = 0.6.6.0 +VERSION = 0.6.6.1 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6 CONFIG += no_include_pwd diff --git a/src/main.cpp b/src/main.cpp index 3f48928..43ec9a2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2665,7 +2665,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) // if their nStartingHeight is much higher of what we estimate it // to be, disconnect them. // nRefHeight and nRefTime should be updated periodically - long nRefHeight = 745000, nRefTime = 1438677830; // block #745000 + long nRefHeight = 1453000, nRefTime = 1501534986; // block #1453000 long nOurTime = GetAdjustedTime(); long nHeightOffset = (nOurTime - nRefTime) / nTargetSpacingFour; // Add 10000 blocks to be safe diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 1014525..bee965c 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -97,7 +97,7 @@ Copyright © 2009-2012 Bitcoin Developers Copyright © 2011-2012 Litecoin Developers - Copyright © 2013-2014 Phoenixcoin Developers + Copyright © 2013-2017 Phoenixcoin Developers This is an experimental software. diff --git a/src/qt/miningpage.cpp b/src/qt/miningpage.cpp index 9d3a4fa..112e6cf 100644 --- a/src/qt/miningpage.cpp +++ b/src/qt/miningpage.cpp @@ -193,7 +193,7 @@ void MiningPage::readProcessOutput() reportToList("Authentication failed via Stratum. Please check your username and password.", ERROR, NULL); else if (line.contains("retry after 30 seconds")) reportToList("Couldn't communicate with the server. Retrying in 30 seconds.", ERROR, NULL); - else if (line.contains("thread ") && line.contains("khash/s")) + else if (line.contains("thread ") && line.contains("KH/s")) { QString threadIDstr = line.at(line.indexOf("thread ")+7); int threadID = threadIDstr.toInt(); @@ -277,7 +277,7 @@ void MiningPage::updateSpeed() QString roundRejectedString = QString("%1").arg(roundRejectedShares); if (totalThreads == initThreads) - ui->mineSpeedLabel->setText(QString("Speed: %1 khash/sec - %2 thread(s)").arg(speedString, threadsString)); + ui->mineSpeedLabel->setText(QString("Speed: %1 KH/s - %2 thread(s)").arg(speedString, threadsString)); else ui->mineSpeedLabel->setText(QString("Speed: ~%1 khash/sec - %2 thread(s)").arg(speedString, threadsString)); diff --git a/src/version.h b/src/version.h index d5f21c7..c2e7d43 100644 --- a/src/version.h +++ b/src/version.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 6 #define CLIENT_VERSION_REVISION 6 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 static const int CLIENT_VERSION = 1000000 * CLIENT_VERSION_MAJOR