v1.4.0

zxfleacoin · Aug 24, 2018 · 0f8f7fd · 0f8f7fd
1 parent 5cb5d2f
commit 0f8f7fd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,11 +1,11 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_MINOR, 4)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2017)
+define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([zXflea Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.zxflea.org],[zxflea])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_HEADERS([src/config/zxflea-config.h])

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -115,8 +115,8 @@ class CMainParams : public CChainParams
         nRejectBlockOutdatedMajority = 950;
         nToCheckBlockUpgradeMajority = 1000;
         nMinerThreads = 0;
-        nTargetTimespan = 1 * 60; // zXflea: 1 day
-        nTargetSpacing = 1 * 90;  // zXflea: 1 minute
+        nTargetTimespan = 1 * 60;
+        nTargetSpacing = 1 * 90;
         nMaturity = 10;
         nMasternodeCountDrift = 20;
         nMaxMoneyOut = 300000000 * COIN;
@@ -175,8 +175,8 @@ class CMainParams : public CChainParams
         fHeadersFirstSyncingActive = false;
 
         nPoolMaxTransactions = 3;
-        strSporkKey = "04ee2826c4629cd948feb23a59f1142c8cb5914311a92161a3542d861aaffe8eab4184a0a29ded1d555b23d93a754e28687d82856ffb3b19fd7d109f5e7297fdf3";
-        strObfuscationPoolDummyAddress = "XJUq47KtCqh7X54cqcWVZ2R3SVEFAbKHye";
+	strSporkKey = "04CEC4AA8630986742F0A2C0F2ACC2231AA09E549DAA7F43FF9F35192B23B3A7202D34266F8A4DFAF2288659909856C2F3D6F0C88077B3513535ACA4D20A97DB61";
+        strObfuscationPoolDummyAddress = "FQXD83mPT5qLFQadajRosX2RtXffoYxFdZ";
         nStartMasternodePayments = 1529203666;
 
         /** Zerocoin */

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,8 +16,8 @@
 
 //! These need to be macros, as clientversion.cpp's and zxflea*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
-#define CLIENT_VERSION_MINOR 3
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_MINOR 4
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -26,15 +26,15 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle)
 {
     // set reference point, paddings
     int paddingLeft = 14;
-    int paddingTop = 470;
+    int paddingTop = 450;
     int titleVersionVSpace = 17;
     int titleCopyrightVSpace = 32;
 
     float fontFactor = 1.0;
 
     // define text to place
     QString titleText = tr("zXflea Core");
-    QString versionText = QString(tr("Version %1")).arg(QString::fromStdString(FormatFullVersion()));
+    QString versionText = QString(tr("Version v1.4-Main")).arg(QString::fromStdString(FormatFullVersion()));
     QString copyrightTextBtc = QChar(0xA9) + QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
     QString copyrightTextDash = QChar(0xA9) + QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Dash Core developers"));
     QString copyrightTextPIVX = QChar(0xA9) + QString(" 2015-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The PIVX Core developers"));
@@ -47,7 +47,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle)
     pixmap = networkStyle->getSplashImage();
 
     QPainter pixPaint(&pixmap);
-    pixPaint.setPen(QColor(100, 100, 100));
+    pixPaint.setPen(QColor(255, 255, 255));
 
     // check font size and drawing with
     pixPaint.setFont(QFont(font, 28 * fontFactor));
@@ -114,7 +114,7 @@ static void InitMessage(SplashScreen* splash, const std::string& message)
         Qt::QueuedConnection,
         Q_ARG(QString, QString::fromStdString(message)),
         Q_ARG(int, Qt::AlignBottom | Qt::AlignHCenter),
-        Q_ARG(QColor, QColor(100, 100, 100)));
+        Q_ARG(QColor, QColor(255, 255, 255)));
 }
 
 static void ShowProgress(SplashScreen* splash, const std::string& title, int nProgress)

diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -34,7 +34,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget* parent, bool about) : QDialog(pare
     ui->setupUi(this);
     GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this);
 
-    QString version = tr("zXflea Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
+    QString version = tr("zXflea Core") + " " + tr("version v1.4.0-Main");
 /* On x86 add a bit specifier to the version so that users can distinguish between
      * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
      */

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70020;
+static const int PROTOCOL_VERSION = 70030;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -21,8 +21,8 @@ static const int INIT_PROTO_VERSION = 209;
 static const int GETHEADERS_VERSION = 70000;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70002;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70020;
+static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 70020;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 70030;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this