Skip to content

Commit

Permalink
1.6.4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
nlg-buildbot committed Jan 1, 2018
1 parent e774dd8 commit 6a9de7d
Show file tree
Hide file tree
Showing 24 changed files with 17,160 additions and 222 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Binaries are output as follows by the build process:
|Gulden RPC client|src/Gulden-cli|
|Gulden tx utility|src/Gulden-tx|

Alternatively pre-compiled binaries are also available at https://github.com/Gulden/gulden-official/releases
Alternatively binaries are also available https://developer.gulden.com/apps/


### Additional technical information
Expand Down Expand Up @@ -127,4 +127,4 @@ Alternatively pre-compiled binaries are also available at https://github.com/Gul
|DNS Seed 5|seed.gulden.blue||

### Official testnet settings
-testnet=C1511943855:60 -addnode=64.137.191.5 -addnode=64.137.228.95 -addnode=64.137.228.88 -addnode=64.137.228.46
-testnet=C1507484844:60 -addnode=64.137.191.5 -addnode=64.137.228.95 -addnode=64.137.228.88 -addnode=64.137.228.46
14 changes: 14 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
1.6.4.8

Minor maintenence release.
UI - Introduce a new informational widget and other minor UI improvements that make it move obvious to users that the wallet is not yet available during initial sync.
UI - Add a new menu item for setting the currency.
UI - Fix a crash in the send dialog on machines with no network connection.
UI - Remove bitcoin payment option from send screen
CORE - Update checkpoints, static difficulties, static seeds and other static information to help assist new users with better syncing experience.


1.6.4.7

Minor testnet related release.

1.6.4.6

