Skip to content

Commit b63fade

Browse files
1.1.0
Update masternode collateral to 150000
1 parent 87f0740 commit b63fade

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Transactions per second: 346 TPS (approximately)
4343

4444
Masternode Support: Yes
4545

46-
Coins necessary for masternode: 30,000 BBK
46+
Coins necessary for masternode: 150000 BBK

configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for BitBlocks Core 1.0.3.
3+
# Generated by GNU Autoconf 2.69 for BitBlocks Core 1.1.0.
44
#
55
# Report bugs to <www.bitblocks.org>.
66
#
@@ -590,7 +590,7 @@ MAKEFLAGS=
590590
# Identity of this package.
591591
PACKAGE_NAME='BitBlocks Core'
592592
PACKAGE_TARNAME='bitblocks'
593-
PACKAGE_VERSION='1.0.3'
593+
PACKAGE_VERSION='1.1.0'
594594
PACKAGE_STRING='BitBlocks Core'
595595
PACKAGE_BUGREPORT='www.bitblocksproject.com'
596596
PACKAGE_URL=''
@@ -1553,7 +1553,7 @@ if test "$ac_init_help" = "long"; then
15531553
# Omit some internal or obsolete options to make the list less imposing.
15541554
# This message is too long to be a string in the A/UX 3.1 sh.
15551555
cat <<_ACEOF
1556-
\`configure' configures BitBlocks Core 1.0.3 to adapt to many kinds of systems.
1556+
\`configure' configures BitBlocks Core 1.1.0 to adapt to many kinds of systems.
15571557

15581558
Usage: $0 [OPTION]... [VAR=VALUE]...
15591559

@@ -1624,7 +1624,7 @@ fi
16241624

16251625
if test -n "$ac_init_help"; then
16261626
case $ac_init_help in
1627-
short | recursive ) echo "Configuration of BitBlocks Core 1.0.3:";;
1627+
short | recursive ) echo "Configuration of BitBlocks Core 1.1.0:";;
16281628
esac
16291629
cat <<\_ACEOF
16301630

@@ -1871,7 +1871,7 @@ fi
18711871
test -n "$ac_init_help" && exit $ac_status
18721872
if $ac_init_version; then
18731873
cat <<\_ACEOF
1874-
BitBlocks Core configure 1.0.3
1874+
BitBlocks Core configure 1.1.0
18751875
generated by GNU Autoconf 2.69
18761876

18771877
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2554,7 @@ cat >config.log <<_ACEOF
25542554
This file contains any messages produced by compilers while
25552555
running configure, to aid debugging if configure makes a mistake.
25562556

2557-
It was created by BitBlocks Core $as_me 1.0.3, which was
2557+
It was created by BitBlocks Core $as_me 1.1.0, which was
25582558
generated by GNU Autoconf 2.69. Invocation command line was
25592559

25602560
$ $0 $@
@@ -3500,7 +3500,7 @@ fi
35003500

35013501
# Define the identity of the package.
35023502
PACKAGE='bitblocks'
3503-
VERSION='1.0.3'
3503+
VERSION='1.1.0'
35043504

35053505

35063506
# Some tools Automake needs.
@@ -29819,7 +29819,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2981929819
# report actual input values of CONFIG_FILES etc. instead of their
2982029820
# values after options handling.
2982129821
ac_log="
29822-
This file was extended by BitBlocks Core $as_me 1.0.3, which was
29822+
This file was extended by BitBlocks Core $as_me 1.1.0, which was
2982329823
generated by GNU Autoconf 2.69. Invocation command line was
2982429824

2982529825
CONFIG_FILES = $CONFIG_FILES
@@ -29885,7 +29885,7 @@ _ACEOF
2988529885
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2988629886
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2988729887
ac_cs_version="\\
29888-
BitBlocks Core config.status 1.0.3
29888+
BitBlocks Core config.status 1.1.0
2988929889
configured by $0, generated by GNU Autoconf 2.69,
2989029890
with options \\"\$ac_cs_config\\"
2989129891

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 1)
4-
define(_CLIENT_VERSION_MINOR, 0)
5-
define(_CLIENT_VERSION_REVISION, 3)
4+
define(_CLIENT_VERSION_MINOR, 1)
5+
define(_CLIENT_VERSION_REVISION, 0)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2018)

src/chainparams.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class CMainParams : public CChainParams
108108
nLastPOWBlock = 500;
109109
nMaturity = 15;
110110
nMasternodeCountDrift = 20;
111-
nMasternodeCollateralLimit = 30000;
111+
nMasternodeCollateralLimit = 150000;
112112
nModifierUpdateBlock = 615800;
113113
nMaxMoneyOut = 584000000 * COIN;
114114
const char* pszTimestamp = "Bitblocks fast transaction without fee by Edson";
@@ -205,7 +205,7 @@ class CTestNetParams : public CMainParams
205205
nLastPOWBlock = 200;
206206
nMaturity = 15;
207207
nMasternodeCountDrift = 4;
208-
nMasternodeCollateralLimit = 30000;
208+
nMasternodeCollateralLimit = 150000;
209209
nModifierUpdateBlock = 51197; //approx Mon, 17 Apr 2017 04:00:00 GMT
210210
nMaxMoneyOut = 43199500 * COIN;
211211

src/clientversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
//! These need to be macros, as clientversion.cpp's and bitblocks*-res.rc's voodoo requires it
1717
#define CLIENT_VERSION_MAJOR 1
18-
#define CLIENT_VERSION_MINOR 0
19-
#define CLIENT_VERSION_REVISION 3
18+
#define CLIENT_VERSION_MINOR 1
19+
#define CLIENT_VERSION_REVISION 0
2020
#define CLIENT_VERSION_BUILD 0
2121

2222
//! Set to true for release, false for prerelease or test build

src/qt/splashscreen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle)
3636

3737
// define text to place
3838
QString titleText = tr("BitBlocks Core");
39-
QString versionText = QString(tr("Version: 1.0.3")).arg(QString::fromStdString(FormatFullVersion()));
39+
QString versionText = QString(tr("Version: 1.1.0")).arg(QString::fromStdString(FormatFullVersion()));
4040
QString copyrightTextBtc = QChar(0xA9) + QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
4141
QString copyrightTextDash = QChar(0xA9) + QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Dash Core developers"));
4242
QString copyrightTextPivx = QChar(0xA9) + QString(" 2015-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The PIVX Core developers"));
4343
QString copyrightTextLpc = QChar(0xA9) + QString(tr(" 2018 LightPayCoin developers"));
44-
QString copyrightTextBbk = QChar(0xA9) + QString(tr(" 2019 The BitBlocks Core developers"));
44+
QString copyrightTextBbk = QChar(0xA9) + QString(tr(" 2018-2019 The BitBlocks Core developers"));
4545
QString titleAddText = networkStyle->getTitleAddText();
4646

4747
QString font = QApplication::font().toString();

src/qt/utilitydialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget* parent, bool about) : QDialog(pare
3636
ui->setupUi(this);
3737
GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this);
3838

39-
QString version = tr("BitBlocks Core") + " " + tr("version v2.0-MAIN");
39+
QString version = tr("BitBlocks Core") + " " + tr("version v1.1.0");
4040
/* On x86 add a bit specifier to the version so that users can distinguish between
4141
* 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
4242
*/

src/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* network protocol versioning
1414
*/
1515

16-
static const int PROTOCOL_VERSION = 71000;
16+
static const int PROTOCOL_VERSION = 71001;
1717

1818
//! initial proto version, to be increased after version/verack negotiation
1919
static const int INIT_PROTO_VERSION = 209;
@@ -23,7 +23,7 @@ static const int GETHEADERS_VERSION = 70077;
2323

2424
//! disconnect from peers older than this proto version
2525
static const int MIN_PEER_PROTO_VERSION_BEFORE_ENFORCEMENT = 71000;
26-
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71000;
26+
static const int MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT = 71001;
2727

2828
//! nTime field added to CAddress, starting with this version;
2929
//! if possible, avoid requesting addresses nodes older than this

0 commit comments

Comments
 (0)