1.1.0

Update masternode collateral to 150000

README.md

@@ -43,4 +43,4 @@ Transactions per second: 346 TPS (approximately)
 
 Masternode Support: Yes
 
-Coins necessary for masternode:  30,000 BBK
+Coins necessary for masternode:  150000 BBK

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for BitBlocks Core 1.0.3.
+# Generated by GNU Autoconf 2.69 for BitBlocks Core 1.1.0.
 #
 # Report bugs to <www.bitblocks.org>.
 #
@@ -590,7 +590,7 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='BitBlocks Core'
 PACKAGE_TARNAME='bitblocks'
-PACKAGE_VERSION='1.0.3'
+PACKAGE_VERSION='1.1.0'
 PACKAGE_STRING='BitBlocks Core'
 PACKAGE_BUGREPORT='www.bitblocksproject.com'
 PACKAGE_URL=''
@@ -1553,7 +1553,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures BitBlocks Core 1.0.3 to adapt to many kinds of systems.
+\`configure' configures BitBlocks Core 1.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1624,7 +1624,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BitBlocks Core 1.0.3:";;
+     short | recursive ) echo "Configuration of BitBlocks Core 1.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1871,7 +1871,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-BitBlocks Core configure 1.0.3
+BitBlocks Core configure 1.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by BitBlocks Core $as_me 1.0.3, which was
+It was created by BitBlocks Core $as_me 1.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3500,7 +3500,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='bitblocks'
- VERSION='1.0.3'
+ VERSION='1.1.0'
 
 
 # Some tools Automake needs.
@@ -29819,7 +29819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by BitBlocks Core $as_me 1.0.3, which was
+This file was extended by BitBlocks Core $as_me 1.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29885,7 +29885,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-BitBlocks Core config.status 1.0.3
+BitBlocks Core config.status 1.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 3)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

src/chainparams.cpp

@@ -108,7 +108,7 @@ class CMainParams : public CChainParams
         nLastPOWBlock = 500;
         nMaturity = 15;
         nMasternodeCountDrift = 20;
-        nMasternodeCollateralLimit = 30000;
+        nMasternodeCollateralLimit = 150000;
         nModifierUpdateBlock = 615800;
         nMaxMoneyOut = 584000000 * COIN;
         const char* pszTimestamp = "Bitblocks fast transaction without fee by Edson";
@@ -205,7 +205,7 @@ class CTestNetParams : public CMainParams
         nLastPOWBlock = 200;
         nMaturity = 15;
         nMasternodeCountDrift = 4;
-        nMasternodeCollateralLimit = 30000;
+        nMasternodeCollateralLimit = 150000;
         nModifierUpdateBlock = 51197; //approx Mon, 17 Apr 2017 04:00:00 GMT
         nMaxMoneyOut = 43199500 * COIN;
 

src/clientversion.h

@@ -15,8 +15,8 @@
 
 //! These need to be macros, as clientversion.cpp's and bitblocks*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
-#define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 3
+#define CLIENT_VERSION_MINOR 1
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

src/qt/splashscreen.cpp

@@ -36,12 +36,12 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle)
 
     // define text to place
     QString titleText = tr("BitBlocks Core");
-    QString versionText = QString(tr("Version: 1.0.3")).arg(QString::fromStdString(FormatFullVersion()));
+    QString versionText = QString(tr("Version: 1.1.0")).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"));
     QString copyrightTextLpc = QChar(0xA9) + QString(tr(" 2018 LightPayCoin developers"));
-	QString copyrightTextBbk = QChar(0xA9) + QString(tr(" 2019 The BitBlocks Core developers"));
+    QString copyrightTextBbk = QChar(0xA9) + QString(tr(" 2018-2019 The BitBlocks Core developers"));
     QString titleAddText = networkStyle->getTitleAddText();
 
     QString font = QApplication::font().toString();

src/qt/utilitydialog.cpp

@@ -36,7 +36,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget* parent, bool about) : QDialog(pare
     ui->setupUi(this);
     GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this);
 
-    QString version = tr("BitBlocks Core") + " " + tr("version v2.0-MAIN");
+    QString version = tr("BitBlocks Core") + " " + tr("version v1.1.0");
 /* 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.
      */

src/version.h

@@ -13,7 +13,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 71000;
+static const int PROTOCOL_VERSION = 71001;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -23,7 +23,7 @@ static const int GETHEADERS_VERSION = 70077;
 
 //! disconnect from peers older than this proto version
 static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71000;
-static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71000;
+static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71001;
 
 //! nTime field added to CAddress, starting with this version;
 //! if possible, avoid requesting addresses nodes older than this