Skip to content

Commit cfb2a37

Browse files
1.0.2
1 parent 06dfab1 commit cfb2a37

7 files changed

Lines changed: 22 additions & 50 deletions

File tree

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 2.0.0.
3+
# Generated by GNU Autoconf 2.69 for BitBlocks Core 1.0.2.
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.1'
593+
PACKAGE_VERSION='1.0.2'
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 2.0.0 to adapt to many kinds of systems.
1556+
\`configure' configures BitBlocks Core 1.0.2 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 2.0.0:";;
1627+
short | recursive ) echo "Configuration of BitBlocks Core 1.0.2:";;
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 2.0.0
1874+
BitBlocks Core configure 1.0.2
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 2.0.0, which was
2557+
It was created by BitBlocks Core $as_me 1.0.2, 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='2.0.0'
3503+
VERSION='1.0.2'
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 2.0.0, which was
29822+
This file was extended by BitBlocks Core $as_me 1.0.2, 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 2.0.0
29888+
BitBlocks Core config.status 1.0.2
2988929889
configured by $0, generated by GNU Autoconf 2.69,
2989029890
with options \\"\$ac_cs_config\\"
2989129891

configure.ac

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

src/chainparams.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,15 @@ static void convertSeed6(std::vector<CAddress>& vSeedsOut, const SeedSpec6* data
5656
static Checkpoints::MapCheckpoints mapCheckpoints =
5757
boost::assign::map_list_of
5858
(0, uint256("0x0000072fa90af55d6d2e8c4ddefef154787e152b85b37e8a1bcfd20daf88cb78"))
59-
(58482, uint256("0x05878445b7877aea2ef3d7e52a7cbfbd5a4d12eaf5103d1ccdc02561b6170f78"));
59+
(58482, uint256("0x05878445b7877aea2ef3d7e52a7cbfbd5a4d12eaf5103d1ccdc02561b6170f78"))
60+
(70774, uint256("0x1600a54444d64672652f4d32d26ef099c2d80822fd68836e1d819dc5aa9e8db2"));
61+
6062
static const Checkpoints::CCheckpointData data = {
6163
&mapCheckpoints,
62-
1542062092, // * UNIX timestamp of last checkpoint block
63-
117040, // * total number of transactions between genesis and last checkpoint
64+
1542800853, // * UNIX timestamp of last checkpoint block
65+
142666, // * total number of transactions between genesis and last checkpoint
6466
// (the tx=... number in the SetBestChain debug.log lines)
65-
2000 // * estimated number of transactions per day after checkpoint
67+
2880 // * estimated number of transactions per day after checkpoint
6668
};
6769

6870
static Checkpoints::MapCheckpoints mapCheckpointsTestnet =

src/clientversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//! These need to be macros, as clientversion.cpp's and bitblocks*-res.rc's voodoo requires it
1717
#define CLIENT_VERSION_MAJOR 1
1818
#define CLIENT_VERSION_MINOR 0
19-
#define CLIENT_VERSION_REVISION 1
19+
#define CLIENT_VERSION_REVISION 2
2020
#define CLIENT_VERSION_BUILD 0
2121

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

src/qt/res/bitblocks-qt-res.rc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ BEGIN
1919
BEGIN
2020
BLOCK "040904E4" // U.S. English - multilingual (hex)
2121
BEGIN
22-
VALUE "CompanyName", "BitBlocks CWF"
23-
VALUE "FileDescription", "BitBlocks (CoinWebFactory Release)"
22+
VALUE "CompanyName", "BitBlocks"
23+
VALUE "FileDescription", "BitBlocks"
2424
VALUE "FileVersion", VER_FILEVERSION_STR
2525
VALUE "InternalName", "bitblocks-qt"
2626
VALUE "LegalCopyright", COPYRIGHT_STR
2727
VALUE "LegalTrademarks1", "Distributed by CoinWebFactory under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
2828
VALUE "OriginalFilename", "bitblocks-qt.exe"
29-
VALUE "ProductName", "BitBlocks CWF"
29+
VALUE "ProductName", "BitBlocks"
3030
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
3131
END
3232
END

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -112,37 +112,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget* parent) : QDialog(parent),
112112
ui->labelCoinControlLowOutput->addAction(clipboardLowOutputAction);
113113
ui->labelCoinControlChange->addAction(clipboardChangeAction);
114114

115-
// init transaction fee section
116-
if (!settings.contains("fFeeSectionMinimized"))
117-
settings.setValue("fFeeSectionMinimized", true);
118-
if (!settings.contains("nFeeRadio") && settings.contains("nTransactionFee") && settings.value("nTransactionFee").toLongLong() > 0) // compatibility
119-
settings.setValue("nFeeRadio", 1); // custom
120-
if (!settings.contains("nFeeRadio"))
121-
settings.setValue("nFeeRadio", 0); // recommended
122-
if (!settings.contains("nCustomFeeRadio") && settings.contains("nTransactionFee") && settings.value("nTransactionFee").toLongLong() > 0) // compatibility
123-
settings.setValue("nCustomFeeRadio", 1); // total at least
124-
if (!settings.contains("nCustomFeeRadio"))
125-
settings.setValue("nCustomFeeRadio", 0); // per kilobyte
126-
if (!settings.contains("nSmartFeeSliderPosition"))
127-
settings.setValue("nSmartFeeSliderPosition", 0);
128-
if (!settings.contains("nTransactionFee"))
129-
settings.setValue("nTransactionFee", (qint64)DEFAULT_TRANSACTION_FEE);
130-
if (!settings.contains("fPayOnlyMinFee"))
131-
settings.setValue("fPayOnlyMinFee", false);
132-
if (!settings.contains("fSendFreeTransactions"))
133-
settings.setValue("fSendFreeTransactions", false);
134-
135-
ui->groupFee->setId(ui->radioSmartFee, 0);
136-
ui->groupFee->setId(ui->radioCustomFee, 1);
137-
ui->groupFee->button((int)std::max(0, std::min(1, settings.value("nFeeRadio").toInt())))->setChecked(true);
138-
ui->groupCustomFee->setId(ui->radioCustomPerKilobyte, 0);
139-
ui->groupCustomFee->setId(ui->radioCustomAtLeast, 1);
140-
ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);
141-
ui->sliderSmartFee->setValue(settings.value("nSmartFeeSliderPosition").toInt());
142-
ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());
143-
ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());
144-
ui->checkBoxFreeTx->setChecked(settings.value("fSendFreeTransactions").toBool());
145-
minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
115+
146116
}
147117

148118
void SendCoinsDialog::setClientModel(ClientModel* clientModel)

src/qt/splashscreen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ 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.1")).arg(QString::fromStdString(FormatFullVersion()));
39+
QString versionText = QString(tr("Version: 1.0.2")).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"));

0 commit comments

Comments
 (0)