RPC - Fix an issue introduced in 1.6.4.3 which can cause users running with "-disablewallet" to experience RPC freezes when calling certain RPC commands.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 6)
define(_CLIENT_VERSION_REVISION, 4)
define(_CLIENT_VERSION_BUILD, 7)
define(_CLIENT_VERSION_BUILD, 8)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2016)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
16,246 changes: 16,243 additions & 3 deletions src/Gulden/Common/diff_old.cpp

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ QT_FORMS_UI = \
qt/forms/editaddressdialog.ui \
qt/forms/helpmessagedialog.ui \
qt/forms/intro.ui \
qt/forms/modaloverlay.ui \
qt/forms/openuridialog.ui \
qt/forms/optionsdialog.ui \
qt/forms/overviewpage.ui \
Expand Down Expand Up @@ -232,6 +233,7 @@ QT_MOC_CPP = \
qt/moc_intro.cpp \
qt/moc_macdockiconhandler.cpp \
qt/moc_macnotificationhandler.cpp \
qt/moc_modaloverlay.cpp \
qt/moc_notificator.cpp \
qt/moc_openuridialog.cpp \
qt/moc_optionsdialog.cpp \
Expand Down Expand Up @@ -300,6 +302,7 @@ GULDEN_QT_H = \
qt/intro.h \
qt/macdockiconhandler.h \
qt/macnotificationhandler.h \
qt/modaloverlay.h \
qt/networkstyle.h \
qt/notificator.h \
qt/openuridialog.h \
Expand Down Expand Up @@ -400,6 +403,7 @@ GULDEN_QT_CPP = \
qt/csvmodelwriter.cpp \
qt/guiutil.cpp \
qt/intro.cpp \
qt/modaloverlay.cpp \
qt/networkstyle.cpp \
qt/notificator.cpp \
qt/optionsdialog.cpp \
Expand Down
10 changes: 4 additions & 6 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ class CMainParams : public CChainParams {
assert(genesis.hashMerkleRoot == uint256S("0x4bed0bcb3e6097445ae68d455137625bb66f0e7ba06d9db80290bf72e3d6dcf8"));

vSeeds.push_back(CDNSSeedData("seed 0", "seed.gulden.com"));
vSeeds.push_back(CDNSSeedData("seed 1", "amsterdam.gulden.com"));
vSeeds.push_back(CDNSSeedData("seed 2", "seed.gulden.network"));

vSeeds.push_back(CDNSSeedData("seed 3", "rotterdam.gulden.network"));
vSeeds.push_back(CDNSSeedData("seed 4", "seed.gulden.blue"));

base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 38); // 'G'
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, 98); // 'g'
Expand All @@ -142,9 +140,9 @@ class CMainParams : public CChainParams {
fTestnetToBeDeprecatedFieldRPC = false;

checkpointData = (CCheckpointData){
boost::assign::map_list_of(0, uint256S("0x6c5d71a461b5bff6742bb62e5be53978b8dec5103ce52d1aaab8c6a251582f92"))(1000, uint256S("0x77676cde325930f1a2f3bdabf34e54f06445e7dfd8b85a6aab372f60a222fa30"))(2000, uint256S("0x9732e5f8b9fec4f62f83171eaa033cffa11714ba56dbb1dd60df681b358c9dd2"))(10000, uint256S("0x25a619632ea07771156d61791245e7b3497ae987ef6be5348c41380291848974"))(15000, uint256S("0x944e0468c38392c5f32818f8f50c10aa6deb5986d85a72e9aaddfe94acc74a5c"))(19000, uint256S("0x2a9d91e8b61dc77b79ea43befeb72a1a8c89af3e8a40dbdba5b3a6b5f7510e91"))(30300, uint256S("0x6340483a4bdd4e3a519a292ae4bc424dc12b8c72ef8f3cf3762347afc0a699c0"))(35000, uint256S("0xe14bac6cfea31014bb057500160fb5a962e492ce16652b14fa07314fd9e523ff"))(45000, uint256S("0x97b4cff99eda714dbff09881e339d1159e5558486e31198affd712ca806f0b1d"))(86600, uint256S("0x9e3e0388b4712f2787cd443a7dbeeda12e90b98e909877cf814e7d5a60fc4b85"))(100000, uint256S("0x5e831ed155d05f6ac7f17635022dbc348bf73942309ac403c6f8c2990e2e0af1"))(125000, uint256S("0xee27d0f4b6596f302eb591072136ae196bb318d776c16625b23cc7383052b564"))(150000, uint256S("0x97fdb21189d5a958d42fcb58f8d300e737a20fad91878dabdd925d11fc614013"))(175000, uint256S("0xda6aa09113ddd62d871e9aacad6131831d5841a26968f1665a9b829fd30a29e3"))(200000, uint256S("0x4e80313f4eb23093a63218f3736379084d1eeae46c4343668f3cdc9c0c5ca260"))(225000, uint256S("0xc9a5c5226d8f103972ffee38c31c3508189b694e0d4f93a394ccea2cac82ce49"))(250000, uint256S("0xa6635e1dbce15cfb4be7f3f464f612205dd13ba96828535000b99ce04648500d"))(260000, uint256S("0x42c2254ffd8be411386b9089fec985fe3a06d5fc386ff0bd494b5a3aa292f107"))(280350, uint256S("0xf95b3e7f97a41db38a872bdd15d985aae252c5ab497a51319e5bd50161a48d18"))(300000, uint256S("0xf0f99e78c90d20ac4e376ffd1a7e8a89cd1bd152ad1a40f7be31bbf8e0b492c5"))(325000, uint256S("0xa00bccd7a68495771f03856633786a16d3106b38adeafc4d610918b5b118ec9e"))(350000, uint256S("0xa4c92744d47ada905f5cacc7ee91d86f0e646d52d5d8cafdab5d288490002196"))(375000, uint256S("0xa1c3e45a3b4bbf823a35433f604d33c89749a3950a793becc90cddbecd03409c"))(400000, uint256S("0xe4b072d2861b8041f42dcf2e8f5d1caaaff36bc952518e99f6d3fac89e1e1133"))(425000, uint256S("0x0dd5aa1302943e7b4fff1963ce1c32a1aa3db15d652515a3ca8bf4aad84952d7"))(450000, uint256S("0xfa4f46c846b053104ce5956578d72f9a5fa87c4ae49a6450e5d66c4fd37d6d66"))(475000, uint256S("0xa730a89a11332ee0133c458c5feccbda857ace9572ab5a048701cccb0239cf4c"))(500000, uint256S("0xd30e19c8b8c567b23c09fc022b4f5ca8014a8cb3c1504782e9a68af349757afa"))(505000, uint256S("0x56bce924eb7613b6fd4ac859a06a13f7643817d6a593d19951ab293182a021cb"))(550000, uint256S("0x3d7fc31f64905e2e6559298b826b914a3716ae160caea485ae46230890a4144d"))(600000, uint256S("0xd6f49c4bf3b3a0e82392809b8925c485a518acdeacf8bdd9a9326e4c68456d6b")),
1505870868, // * UNIX timestamp of last checkpoint block
1208446, // * total number of transactions between genesis and last checkpoint
boost::assign::map_list_of(0, uint256S("0x6c5d71a461b5bff6742bb62e5be53978b8dec5103ce52d1aaab8c6a251582f92"))(1000, uint256S("0x77676cde325930f1a2f3bdabf34e54f06445e7dfd8b85a6aab372f60a222fa30"))(2000, uint256S("0x9732e5f8b9fec4f62f83171eaa033cffa11714ba56dbb1dd60df681b358c9dd2"))(10000, uint256S("0x25a619632ea07771156d61791245e7b3497ae987ef6be5348c41380291848974"))(15000, uint256S("0x944e0468c38392c5f32818f8f50c10aa6deb5986d85a72e9aaddfe94acc74a5c"))(19000, uint256S("0x2a9d91e8b61dc77b79ea43befeb72a1a8c89af3e8a40dbdba5b3a6b5f7510e91"))(30300, uint256S("0x6340483a4bdd4e3a519a292ae4bc424dc12b8c72ef8f3cf3762347afc0a699c0"))(35000, uint256S("0xe14bac6cfea31014bb057500160fb5a962e492ce16652b14fa07314fd9e523ff"))(45000, uint256S("0x97b4cff99eda714dbff09881e339d1159e5558486e31198affd712ca806f0b1d"))(86600, uint256S("0x9e3e0388b4712f2787cd443a7dbeeda12e90b98e909877cf814e7d5a60fc4b85"))(100000, uint256S("0x5e831ed155d05f6ac7f17635022dbc348bf73942309ac403c6f8c2990e2e0af1"))(125000, uint256S("0xee27d0f4b6596f302eb591072136ae196bb318d776c16625b23cc7383052b564"))(150000, uint256S("0x97fdb21189d5a958d42fcb58f8d300e737a20fad91878dabdd925d11fc614013"))(175000, uint256S("0xda6aa09113ddd62d871e9aacad6131831d5841a26968f1665a9b829fd30a29e3"))(200000, uint256S("0x4e80313f4eb23093a63218f3736379084d1eeae46c4343668f3cdc9c0c5ca260"))(225000, uint256S("0xc9a5c5226d8f103972ffee38c31c3508189b694e0d4f93a394ccea2cac82ce49"))(250000, uint256S("0xa6635e1dbce15cfb4be7f3f464f612205dd13ba96828535000b99ce04648500d"))(260000, uint256S("0x42c2254ffd8be411386b9089fec985fe3a06d5fc386ff0bd494b5a3aa292f107"))(280350, uint256S("0xf95b3e7f97a41db38a872bdd15d985aae252c5ab497a51319e5bd50161a48d18"))(300000, uint256S("0xf0f99e78c90d20ac4e376ffd1a7e8a89cd1bd152ad1a40f7be31bbf8e0b492c5"))(325000, uint256S("0xa00bccd7a68495771f03856633786a16d3106b38adeafc4d610918b5b118ec9e"))(350000, uint256S("0xa4c92744d47ada905f5cacc7ee91d86f0e646d52d5d8cafdab5d288490002196"))(375000, uint256S("0xa1c3e45a3b4bbf823a35433f604d33c89749a3950a793becc90cddbecd03409c"))(400000, uint256S("0xe4b072d2861b8041f42dcf2e8f5d1caaaff36bc952518e99f6d3fac89e1e1133"))(425000, uint256S("0x0dd5aa1302943e7b4fff1963ce1c32a1aa3db15d652515a3ca8bf4aad84952d7"))(450000, uint256S("0xfa4f46c846b053104ce5956578d72f9a5fa87c4ae49a6450e5d66c4fd37d6d66"))(475000, uint256S("0xa730a89a11332ee0133c458c5feccbda857ace9572ab5a048701cccb0239cf4c"))(500000, uint256S("0xd30e19c8b8c567b23c09fc022b4f5ca8014a8cb3c1504782e9a68af349757afa"))(505000, uint256S("0x56bce924eb7613b6fd4ac859a06a13f7643817d6a593d19951ab293182a021cb"))(550000, uint256S("0x3d7fc31f64905e2e6559298b826b914a3716ae160caea485ae46230890a4144d"))(600000, uint256S("0xd6f49c4bf3b3a0e82392809b8925c485a518acdeacf8bdd9a9326e4c68456d6b"))(650000, uint256S("0x0fcd45353b44036efdabed53931b6a49db8f44fa91ede6be64189bccc5f2af53")),
1513296093, // * UNIX timestamp of last checkpoint block
1467942, // * total number of transactions between genesis and last checkpoint

1700.0 // * estimated number of transactions per day after checkpoint
};
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 6
#define CLIENT_VERSION_REVISION 4
#define CLIENT_VERSION_BUILD 7
#define CLIENT_VERSION_BUILD 8

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE false
Expand Down
25 changes: 21 additions & 4 deletions src/qt/_Gulden/Gulden.qss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,23 @@ QMainWindow QMenu
color: black;
}

