Merge pull request #39 from CryptoCoderz/master

Merge with development branch/repository (smessage updates and upgrades)

Author: CryptoCoderz

.gitignore

@@ -15,6 +15,8 @@ src/build.h
 .qmake.stash
 Makefile
 DigitalNote-qt
+DigitalNote-Qt.dmg
+DigitalNote-Qt.app
 #resources cpp
 qrc_*.cpp
 #qt creator

DigitalNote.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = DigitalNote-qt
-VERSION = 1.0.2.6
+VERSION = 1.0.3.1
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 QT += core gui widgets network printsupport
 DEFINES += ENABLE_WALLET
@@ -530,26 +530,26 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) {
 }
 
 isEmpty(BDB_LIB_PATH) {
-    macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db4/4.8.30/lib
+    macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db@6.2.32/lib
     windows:BDB_LIB_PATH=C:/dev/coindeps32/bdb-4.8/lib
 }
 
 isEmpty(BDB_LIB_SUFFIX) {
-    macx:BDB_LIB_SUFFIX = -4.8
+    macx:BDB_LIB_SUFFIX = -6.2
 }
 
 isEmpty(BDB_INCLUDE_PATH) {
-    macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db4/4.8.30/include
+    macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db@6.2.32/include
     windows:BDB_INCLUDE_PATH=C:/dev/coindeps32/bdb-4.8/include
 }
 
 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost/1.59.0/lib
+    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.59/1.59.0/lib
     windows:BOOST_LIB_PATH=C:/dev/coindeps32/boost_1_57_0/lib
 }
 
 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost/1.59.0/include
+    macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.59/1.59.0/include
     windows:BOOST_INCLUDE_PATH=C:/dev/coindeps32/boost_1_57_0/include
 }
 
@@ -568,22 +568,22 @@ isEmpty(MINIUPNPC_LIB_SUFFIX) {
 }
 
 isEmpty(MINIUPNPC_INCLUDE_PATH) {
-    macx:MINIUPNPC_INCLUDE_PATH=/usr/local/Cellar/miniupnpc/1.9.20151008/include
+    macx:MINIUPNPC_INCLUDE_PATH= /usr/local/Cellar/miniupnpc/2.1/include
     windows:MINIUPNPC_INCLUDE_PATH=C:/dev/coindeps32/miniupnpc-1.9
 }
 
 isEmpty(MINIUPNPC_LIB_PATH) {
-    macx:MINIUPNPC_LIB_PATH=/usr/local/Cellar/miniupnpc/1.9.20151008/lib
+    macx:MINIUPNPC_LIB_PATH= /usr/local/Cellar/miniupnpc/2.1/lib
     windows:MINIUPNPC_LIB_PATH=C:/dev/coindeps32/miniupnpc-1.9
 }
 
 isEmpty(OPENSSL_INCLUDE_PATH) {
-    macx:OPENSSL_INCLUDE_PATH = /usr/local/openssl-1.0.1p/include
+    macx:OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl/1.0.2t/include
     windows:OPENSSL_INCLUDE_PATH=C:/dev/coindeps32/openssl-1.0.1p/include
 }
 
 isEmpty(OPENSSL_LIB_PATH) {
-    macx:OPENSSL_LIB_PATH = /usr/local/openssl-1.0.1p/lib
+    macx:OPENSSL_LIB_PATH = /usr/local/Cellar/openssl/1.0.2t/lib
     windows:OPENSSL_LIB_PATH=C:/dev/coindeps32/openssl-1.0.1p/lib
 }
 
@@ -605,7 +605,7 @@ macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
 macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
 macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit -framework CoreServices
 macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
-macx:ICON = src/qt/res/icons/bitcoin.icns
+macx:ICON = src/qt/res/icons/digitalnote.icns
 macx:TARGET = "DigitalNote-Qt"
 macx:QMAKE_CFLAGS_THREAD += -pthread
 macx:QMAKE_LFLAGS_THREAD += -pthread

doc/build-osx.md

@@ -15,40 +15,119 @@ Douglas Huff <dhuff@jrbobdobbs.org>
 See readme-qt.rst for instructions on building DigitalNote QT, the
 graphical user interface.
 
-Tested on 10.5 and 10.6 intel.  PPC is not supported because it's big-endian.
+- Tested on 10.5 and 10.6 intel and 10.15.2.  
+- PPC is not supported because it's big-endian.
 
 All of the commands should be executed in Terminal.app.. it's in
 /Applications/Utilities
 
 You need to install XCode with all the options checked so that the compiler and
