diff --git a/contrib/installer/maxcoin.ico b/contrib/installer/maxcoin.ico old mode 100644 new mode 100755 index b1f2553..3a23d9b Binary files a/contrib/installer/maxcoin.ico and b/contrib/installer/maxcoin.ico differ diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index 2026b30..4e13619 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -26,7 +26,7 @@ for Ubuntu >= 12.04 (please read the 'Berkely DB version warning' below): apt-get install qt4-qmake libqt4-dev build-essential libboost-dev libboost-system-dev \ libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev \ - libssl-dev libdb++-dev libminiupnpc-dev crypto++ + libssl-dev libdb++-dev libminiupnpc-dev libcrypto++-dev then execute the following: diff --git a/maxcoin-qt.pro b/maxcoin-qt.pro index 8478886..657917f 100644 --- a/maxcoin-qt.pro +++ b/maxcoin-qt.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = maxcoin-qt macx:TARGET = "MaxCoin-Qt" -VERSION = 0.9.4.0 +VERSION = 0.9.4.1 INCLUDEPATH += src src/json src/qt QT += network DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE @@ -450,7 +450,7 @@ macx:QMAKE_INFO_PLIST = share/qt/Info.plist # Set libraries and includes at end, to use platform-defined defaults if not overridden INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) -LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX ./src/cryptopp/libcryptopp.a +LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX $$PWD/src/cryptopp/libcryptopp.a # -lgdi32 has to happen after -lcrypto (see #681) win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX diff --git a/src/clientversion.h b/src/clientversion.h index 2c8892a..20be60f 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,14 +9,14 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_REVISION 4 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true // Copyright year (2009-this) // Todo: update this when changing our copyright comments in the source -#define COPYRIGHT_YEAR 2017 +#define COPYRIGHT_YEAR 2018 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/cryptopp/GNUmakefile b/src/cryptopp/GNUmakefile index 9390eba..c43792d 100644 --- a/src/cryptopp/GNUmakefile +++ b/src/cryptopp/GNUmakefile @@ -1,7 +1,7 @@ CXXFLAGS = -DNDEBUG -g -O2 -Wno-unused-variable -Wno-unused-function -Wno-extra -Wno-type-limits # -O3 fails to link on Cygwin GCC version 4.5.3 # -fPIC is supported. Please report any breakage of -fPIC as a bug. -# CXXFLAGS += -fPIC + CXXFLAGS += -fPIC # the following options reduce code size, but breaks link or makes link very slow on some systems # CXXFLAGS += -ffunction-sections -fdata-sections # LDFLAGS += -Wl,--gc-sections diff --git a/src/makefile.unix b/src/makefile.unix index d16f2ea..00eadb0 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -51,7 +51,7 @@ ifndef USE_UPNP override USE_UPNP = - endif ifneq (${USE_UPNP}, -) - LIBS += /usr/lib/libminiupnpc.a + LIBS += /usr/lib/x86_64-linux-gnu/libminiupnpc.a DEFS += -DUSE_UPNP=$(USE_UPNP) endif diff --git a/src/net.cpp b/src/net.cpp index a72c47f..b0f292d 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1195,8 +1195,8 @@ void MapPort(bool) // The first name is used as information source for addrman. // The second name should resolve to a list of seed addresses. static const char *strMainNetDNSSeed[][3] = { - {"maxcoinhub.io", "dnsseed.maxcoinhub.io"}, - {"maxcoin.org.uk", "dnsseed.maxcoin.org.uk"}, + {"Seed A", "a.seed.maxcoinproject.net"}, + {"Seed B", "b.seed.maxcoinproject.net"}, {NULL, NULL} }; diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp index cbc2c74..c8642a5 100644 --- a/src/qt/aboutdialog.cpp +++ b/src/qt/aboutdialog.cpp @@ -13,7 +13,7 @@ AboutDialog::AboutDialog(QWidget *parent) : // Set current copyright year ui->copyrightLabel->setText( tr("Copyright") + QString(" © 2009-2017 ") + tr("The Bitcoin developers") + QString(",
") + - tr("Copyright") + QString(" © 2017 ")/*.arg(COPYRIGHT_YEAR)*/ + tr("The MaxCoin developers")); + tr("Copyright") + QString(" © 2018 ")/*.arg(COPYRIGHT_YEAR)*/ + tr("The MaxCoin Project developers")); } void AboutDialog::setModel(ClientModel *model) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 394c9fd..afb111b 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -323,7 +323,7 @@ void BitcoinGUI::createToolBars() toolbar->addAction(receiveCoinsAction); toolbar->addAction(historyAction); toolbar->addAction(addressBookAction); - toolbar->addAction(miningAction); + //toolbar->addAction(miningAction); } void BitcoinGUI::setClientModel(ClientModel *clientModel) diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui index 1f9ba64..0abdc3c 100644 --- a/src/qt/forms/aboutdialog.ui +++ b/src/qt/forms/aboutdialog.ui @@ -6,8 +6,8 @@ 0 0 - 593 - 350 + 650 + 450 @@ -63,7 +63,7 @@ IBeamCursor - 0.3.666-beta + 0.9.4.1 Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -91,7 +91,7 @@ IBeamCursor - Copyright © 2009-2014 The Bitcoin developers, 2017 The MaxCoin developers + Copyright © 2009-2014 The Bitcoin developers, 2018 The MaxCoin developers Qt::RichText diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns index 02ad1fb..0c9a938 100644 Binary files a/src/qt/res/icons/bitcoin.icns and b/src/qt/res/icons/bitcoin.icns differ diff --git a/src/qt/res/icons/favicon.ico b/src/qt/res/icons/favicon.ico old mode 100644 new mode 100755 index 660ac3f..956d5b6 Binary files a/src/qt/res/icons/favicon.ico and b/src/qt/res/icons/favicon.ico differ diff --git a/src/qt/res/icons/maxcoin_128.ico b/src/qt/res/icons/maxcoin_128.ico old mode 100644 new mode 100755 index b1f2553..3a23d9b Binary files a/src/qt/res/icons/maxcoin_128.ico and b/src/qt/res/icons/maxcoin_128.ico differ diff --git a/src/qt/res/icons/maxcoin_16.ico b/src/qt/res/icons/maxcoin_16.ico old mode 100644 new mode 100755 index 660ac3f..956d5b6 Binary files a/src/qt/res/icons/maxcoin_16.ico and b/src/qt/res/icons/maxcoin_16.ico differ diff --git a/src/qt/res/icons/maxcoin_256.ico b/src/qt/res/icons/maxcoin_256.ico new file mode 100755 index 0000000..25e58eb Binary files /dev/null and b/src/qt/res/icons/maxcoin_256.ico differ diff --git a/src/qt/res/icons/maxcoin_256.png b/src/qt/res/icons/maxcoin_256.png old mode 100644 new mode 100755 index 4d4e5af..64dd7b7 Binary files a/src/qt/res/icons/maxcoin_256.png and b/src/qt/res/icons/maxcoin_256.png differ diff --git a/src/qt/res/icons/maxcoin_256_testnet.ico b/src/qt/res/icons/maxcoin_256_testnet.ico new file mode 100755 index 0000000..25e58eb Binary files /dev/null and b/src/qt/res/icons/maxcoin_256_testnet.ico differ diff --git a/src/qt/res/icons/maxcoin_256_testnet.png b/src/qt/res/icons/maxcoin_256_testnet.png old mode 100644 new mode 100755 index 4d4e5af..64dd7b7 Binary files a/src/qt/res/icons/maxcoin_256_testnet.png and b/src/qt/res/icons/maxcoin_256_testnet.png differ diff --git a/src/qt/res/icons/maxcoin_32.ico b/src/qt/res/icons/maxcoin_32.ico old mode 100644 new mode 100755 index f2c9c1f..7c66ece Binary files a/src/qt/res/icons/maxcoin_32.ico and b/src/qt/res/icons/maxcoin_32.ico differ diff --git a/src/qt/res/icons/maxcoin_32_testnet.ico b/src/qt/res/icons/maxcoin_32_testnet.ico old mode 100644 new mode 100755 index f2c9c1f..7c66ece Binary files a/src/qt/res/icons/maxcoin_32_testnet.ico and b/src/qt/res/icons/maxcoin_32_testnet.ico differ diff --git a/src/qt/res/icons/maxcoin_48.ico b/src/qt/res/icons/maxcoin_48.ico old mode 100644 new mode 100755 index 1b49925..eb5ce45 Binary files a/src/qt/res/icons/maxcoin_48.ico and b/src/qt/res/icons/maxcoin_48.ico differ diff --git a/src/qt/res/icons/maxcoin_48_testnet.ico b/src/qt/res/icons/maxcoin_48_testnet.ico new file mode 100755 index 0000000..eb5ce45 Binary files /dev/null and b/src/qt/res/icons/maxcoin_48_testnet.ico differ diff --git a/src/qt/res/icons/maxcoin_64.ico b/src/qt/res/icons/maxcoin_64.ico old mode 100644 new mode 100755 index 1f6f86a..432d548 Binary files a/src/qt/res/icons/maxcoin_64.ico and b/src/qt/res/icons/maxcoin_64.ico differ diff --git a/src/qt/res/icons/maxcoin_testnet_128.ico b/src/qt/res/icons/maxcoin_testnet_128.ico old mode 100644 new mode 100755 index b1f2553..3a23d9b Binary files a/src/qt/res/icons/maxcoin_testnet_128.ico and b/src/qt/res/icons/maxcoin_testnet_128.ico differ diff --git a/src/qt/res/icons/maxcoin_testnet_16.ico b/src/qt/res/icons/maxcoin_testnet_16.ico old mode 100644 new mode 100755 index 660ac3f..956d5b6 Binary files a/src/qt/res/icons/maxcoin_testnet_16.ico and b/src/qt/res/icons/maxcoin_testnet_16.ico differ diff --git a/src/qt/res/icons/maxcoin_testnet_32.ico b/src/qt/res/icons/maxcoin_testnet_32.ico old mode 100644 new mode 100755 index 660ac3f..7c66ece Binary files a/src/qt/res/icons/maxcoin_testnet_32.ico and b/src/qt/res/icons/maxcoin_testnet_32.ico differ diff --git a/src/qt/res/icons/maxcoin_testnet_48.ico b/src/qt/res/icons/maxcoin_testnet_48.ico index 1b49925..eb5ce45 100644 Binary files a/src/qt/res/icons/maxcoin_testnet_48.ico and b/src/qt/res/icons/maxcoin_testnet_48.ico differ diff --git a/src/qt/res/icons/maxcoin_testnet_64.ico b/src/qt/res/icons/maxcoin_testnet_64.ico old mode 100644 new mode 100755 index 1f6f86a..432d548 Binary files a/src/qt/res/icons/maxcoin_testnet_64.ico and b/src/qt/res/icons/maxcoin_testnet_64.ico differ diff --git a/src/qt/res/icons/mining_inactive.png b/src/qt/res/icons/mining_inactive.png old mode 100644 new mode 100755 index 227f505..e8f0c81 Binary files a/src/qt/res/icons/mining_inactive.png and b/src/qt/res/icons/mining_inactive.png differ diff --git a/src/qt/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png old mode 100644 new mode 100755 index 126db23..e8f0c81 Binary files a/src/qt/res/icons/toolbar.png and b/src/qt/res/icons/toolbar.png differ diff --git a/src/qt/res/icons/toolbar_testnet.png b/src/qt/res/icons/toolbar_testnet.png old mode 100644 new mode 100755 index 126db23..e8f0c81 Binary files a/src/qt/res/icons/toolbar_testnet.png and b/src/qt/res/icons/toolbar_testnet.png differ diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png old mode 100644 new mode 100755 index a8b78ef..fa797f6 Binary files a/src/qt/res/images/about.png and b/src/qt/res/images/about.png differ diff --git a/src/qt/res/images/about_logo.png b/src/qt/res/images/about_logo.png old mode 100644 new mode 100755 index 4325d9f..fa797f6 Binary files a/src/qt/res/images/about_logo.png and b/src/qt/res/images/about_logo.png differ diff --git a/src/qt/res/images/splash.png b/src/qt/res/images/splash.png old mode 100644 new mode 100755 index bcbdf97..78122f4 Binary files a/src/qt/res/images/splash.png and b/src/qt/res/images/splash.png differ diff --git a/src/qt/res/images/splash_testnet.png b/src/qt/res/images/splash_testnet.png old mode 100644 new mode 100755 index 5a8825c..78122f4 Binary files a/src/qt/res/images/splash_testnet.png and b/src/qt/res/images/splash_testnet.png differ diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index aa33cda..75e52f9 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -238,7 +238,7 @@ Value listunspent(const Array& params, bool fHelp) CTxDestination address; if (ExtractDestination(pk, address)) { - const CScriptID& hash = boost::get(address); + const CScriptID& hash = boost::get(address); CScript redeemScript; if (pwalletMain->GetCScript(hash, redeemScript)) entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); diff --git a/src/version.cpp b/src/version.cpp index fdbb792..934b91b 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -11,7 +11,7 @@ const std::string CLIENT_NAME("Max"); // Client version number -#define CLIENT_VERSION_SUFFIX "-beta" +#define CLIENT_VERSION_SUFFIX "" // The following part of the code determines the CLIENT_BUILD variable.