/* Informational widget when syncing for the first time*/
#bgWidget
{
background-color: white;
color: black;
}

#contentWidget QLabel
{
margin-left: 40px;
}

#contentWidget #closeButton
{
margin-right: 40px;
}

QMenu::item
{
color: black;
Expand Down Expand Up @@ -145,7 +162,7 @@ BitcoinGUI QDialog:window *
{
color: black;
}

BitcoinGUI QDialog, BitcoinGUI QFrame, #dialogAccountSettings, #frameAccountSettings, #newAccountDialog, #scanToConnectPage, #newAccountPage
{
background-color: transparent;
Expand Down Expand Up @@ -924,9 +941,9 @@ QToolTip

#progress_bar_spacer_left
{
width: 32px;
min-width: 32px;
max-width: 32px;
width: 29px;
min-width: 29px;
max-width: 29px;
}

#rightMargin
Expand Down
30 changes: 29 additions & 1 deletion src/qt/_Gulden/GuldenGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ GuldenGUI::GuldenGUI(BitcoinGUI* pImpl)
, toolsMenu(NULL)
, importPrivateKeyAction(NULL)
, rescanAction(NULL)
, currencyAction(NULL)
, accountSummaryWidget(NULL)
, dialogNewAccount(NULL)
, dialogAccountSettings(NULL)
Expand Down Expand Up @@ -225,7 +226,8 @@ void GuldenGUI::setBalance(const CAmount& balance, const CAmount& unconfirmedBal
labelBalance->setText(BitcoinUnits::format(BitcoinUnits::BTC, displayBalance, false, BitcoinUnits::separatorStandard, 2));
if (displayBalance > 0 && optionsModel) {
labelBalanceForex->setText(QString("(") + QString::fromStdString(CurrencySymbolForCurrencyCode(optionsModel->guldenSettings->getLocalCurrency().toStdString())) + QString("\u2009") + BitcoinUnits::format(BitcoinUnits::Unit::BTC, ticker->convertGuldenToForex(displayBalance, optionsModel->guldenSettings->getLocalCurrency().toStdString()), false, BitcoinUnits::separatorAlways, 2) + QString(")"));
labelBalanceForex->setVisible(true);
if (labelBalance->isVisible())
labelBalanceForex->setVisible(true);
} else {
labelBalanceForex->setVisible(false);
}
Expand Down Expand Up @@ -286,6 +288,12 @@ void GuldenGUI::createMenusGulden()
rescanAction->setCheckable(false);
toolsMenu->addAction(rescanAction);
connect(rescanAction, SIGNAL(triggered()), this, SLOT(promptRescan()));

currencyAction = new QAction(m_pImpl->platformStyle->TextColorIcon(":/icons/options"), tr("&Select currency"), this);
currencyAction->setStatusTip(tr("Rescan the blockchain looking for any missing transactions"));
currencyAction->setCheckable(false);
m_pImpl->settingsMenu->addAction(currencyAction);
connect(currencyAction, SIGNAL(triggered()), this, SLOT(showExchangeRateDialog()));
}

void GuldenGUI::createToolBarsGulden()
Expand Down Expand Up @@ -704,6 +712,7 @@ void GuldenGUI::doPostInit()
m_pImpl->progressBar->setStyleSheet("");

m_pImpl->progressBar->setTextVisible(false);
m_pImpl->progressBar->setCursor(Qt::PointingHandCursor);

m_pImpl->addToolBar(Qt::BottomToolBarArea, statusBar);

Expand Down Expand Up @@ -741,6 +750,8 @@ void GuldenGUI::doPostInit()

disconnect(m_pImpl->changePassphraseAction, SIGNAL(triggered()), 0, 0);
connect(m_pImpl->changePassphraseAction, SIGNAL(triggered()), this, SLOT(gotoPasswordDialog()));

labelBalance->setVisible(false);
}

void GuldenGUI::hideProgressBarLabel()
Expand All @@ -758,6 +769,23 @@ void GuldenGUI::showProgressBarLabel()
statusBar->setVisible(true);
}