-everything is available in /usr not just /Developer I think it comes on the DVD
-but you can get the current version from http://developer.apple.com
-
-
-1.  Clone the github tree to get the source code:
-
-git clone http://github.com/DigitalNotedev/DigitalNote DigitalNote
-
-2.  Download and install MacPorts from http://www.macports.org/
-
-2a. (for 10.7 Lion)
-    Edit /opt/local/etc/macports/macports.conf and uncomment "build_arch i386"
-
-3.  Install dependencies from MacPorts
-
-sudo port install boost db48 openssl miniupnpc
-
-Optionally install qrencode (and set USE_QRCODE=1):
-sudo port install qrencode
-
-4.  Now you should be able to build DigitalNoted:
-
-cd DigitalNote/src
-make -f makefile.osx
+everything is available in /usr not just /Developer 
+You can get the current version from http://developer.apple.com
+
+
+1. Clone the github tree to get the source code
+
+    ```git clone http://github.com/DigitalNotedev/DigitalNote DigitalNote``` 
+
+2. Install dependencies using Homebrew
+   1. Install dependencies:
+       ```
+       brew install boost@1.59
+       brew install miniupnpc
+       brew install https://github.com/tebelorg/Tump/releases/download/v1.0.0/openssl.rb
+       brew install automake
+       brew install autoconf
+       brew install libtool
+       brew install qrencode
+       ```
+   2. Install Berkeley-DB@6
+       Download:
+       
+       ```
+       curl -OL http://download.oracle.com/berkeley-db/db-6.2.32.tar.gz
+       ```
+       
+       Unzip:
+       ```
+       tar -xf db-6.2.32.tar.gz
+       ```
+       Build:
+       ```
+       cd db-6.2.32/build_unix                                              &&
+       ../dist/configure --prefix=/usr/local/Cellar/berkeley-db@6.2.32      \
+                         --enable-cxx                                       &&
+       make
+       ```
+      
+       If you get compile errors in `atomic.c` you need to apply a small patch and run the 'build' command above again: 
+       ```
+        cd ../..
+        curl -OL https://raw.githubusercontent.com/macports/macports-ports/cb92cb90bdc7fb90212e928db32172546eca0f5b/databases/db60/files/patch-src_dbinc_atomic.h
+        mv patch-src_dbinc_atomic.h db-6.2.32
+        cd db-6.2.32
+        patch -s -p0 < patch-src_dbinc_atomic.h
+        cd ..
+       ```
+      
+       Install:
+       ```
+        inside db-6.2.32/build_unix folder run:
+      
+        sudo make install
+       ```
+   3. You might need to create a symlink if `openssl/sha.h` or any other header from openssl/ folder cannot be found when building DigitalNoted:
+       ```
+       cd /usr/local/include
+       ln -s ../opt/openssl/include/openssl .
+       ```
+      Your compiler will search in this directory (one of many standard directories) and find the header file sha.h via the shortcut link.
+   4. Now create a symlink to miniupnpc files since it is installed in a folder without a version appended and source files are expecting a version:
+       ```
+       cd /usr/local/include
+       ln -s ../opt/miniupnpc/include/miniupnpc ./miniupnpc-2.1
+       ``` 
+   5. Check the versions of dependencies in src/makefile.osx and amend to match yours if required 
+        
+3.  Now you should be able to build DigitalNoted:
+
+    ```
+    cd DigitalNote-2/src
+    make -f makefile.osx
+    ```
 
 Run:
-  ./DigitalNoted --help  # for a list of command-line options.
+  `./DigitalNoted --help` 
+for a list of command-line options.
+  
 Run
-  ./DigitalNoted -daemon # to start the DigitalNote daemon.
+  `./DigitalNoted -daemon`
+to start the DigitalNote daemon.
+  
 Run
-  ./DigitalNoted help # When the daemon is running, to get a list of RPC commands
+  `./DigitalNoted help`
+When the daemon is running, to get a list of RPC commands
+
+
+DigitalNote-qt: Qt5 GUI Release for DigitalNote
+-----------------------------------------
+
+1. Install dependencies:
+   ```
+   brew install qrencode
+   brew install qt5
+   brew install protobuf
+   brew install python2.7
+   sudo easy_install appscript
+   ```
+2. Link qt5:
+   ```
+   brew link qt5 --force
+   ```
+3. Run in the ./DigitalNote-2
+   ```
+   qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 DigitalNote.pro
+   make
+   python2.7 contrib/macdeploy/macdeployqtplus DigitalNote-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy contrib/macdeploy/fancy.plist
+   ```
+ 

src/checkpoints.cpp

@@ -39,6 +39,7 @@ namespace Checkpoints
         (66400,   uint256("0x8035935fc3b5e8b58ab023336d6f7f1ec35eac9930cdd238ce35771cd7b3964d"))
         (67500,   uint256("0x4df36f82141ce789aa64d80908aafca145d09f5257ebb3b7550f94e2624a2d98"))
         (68200,   uint256("0x000000000005ab4fb2fec8705c51aee6b04ebf51f98bca11e61d7f41bcc51e92"))
+        (190900,    uint256("0x00000000000324d80ae543f7b4882de88a6711c644dfdc596fbaab3225db859e"))
     ;
 
     // TestNet has no checkpoints

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       1
 #define CLIENT_VERSION_MINOR       0
-#define CLIENT_VERSION_REVISION    2
-#define CLIENT_VERSION_BUILD       6
+#define CLIENT_VERSION_REVISION    3
+#define CLIENT_VERSION_BUILD       1
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true