Phoenixcoin v0.6.6.1

Maintenance release.
ghostlander · Aug 2, 2017 · 9ee74c6 · 9ee74c6
1 parent 987dd68
commit 9ee74c6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -97,7 +97,7 @@
         <string>
           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
@@ -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
@@ -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