void GuldenGUI::hideBalances()
{
labelBalance->setVisible(false);
labelBalanceForex->setVisible(false);
accountSummaryWidget->hideBalances();
}

void GuldenGUI::showBalances()
{
if (!labelBalance->isVisible()) {
labelBalance->setVisible(true);

updateExchangeRates();
accountSummaryWidget->showBalances();
}
}

bool GuldenGUI::welcomeScreenIsVisible()
{
return welcomeScreen != NULL;
Expand Down
3 changes: 3 additions & 0 deletions src/qt/_Gulden/GuldenGUI.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ class GuldenGUI : public QObject {
void createToolBarsGulden();
void hideToolBars();
void showToolBars();
void hideBalances();
void showBalances();

void hideProgressBarLabel();
void showProgressBarLabel();
Expand Down Expand Up @@ -134,6 +136,7 @@ class GuldenGUI : public QObject {
QMenu* toolsMenu;
QAction* importPrivateKeyAction;
QAction* rescanAction;
QAction* currencyAction;

AccountSummaryWidget* accountSummaryWidget;
NewAccountDialog* dialogNewAccount;
Expand Down
15 changes: 14 additions & 1 deletion src/qt/_Gulden/accountsummarywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ void AccountSummaryWidget::setOptionsModel(OptionsModel* model)
connect(optionsModel->guldenSettings, SIGNAL(localCurrencyChanged(QString)), this, SLOT(updateExchangeRates()));
}

void AccountSummaryWidget::hideBalances()
{
ui->accountBalance->setVisible(false);
ui->accountBalanceForex->setVisible(false);
}

void AccountSummaryWidget::showBalances()
{
ui->accountBalance->setVisible(true);
updateExchangeRates();
}

void AccountSummaryWidget::balanceChanged()
{
if (pwalletMain && m_account) {
Expand Down Expand Up @@ -105,7 +117,8 @@ void AccountSummaryWidget::updateExchangeRates()
*/
if (forexAmount > 0) {
ui->accountBalanceForex->setText(QString("(") + QString::fromStdString(CurrencySymbolForCurrencyCode(currencyCode) + "\u2009") + BitcoinUnits::format(BitcoinUnits::Unit::BTC, forexAmount, false, BitcoinUnits::separatorAlways, 2) + QString(")"));
ui->accountBalanceForex->setVisible(true);
if (ui->accountBalance->isVisible())
ui->accountBalanceForex->setVisible(true);
} else {
ui->accountBalanceForex->setVisible(false);
}
Expand Down
2 changes: 2 additions & 0 deletions src/qt/_Gulden/accountsummarywidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class AccountSummaryWidget : public QFrame {

void setActiveAccount(const CAccount* account);
void setOptionsModel(OptionsModel* model);
void hideBalances();
void showBalances();

public Q_SLOTS:

Expand Down
2 changes: 1 addition & 1 deletion src/qt/_Gulden/forms/guldensendcoinsentry.ui
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<item>
<widget class="QLineEdit" name="receivingAddress">
<property name="placeholderText">
<string>Enter receiving address (Gulden, BCOIN, IBAN)</string>
<string>Enter receiving address (Gulden, IBAN)</string>
</property>
</widget>
</item>
Expand Down
5 changes: 4 additions & 1 deletion src/qt/_Gulden/guldensendcoinsentry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,12 @@ SendCoinsRecipient::PaymentType GuldenSendCoinsEntry::getPaymentType(const QStri
ret = SendCoinsRecipient::PaymentType::NormalPayment;
} else {
QString compareModified = recipient.address;
#ifdef SUPPORT_BITCOIN_AS_FOREX
if (model->validateAddressBCOIN(compareModified)) {
ret = SendCoinsRecipient::PaymentType::BCOINPayment;
} else {
} else
#endif
{

if (model->validateAddressIBAN(recipient.address)) {
ret = SendCoinsRecipient::PaymentType::IBANPayment;
Expand Down
6 changes: 4 additions & 2 deletions src/qt/_Gulden/nocksrequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ void NocksRequest::netRequestFinished(QNetworkReply* reply)
{
if (reply->error() != QNetworkReply::NetworkError::NoError) {

m_recipient->forexFailCode = "Nocks is temporarily unreachable, please try again later.";
if (m_recipient)
m_recipient->forexFailCode = "Nocks is temporarily unreachable, please try again later.";
Q_EMIT requestProcessed();
return;
} else {
Expand Down Expand Up @@ -181,7 +182,8 @@ void NocksRequest::netRequestFinished(QNetworkReply* reply)

void NocksRequest::reportSslErrors(QNetworkReply* reply, const QList<QSslError>& errorList)
{
m_recipient->forexFailCode = "Nocks is temporarily unreachable, please try again later.";
if (m_recipient)
m_recipient->forexFailCode = "Nocks is temporarily unreachable, please try again later.";
Q_EMIT requestProcessed();

this->deleteLater();
Expand Down
Loading

0 comments on commit 6a9de7d

Please sign in to comment.