From 76e017a4fdde7974cf8fe68d487bbc8cdff3f6a7 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 21:23:53 +0200 Subject: [PATCH 1/9] Correct ambigious arrar error --- src/net.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 9c954c70e..a52cc896e 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -57,7 +57,7 @@ static bool vfLimited[NET_MAX] = {}; static CNode* pnodeLocalHost = NULL; CAddress addrSeenByPeer(CService("0.0.0.0", 0), nLocalServices); uint64 nLocalHostNonce = 0; -array vnThreadsRunning; +boost::array vnThreadsRunning; static std::vector vhListenSocket; CAddrMan addrman; From 958643db727da2e450825a7683ba0de2c8561661 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 21:31:56 +0200 Subject: [PATCH 2/9] Update1 (#2) * Update license year 2019 ### Fix license of use, update 2019; Format ISO 8869-1; ---------------------------------------------------------------------------------------------------------------------- in Memoriam Guto Schiavon ![guto-schiavon_bitcoin](https://user-images.githubusercontent.com/7637553/50562143-a7506f80-0cf8-11e9-9e58-bed4565c4715.jpg) R.I.P pioneer and friend. #ripGUTO * Add files via upload File use in Share\Setup.nsi but didn't exist. Copy error from Bitcoin to Magi !define MUI_ICON "../share/pixmaps/Noblecoin.ico" * Correct .ico file name * fix windows compile error jemekite @ eagleflies/noblecoin * Correct URLs * Update Hardware Checkpoints * Update Hardware Checkpoints --- COPYING | 4 ++-- contrib/debian/control | 6 +++--- share/pixmaps/noblecoin.ico | Bin 0 -> 15086 bytes share/setup.nsi | 2 +- src/checkpoints.cpp | 14 ++++++++++++++ src/kernel.cpp | 16 +++++++++++++++- src/qt/res/bitcoin-qt.rc | 2 +- 7 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 share/pixmaps/noblecoin.ico diff --git a/COPYING b/COPYING index 29fdd55a9..fd1d3ab41 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -Copyright (c) 2015 Noblecoin Developers -Copyright (c) 2014-2015 Magi Coin Developers +Copyright (c) 2019 Noblecoin Developers +Copyright (c) 2014-2019 Magi Coin Developers Copyright (c) 2013-2014 NovaCoin Developers Copyright (c) 2011-2012 PPCoin Developers Copyright (c) 2009-2014 Bitcoin Developers diff --git a/contrib/debian/control b/contrib/debian/control index a4c542572..bbf4df810 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -18,9 +18,9 @@ Build-Depends: debhelper, libqt4-dev, libqrencode-dev Standards-Version: 3.9.2 -Homepage: http://noblecoin.cc/ -Vcs-Git: git://github.com/noblecoinproject/noblecoin.git -Vcs-Browser: http://github.com/noblecoinproject/noblecoin +Homepage: http://www.noblemovement.com/ +Vcs-Git: git://github.com/eagleflies/noblecoin.git +Vcs-Browser: http://github.com/eagleflies/noblecoin Package: noblecoind Architecture: any diff --git a/share/pixmaps/noblecoin.ico b/share/pixmaps/noblecoin.ico new file mode 100644 index 0000000000000000000000000000000000000000..5959d2f7ad4af38a41536c13f6645d835e494ed1 GIT binary patch literal 15086 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 literal 0 HcmV?d00001 diff --git a/share/setup.nsi b/share/setup.nsi index fbe9ae33d..411bd5cad 100644 --- a/share/setup.nsi +++ b/share/setup.nsi @@ -9,7 +9,7 @@ SetCompressor /SOLID lzma !define COMPANY "Noblecoin project" # MUI Symbol Definitions -!define MUI_ICON "../share/pixmaps/Noblecoin.ico" +!define MUI_ICON "../share/pixmaps/noblecoin.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP "../share/pixmaps/nsis-wizard.bmp" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 696c10a3d..304006fa2 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -25,6 +25,20 @@ namespace Checkpoints static MapCheckpoints mapCheckpoints = boost::assign::map_list_of ( 0, hashGenesisBlockOfficial ) + ( 100000, uint256("0x1a482743877a01739cc1aa0a8c1ced1fb937b0630f8677eddeb4b98ee68eb8bd")) + ( 200000, uint256("0x72a8846ffe9b4080b131318c238ad6586cc3369ba44d86ef324281a200a5e4ec")) + ( 300000, uint256("0xa0cca25fa0a1ccfa212e5526cb3ba97ab759a8aba88a7ae81e8de8183c2255d7")) + ( 400000, uint256("0x6c14e47321a13bab3c2c54f607d4272b738692433a8dfe8a232942045939bca4")) + ( 500000, uint256("0x256bf282c618e32edf9cffcb505eafa2c0176ebc3ce5b32d075cd3bc817431a3")) + ( 600000, uint256("0xbff19200876282087b557f506d230a8485bab7133e6304950f77f5bc3e41814f")) + ( 700000, uint256("0x00b84f7ad90990210f3c4f5074c401fb119d2ce6b598b91dae5f75952d87b6ca")) + ( 800000, uint256("0x8770ebb0c25cbf424f85b378cb3e7a4a7641f90e7194224d71001b411f7b2655")) + ( 900000, uint256("0x890802ffe9ebe6290983a447d9bdc1582f3d08c122e01aa49a77ec8574b8b02e")) + ( 1000000, uint256("0xa15b131def33a69cb3ae098a8f4219b99e39b3be5598aa8ae25be8fa6b68db97")) + ( 1100000, uint256("0xdab3bb91382d46828366758c572d8107a14acbd416f47106b962513318e7346f")) + ( 1200000, uint256("0x9937fedaed7e37fb5e9e4f1bd1c7036c7bf04eca6f4a40846661a7fe859cd21a")) + ( 1300000, uint256("0xe6b56427425e5e4f234c8b9578b59df6bbfa6a13a8fbeffa765664c652bb6040")) + ( 1400000, uint256("0xa3c685aa80472de8618206500877cbd6289d754c5d38c5670c9b302870250536")) ; static MapCheckpoints mapCheckpointsTestnet = diff --git a/src/kernel.cpp b/src/kernel.cpp index 2d48a3532..819a26087 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -23,7 +23,21 @@ typedef std::map MapModifierCheckpoints; // Hard checkpoints of stake modifiers to ensure they are deterministic static std::map mapStakeModifierCheckpoints = boost::assign::map_list_of - ( 0, 0xfd11f4e7 ) + ( 0, 0xfd11f4e7 ) + ( 100000, 0x2bf6b8a2) + ( 200000, 0xd256216b) + ( 300000, 0x5470f466) + ( 400000, 0x8fc0bc73) + ( 500000, 0xfe462ee2) + ( 600000, 0x075f8292) + ( 700000, 0x30b76ce2) + ( 800000, 0xb9312bcf) + ( 900000, 0xaeac14e7) + ( 1000000, 0x5dcd5029) + ( 1100000, 0x2e2c0db2) + ( 1200000, 0x0a4d12a2) + ( 1300000, 0xf4e3dc0a) + ( 1400000, 0xc27268cd) ; // Hard checkpoints of stake modifiers to ensure they are deterministic (TestNet) diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index e5fd26f78..0c8456b96 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -1,4 +1,4 @@ -IDI_ICON1 ICON DISCARDABLE "icons/Noblecoin.ico" +IDI_ICON1 ICON DISCARDABLE "icons/noblecoin.ico" #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information From e49eecc96f2dbf22aa145e71347746d678c5599d Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 21:36:05 +0200 Subject: [PATCH 3/9] Update to mag1.2.3 (#3) * Update license year 2019 ### Fix license of use, update 2019; Format ISO 8869-1; ---------------------------------------------------------------------------------------------------------------------- in Memoriam Guto Schiavon ![guto-schiavon_bitcoin](https://user-images.githubusercontent.com/7637553/50562143-a7506f80-0cf8-11e9-9e58-bed4565c4715.jpg) R.I.P pioneer and friend. #ripGUTO * Add files via upload File use in Share\Setup.nsi but didn't exist. Copy error from Bitcoin to Magi !define MUI_ICON "../share/pixmaps/Noblecoin.ico" * Correct .ico file name * fix windows compile error jemekite @ eagleflies/noblecoin * Correct URLs * Update Hardware Checkpoints * Update Hardware Checkpoints * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update Correction * Update Correction * Update Correction * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update parallel to Magi 1.2.3 * Update Paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.2.3 * Update paralell to Magi 1.3.1 --- doc/build-unix.txt | 54 ++++++++++++++++++++++++++------ doc/readme-qt.rst | 32 ++++++++++++++++--- noblecoin-qt.pro | 17 ++++++++-- src/clientversion.h | 4 +-- src/makefile.unix | 10 +++++- src/qt/forms/overviewpage.ui | 2 +- src/qt/transactiontablemodel.cpp | 3 +- src/version.h | 4 +-- 8 files changed, 102 insertions(+), 24 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 5db316b0f..583394831 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -1,25 +1,32 @@ Copyright (c) 2009-2012 Bitcoin Developers -Distributed under the MIT/X11 software license, see the accompanying -file license.txt or http://www.opensource.org/licenses/mit-license.php. -This product includes software developed by the OpenSSL Project for use in -the OpenSSL Toolkit (http://www.openssl.org/). This product includes -cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP -software written by Thomas Bernard. +Copyright (c) 2014-2015 Magi Developers +Copyright (c) 2014-2019 Noblecoin Developers +Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP +software written by Thomas Bernard. UNIX BUILD NOTES ================ -To Build +To Build On i386, amd64 -------- + cd src/ + make -f makefile.unix # Headless bitcoin +To Build On armv6l +-------- + cd src/ + make -f makefile.unix xCPUARCH=armv6l # Headless bitcoin + +To Build On armv7l +-------- cd src/ -make -f makefile.unix # Headless bitcoin +make -f makefile.unix xCPUARCH=armv7l # Headless bitcoin See readme-qt.rst for instructions on building Bitcoin QT, the graphical bitcoin. -Dependencies +Dependencies for i386, amd64 ------------ Library Purpose Description @@ -29,6 +36,19 @@ Dependencies libboost Boost C++ Library miniupnpc UPnP Support Optional firewall-jumping support libqrencode QRCode generation Optional QRCode generation + libgmp3 GMP Multiple precision arithmetic library + +Dependencies for armv6l, armv7l +------------ + + Library Purpose Description + ------- ------- ----------- + libssl SSL Support Secure communications + libdb5.1 Berkeley DB Blockchain & wallet storage + libboost Boost C++ Library + miniupnpc UPnP Support Optional firewall-jumping support + libqrencode QRCode generation Optional QRCode generation + libgmp3 GMP Multiple precision arithmetic library Note that libexecinfo should be installed, if you building under *BSD systems. This library provides backtrace facility. @@ -59,12 +79,26 @@ Versions used in this release: Boost 1.37 miniupnpc 1.6 -Dependency Build Instructions: Ubuntu & Debian +Dependency Build Instructions: Ubuntu & Debian (i386, amd64) ---------------------------------------------- sudo apt-get install build-essential sudo apt-get install libssl-dev sudo apt-get install libdb4.8-dev sudo apt-get install libdb4.8++-dev libgmp-dev +sudo apt-get install libgmp-dev +sudo apt-get install libminiupnpc-dev + Boost 1.40+: sudo apt-get install libboost-all-dev + or Boost 1.37: sudo apt-get install libboost1.37-dev +sudo apt-get install libqrencode-dev + +Dependency Build Instructions: Ubuntu & Debian (armv7l) +---------------------------------------------- +sudo apt-get install build-essential +sudo apt-get install libssl-dev +sudo apt-get install libdb5.1-dev +sudo apt-get install libdb5.1++-dev +sudo apt-get install libgmp-dev +sudo apt-get install libminiupnpc-dev Boost 1.40+: sudo apt-get install libboost-all-dev or Boost 1.37: sudo apt-get install libboost1.37-dev sudo apt-get install libqrencode-dev diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index b646daa55..bc9490e0d 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -4,17 +4,17 @@ Bitcoin-qt: Qt4 GUI for Bitcoin Build instructions =================== -Debian +Debian (i386, amd64) ------- First, make sure that the required packages for Qt4 development of your -distribution are installed, for Debian and Ubuntu these are: +distribution are installed, for Debian and Ubuntu (i386, amd64) these are: :: 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 libdb4.8++-dev libgmp-dev + libssl-dev libdb4.8++-dev libgmp-dev libminiupnpc-dev then execute the following: @@ -23,9 +23,28 @@ then execute the following: qmake make -Alternatively, install Qt Creator and open the `bitcoin-qt.pro` file. +Debian (armv6l, armv7l) +------- -An executable named `bitcoin-qt` will be built. +First, make sure that the required packages for Qt4 development of your +distribution are installed, for Debian and Ubuntu (i386, amd64) these are: + +:: + + 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 libdb5.1++-dev libgmp-dev libminiupnpc-dev + +then execute the following: + +:: + + qmake + make + +Alternatively, install Qt Creator and open the `noblecoin-qt.pro` file. + +An executable named `noblecoin-qt` will be built. Windows @@ -132,6 +151,9 @@ build yourself will be linked against that. The first time you run with a 5.X ve and 4.X cannot open the new format. This means that you cannot go back to the old statically linked version without significant hassle! +For ease-of-adoption of a Linaro-based ARM build, 5.X should be used by default, as 4.X is not available from +official repositories. + .. _`this Debian issue`: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621425 Ubuntu 11.10 warning diff --git a/noblecoin-qt.pro b/noblecoin-qt.pro index 10e1b17d8..c2517a2c4 100644 --- a/noblecoin-qt.pro +++ b/noblecoin-qt.pro @@ -127,8 +127,21 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { DEFINES += HAVE_BUILD_INFO } -QMAKE_CXXFLAGS += -msse2 -QMAKE_CFLAGS += -msse2 +# If we have an ARM device, we can't use SSE2 instructions, so don't try to use them +QMAKE_XCPUARCH = $$QMAKE_HOST.arch +equals(QMAKE_XCPUARCH, armv7l) { + message(Building without SSE2 support) +} +else:equals(QMAKE_XCPUARCH, armv6l) { + message(Building without SSE2 support) +} +else { + message(Building without SSE2 support) + QMAKE_CXXFLAGS += -msse2 + QMAKE_CFLAGS += -msse2 +} +#endif + QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector # Input diff --git a/src/clientversion.h b/src/clientversion.h index 4a206e88f..2e1b095e2 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,10 +6,10 @@ // // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 1 +#define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_BUILD 4 // 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/makefile.unix b/src/makefile.unix index bb4858f75..1abcc5dfd 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -100,8 +100,16 @@ DEBUGFLAGS=-g # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work. -xCXXFLAGS=-O2 -msse2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ +xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) + +# If we have an ARM device, we can't use SSE2 instructions, so don't try to use them +# xCPUARCH is passed in as a define (xCPUARCH=armv7l, xCPUARCH=armv6l) +ifeq ($(xCPUARCH),armv7l) +else ifeq ($(xCPUARCH),armv6l) +else + xCXXFLAGS+=-msse2 +endif # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 0aefb74db..ddec90372 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -186,7 +186,7 @@ - Mined balance that has not yet matured + Minted balance that has not yet matured 0 NOBL diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 2e9cc4643..5aaea4ead 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -300,7 +300,7 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons switch(wtx->status.maturity) { case TransactionStatus::Immature: - status += "\n" + tr("Mined balance will be available when it matures in %n more block(s)", "", wtx->status.matures_in); + status += "\n" + tr("Minted balance will be available when it matures in %n more block(s)", "", wtx->status.matures_in); break; case TransactionStatus::Mature: break; @@ -360,6 +360,7 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const case TransactionRecord::SendToSelf: return tr("Payment to yourself"); case TransactionRecord::StakeMint: + return tr("Minted"); case TransactionRecord::Generated: return tr("Mined"); default: diff --git a/src/version.h b/src/version.h index 66fede2ea..3c6431ccd 100644 --- a/src/version.h +++ b/src/version.h @@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002; #define DISPLAY_VERSION_MAJOR 2 #define DISPLAY_VERSION_MINOR 0 -#define DISPLAY_VERSION_REVISION 4 -#define DISPLAY_VERSION_BUILD 0 +#define DISPLAY_VERSION_REVISION 0 +#define DISPLAY_VERSION_BUILD 4 #endif From bc71f70f3c9852e81314c4bd5b0bf1acfa7f819f Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 21:42:54 +0200 Subject: [PATCH 4/9] Update dependencies (#4) * Update dependencies * Update Dependencies --- noblecoin-qt.pro | 16 ++++++++-------- src/makefile.mingw | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/noblecoin-qt.pro b/noblecoin-qt.pro index c2517a2c4..4217a73fe 100644 --- a/noblecoin-qt.pro +++ b/noblecoin-qt.pro @@ -23,15 +23,15 @@ greaterThan(QT_MAJOR_VERSION, 4) { # winbuild dependencies win32 { -BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57 -BOOST_INCLUDE_PATH=C:/deps/boost_1_57_0 -BOOST_LIB_PATH=C:/deps/boost_1_57_0/stage/lib +BOOST_LIB_SUFFIX=-mgw73-mt-s-1_58 +BOOST_INCLUDE_PATH=C:/deps/boost_1_58_0 +BOOST_LIB_PATH=C:/deps/boost_1_58_0/stage/lib BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix -OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include -OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j -MINIUPNPC_INCLUDE_PATH=C:/deps/ -MINIUPNPC_LIB_PATH=C:/deps/miniupnpc +OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2s/include +OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2s +MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc-1.6 +MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-1.6 QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4 QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs GMP_INCLUDE_PATH=C:/deps/gmp-6.0.0 @@ -366,7 +366,7 @@ OTHER_FILES += \ # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { macx:BOOST_LIB_SUFFIX = -mt - windows:BOOST_LIB_SUFFIX = -mgw48-mt-s-1_55 + windows:BOOST_LIB_SUFFIX = -mgw73-mt-s-1_58 } isEmpty(BOOST_THREAD_LIB_SUFFIX) { diff --git a/src/makefile.mingw b/src/makefile.mingw index 13973221a..0c9f44a84 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -4,25 +4,25 @@ CXX ?= g++ -USE_UPNP:=- +USE_UPNP:=1 USE_IPV6:=1 DEPSDIR?=/usr/local -BOOST_SUFFIX?=-mgw49-mt-s-1_57 +BOOST_SUFFIX?=-mgw73-mt-s-1_58 INCLUDEPATHS= \ - -I"c:/deps/boost_1_57_0" \ + -I"c:/deps/boost_1_58_0" \ -I"c:/deps/db-4.8.30.NC/build_unix" \ - -I"c:/deps/miniupnpc" \ + -I"c:/deps/miniupnpc-1.6" \ -I"c:/deps/gmp-6.0.0" \ - -I"c:/deps/openssl-1.0.1j/include" + -I"c:/deps/openssl-1.0.2s/include" LIBPATHS= \ -L"c:/deps/boost_1_57_0/stage/lib" \ -L"c:/deps/db-4.8.30.NC/build_unix" \ - -L"c:/deps/miniupnpc" \ + -L"c:/deps/miniupnpc-1.6" \ -L"c:/deps/gmp-6.0.0/.libs" \ - -L"c:/deps/openssl-1.0.1j" + -L"c:/deps/openssl-1.0.2s" LIBS= \ -l boost_system$(BOOST_SUFFIX) \ @@ -46,8 +46,8 @@ ifndef USE_UPNP override USE_UPNP = - endif ifneq (${USE_UPNP}, -) - INCLUDEPATHS += -I"C:\miniupnpc-1.6-mgw" - LIBPATHS += -L"C:\miniupnpc-1.6-mgw" + INCLUDEPATHS += -I"c:/deps/miniupnpc-1.6" + LIBPATHS += -L"c:/deps/miniupnpc-1.6" LIBS += -l miniupnpc -l iphlpapi DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) endif From cdac03688138c29311ec0c16498c549f4a351776 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 21:54:47 +0200 Subject: [PATCH 5/9] Change version to 2.0.4.1 (#5) * Update Version * Update Version * Update Version * Update Version --- doc/README | 2 +- noblecoin-qt.pro | 2 +- src/clientversion.h | 4 ++-- src/version.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/README b/doc/README index 9ddb7d1cc..fe57648f1 100644 --- a/doc/README +++ b/doc/README @@ -2,7 +2,7 @@ Copyright (c) 2014 Noblecoin Developers -Noblecoin 0.3.0 BETA +Noblecoin 2.0.4.1 Copyright (c) 2014 Noblecoin Developers Copyright (c) 2013 NovaCoin Developers diff --git a/noblecoin-qt.pro b/noblecoin-qt.pro index 4217a73fe..81b07d4a0 100644 --- a/noblecoin-qt.pro +++ b/noblecoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = noblecoin-qt -VERSION = 1.0.0.1 +VERSION = 2.0.4.1 INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd diff --git a/src/clientversion.h b/src/clientversion.h index 2e1b095e2..4c0a1313d 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -8,8 +8,8 @@ // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 4 +#define CLIENT_VERSION_REVISION 4 +#define CLIENT_VERSION_BUILD 1 // 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/version.h b/src/version.h index 3c6431ccd..4ec942619 100644 --- a/src/version.h +++ b/src/version.h @@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002; #define DISPLAY_VERSION_MAJOR 2 #define DISPLAY_VERSION_MINOR 0 -#define DISPLAY_VERSION_REVISION 0 -#define DISPLAY_VERSION_BUILD 4 +#define DISPLAY_VERSION_REVISION 4 +#define DISPLAY_VERSION_BUILD 1 #endif From d022abd392203dc46ff4cabeaf8362bd373d54a8 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 22:06:53 +0200 Subject: [PATCH 6/9] Add support miniupnpc 1.9 (#6) * Add miniupnpc 1.9 support * Added support for IPv4 / IPv6 showing in RPC getinfo Parallel Magi-Coin * Added support for IPv4 / IPv6 showing in RPC getinfo * Added support for IPv4 / IPv6 showing in RPC getinfo * Added support for IPv4 / IPv6 showing in RPC getinfo --- src/main.cpp | 13 +++++++++++-- src/net.cpp | 10 ++++++++-- src/net.h | 4 +++- src/rpcwallet.cpp | 4 +++- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 0c37c0c15..a72de1fa7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3005,8 +3005,17 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) } // ppcoin: record my external IP reported by peer - if (addrFrom.IsRoutable() && addrMe.IsRoutable()) - addrSeenByPeer = addrMe; + if (addrFrom.IsRoutable() && addrMe.IsRoutable()) { + + if (addrFrom.IsIPv4()) { + addrSeenByPeerIpv4 = addrMe; + } + + if (addrFrom.IsIPv6()) { + addrSeenByPeerIpv6 = addrMe; + } + addrSeenByPeerIp = addrMe; + } // Be shy and don't send version until we hear if (pfrom->fInbound) diff --git a/src/net.cpp b/src/net.cpp index a52cc896e..a17830ed8 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -55,7 +55,9 @@ static map mapLocalHost; static bool vfReachable[NET_MAX] = {}; static bool vfLimited[NET_MAX] = {}; static CNode* pnodeLocalHost = NULL; -CAddress addrSeenByPeer(CService("0.0.0.0", 0), nLocalServices); +CAddress addrSeenByPeerIp(CService("0.0.0.0", 0), nLocalServices); +CAddress addrSeenByPeerIpv4(CService("0.0.0.0", 0), nLocalServices); +CAddress addrSeenByPeerIpv6(CService("0.0.0.0", 0), nLocalServices); uint64 nLocalHostNonce = 0; boost::array vnThreadsRunning; static std::vector vhListenSocket; @@ -1036,10 +1038,14 @@ void ThreadMapPort2(void* parg) #ifndef UPNPDISCOVER_SUCCESS /* miniupnpc 1.5 */ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); -#else +#elif MINIUPNPC_API_VERSION < 14 /* miniupnpc 1.6 */ int error = 0; devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); +#else + /* miniupnpc 1.9.20150730 */ + int error = 0; + devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); #endif struct UPNPUrls urls; diff --git a/src/net.h b/src/net.h index 4393b9bdd..2819832c8 100644 --- a/src/net.h +++ b/src/net.h @@ -117,7 +117,9 @@ extern bool fDiscover; extern bool fUseUPnP; extern uint64 nLocalServices; extern uint64 nLocalHostNonce; -extern CAddress addrSeenByPeer; +extern CAddress addrSeenByPeerIp; +extern CAddress addrSeenByPeerIpv4; +extern CAddress addrSeenByPeerIpv6; extern boost::array vnThreadsRunning; extern CAddrMan addrman; diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 51d885c10..a4b098593 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -82,7 +82,9 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("moneysupply", ValueFromAmount(pindexBest->nMoneySupply))); obj.push_back(Pair("connections", (int)vNodes.size())); obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); - obj.push_back(Pair("ip", addrSeenByPeer.ToStringIP())); + obj.push_back(Pair("ip", addrSeenByPeerIp.ToStringIP())); + obj.push_back(Pair("ipv4", addrSeenByPeerIpv4.ToStringIP())); + obj.push_back(Pair("ipv6", addrSeenByPeerIpv6.ToStringIP())); diff.push_back(Pair("proof-of-work", GetDifficulty())); diff.push_back(Pair("proof-of-stake", GetDifficulty(GetLastBlockIndex(pindexBest, true)))); From d60cee2e8ebeff989eaf3ec5c2732d9589befce2 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 23:15:53 +0200 Subject: [PATCH 7/9] Update Dependencies --- noblecoin-qt.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noblecoin-qt.pro b/noblecoin-qt.pro index 81b07d4a0..b1bc5cd19 100644 --- a/noblecoin-qt.pro +++ b/noblecoin-qt.pro @@ -30,8 +30,8 @@ BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2s/include OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2s -MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc-1.6 -MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-1.6 +MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc-1.9 +MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-1.9 QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4 QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs GMP_INCLUDE_PATH=C:/deps/gmp-6.0.0 From 7ad14436986886723ed579ededcbca10ae743ca7 Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Wed, 10 Jul 2019 23:16:46 +0200 Subject: [PATCH 8/9] Update Dependencies --- src/makefile.mingw | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/makefile.mingw b/src/makefile.mingw index 0c9f44a84..d9e990b6f 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -13,14 +13,14 @@ BOOST_SUFFIX?=-mgw73-mt-s-1_58 INCLUDEPATHS= \ -I"c:/deps/boost_1_58_0" \ -I"c:/deps/db-4.8.30.NC/build_unix" \ - -I"c:/deps/miniupnpc-1.6" \ + -I"c:/deps/miniupnpc-1.9" \ -I"c:/deps/gmp-6.0.0" \ -I"c:/deps/openssl-1.0.2s/include" LIBPATHS= \ -L"c:/deps/boost_1_57_0/stage/lib" \ -L"c:/deps/db-4.8.30.NC/build_unix" \ - -L"c:/deps/miniupnpc-1.6" \ + -L"c:/deps/miniupnpc-1.9" \ -L"c:/deps/gmp-6.0.0/.libs" \ -L"c:/deps/openssl-1.0.2s" @@ -46,8 +46,8 @@ ifndef USE_UPNP override USE_UPNP = - endif ifneq (${USE_UPNP}, -) - INCLUDEPATHS += -I"c:/deps/miniupnpc-1.6" - LIBPATHS += -L"c:/deps/miniupnpc-1.6" + INCLUDEPATHS += -I"c:/deps/miniupnpc-1.9" + LIBPATHS += -L"c:/deps/miniupnpc-1.9" LIBS += -l miniupnpc -l iphlpapi DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) endif From b23086d83a140319cbd73f8fcf5c11b99840ec4f Mon Sep 17 00:00:00 2001 From: c1nq0 <52049556+c1nq0@users.noreply.github.com> Date: Sat, 13 Jul 2019 23:08:14 +0200 Subject: [PATCH 9/9] Revert Dependencies Revert To Qt 5.9.7 MinGW5.3 --- noblecoin-qt.pro | 8 ++++---- src/makefile.mingw | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/noblecoin-qt.pro b/noblecoin-qt.pro index b1bc5cd19..e2b68db37 100644 --- a/noblecoin-qt.pro +++ b/noblecoin-qt.pro @@ -23,15 +23,15 @@ greaterThan(QT_MAJOR_VERSION, 4) { # winbuild dependencies win32 { -BOOST_LIB_SUFFIX=-mgw73-mt-s-1_58 +BOOST_LIB_SUFFIX=-mgw53-mt-s-1_58 BOOST_INCLUDE_PATH=C:/deps/boost_1_58_0 BOOST_LIB_PATH=C:/deps/boost_1_58_0/stage/lib BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2s/include OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2s -MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc-1.9 -MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-1.9 +MINIUPNPC_INCLUDE_PATH=C:/deps/miniupnpc-1.6 +MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-1.6 QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4 QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs GMP_INCLUDE_PATH=C:/deps/gmp-6.0.0 @@ -366,7 +366,7 @@ OTHER_FILES += \ # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { macx:BOOST_LIB_SUFFIX = -mt - windows:BOOST_LIB_SUFFIX = -mgw73-mt-s-1_58 + windows:BOOST_LIB_SUFFIX = -mgw53-mt-s-1_58 } isEmpty(BOOST_THREAD_LIB_SUFFIX) { diff --git a/src/makefile.mingw b/src/makefile.mingw index d9e990b6f..18ed6bdc5 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -8,19 +8,19 @@ USE_UPNP:=1 USE_IPV6:=1 DEPSDIR?=/usr/local -BOOST_SUFFIX?=-mgw73-mt-s-1_58 +BOOST_SUFFIX?=-mgw53-mt-s-1_58 INCLUDEPATHS= \ -I"c:/deps/boost_1_58_0" \ -I"c:/deps/db-4.8.30.NC/build_unix" \ - -I"c:/deps/miniupnpc-1.9" \ + -I"c:/deps/miniupnpc-1.6" \ -I"c:/deps/gmp-6.0.0" \ -I"c:/deps/openssl-1.0.2s/include" LIBPATHS= \ - -L"c:/deps/boost_1_57_0/stage/lib" \ + -L"c:/deps/boost_1_58_0/stage/lib" \ -L"c:/deps/db-4.8.30.NC/build_unix" \ - -L"c:/deps/miniupnpc-1.9" \ + -L"c:/deps/miniupnpc-1.6" \ -L"c:/deps/gmp-6.0.0/.libs" \ -L"c:/deps/openssl-1.0.2s" @@ -46,8 +46,8 @@ ifndef USE_UPNP override USE_UPNP = - endif ifneq (${USE_UPNP}, -) - INCLUDEPATHS += -I"c:/deps/miniupnpc-1.9" - LIBPATHS += -L"c:/deps/miniupnpc-1.9" + INCLUDEPATHS += -I"c:/deps/miniupnpc-1.6" + LIBPATHS += -L"c:/deps/miniupnpc-1.6" LIBS += -l miniupnpc -l iphlpapi DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP) endif