Proposal for update to 2.0.4.1

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

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

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

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

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

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
@@ -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=-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.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
@@ -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
@@ -353,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 = -mgw53-mt-s-1_58
 }
 
 isEmpty(BOOST_THREAD_LIB_SUFFIX) {

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

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 =

src/clientversion.h

@@ -6,9 +6,9 @@
 //
 
 // 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_REVISION    4
 #define CLIENT_VERSION_BUILD       1
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

src/kernel.cpp

@@ -23,7 +23,21 @@ typedef std::map<int, unsigned int> MapModifierCheckpoints;
 // Hard checkpoints of stake modifiers to ensure they are deterministic
 static std::map<int, unsigned int> 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)

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)

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?=-mgw53-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/boost_1_58_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

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.