Merge pull request #48 from vgulkevic/master

1.0.3.4

Author: vgulkevic

DigitalNote.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = DigitalNote-qt
-VERSION = 1.0.3.3
+VERSION = 1.0.3.4
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 QT += core gui widgets network printsupport
 DEFINES += ENABLE_WALLET
@@ -51,11 +51,11 @@ UI_DIR = build
 
 # use: qmake "RELEASE=1"
 contains(RELEASE, 1) {
-    # Mac: compile for maximum compatibility (10.12, 64-bit)
-    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.12 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
-    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.12 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
-    macx:QMAKE_LFLAGS += -mmacosx-version-min=10.12 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
-    macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.12 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk
+    # Mac: compile for maximum compatibility (10.15, 64-bit)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.13 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
+    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.13 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
+    macx:QMAKE_LFLAGS += -mmacosx-version-min=10.13 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
+    macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.13 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk
 
 
     !windows:!macx {
@@ -333,7 +333,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/sendmessagesdialog.h \
     src/qt/sendmessagesentry.h \
     src/qt/blockbrowser.h \
-    src/qt/airdroppage.h \
     src/qt/plugins/mrichtexteditor/mrichtextedit.h \
     src/qt/qvalidatedtextedit.h \
     src/crypto/common/sph_bmw.h \
@@ -457,7 +456,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/sendmessagesdialog.cpp \
     src/qt/sendmessagesentry.cpp \
     src/qt/blockbrowser.cpp \
-    src/qt/airdroppage.cpp \
     src/qt/qvalidatedtextedit.cpp \
     src/qt/plugins/mrichtexteditor/mrichtextedit.cpp \
     src/rpcsmessage.cpp \
@@ -490,7 +488,6 @@ FORMS += \
     src/qt/forms/sendmessagesentry.ui \
     src/qt/forms/sendmessagesdialog.ui \
     src/qt/forms/blockbrowser.ui \
-    src/qt/forms/airdroppage.ui \
     src/qt/plugins/mrichtexteditor/mrichtextedit.ui
 
 contains(USE_QRCODE, 1) {

README.md

@@ -50,6 +50,9 @@ General Specs
 	Port: 18092
 	RPC Port: 18094
 
+BUILD MacOS
+-----------
+See /docs/build-osx.md
 
 BUILD LINUX
 -----------

doc/build-osx.md

@@ -1,34 +1,14 @@
-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.
+Mac OS X DigitalNoted build instructions vgulkevic. Find me on Discord if you have any issues - https://discordapp.com/invite/4dUquty
 
-
-Mac OS X DigitalNoted build instructions
-Laszlo Hanyecz <solar@heliacal.net>
-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 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
+- Tested on 10.15.7.  
 
 You need to install XCode with all the options checked so that the compiler and
 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``` 
+    ```git clone https://github.com/CryptoCoderz/DigitalNote DigitalNote``` 
 
 2. Install dependencies using Homebrew
    1. Install dependencies:
@@ -89,10 +69,10 @@ You can get the current version from http://developer.apple.com
        ``` 
    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:
+3.  Now you should be able to build DigitalNoted. Either use makefile to build daemon only or see the Step 3 of the section below (DigitalNote-qt: Qt5 GUI Release for DigitalNote) that uses .pro file:
 
     ```
-    cd DigitalNote-2/src
+    cd DigitalNote/src
     make -f makefile.osx
     ```
 

src/bignum.h

@@ -10,6 +10,10 @@
 #include "uint256.h"
 #include "version.h"
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <openssl/bn.h>
 
 #include <stdexcept>

src/clientversion.h

@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    3
-#define CLIENT_VERSION_BUILD       3
+#define CLIENT_VERSION_BUILD       4
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

src/init.cpp

@@ -565,7 +565,6 @@ bool AppInit2(boost::thread_group& threadGroup)
     // ********************************************************* Step 5: Backup wallet and verify wallet database integrity
 #ifdef ENABLE_WALLET
     if (!fDisableWallet) {
-
         filesystem::path backupDir = GetDataDir() / "backups";
         if (!filesystem::exists(backupDir))
         {
@@ -576,19 +575,20 @@ bool AppInit2(boost::thread_group& threadGroup)
         nWalletBackups = std::max(0, std::min(10, nWalletBackups));
         if(nWalletBackups > 0)
         {
-            if (filesystem::exists(backupDir))
+            std::string sourcePathStr = GetDataDir().string();
+            sourcePathStr += "/" + strWalletFileName;
+            boost::filesystem::path sourceFile = sourcePathStr;
+            if (filesystem::exists(backupDir) && filesystem::exists(sourceFile))
             {
                 // Create backup of the wallet
                 std::string dateTimeStr = DateTimeStrFormat(".%Y-%m-%d-%H.%M", GetTime());
                 std::string backupPathStr = backupDir.string();
                 backupPathStr += "/" + strWalletFileName;
-                std::string sourcePathStr = GetDataDir().string();
-                sourcePathStr += "/" + strWalletFileName;
-                boost::filesystem::path sourceFile = sourcePathStr;
                 boost::filesystem::path backupFile = backupPathStr + dateTimeStr;
                 sourceFile.make_preferred();
                 backupFile.make_preferred();
                 try {
+                    LogPrintf("Creating backup of %s -> %s\n", sourceFile, backupFile);
                     boost::filesystem::copy_file(sourceFile, backupFile);
                     LogPrintf("Creating backup of %s -> %s\n", sourceFile, backupFile);
                 } catch(boost::filesystem::filesystem_error &error) {
@@ -845,7 +845,7 @@ bool AppInit2(boost::thread_group& threadGroup)
         strRollbackToBlock = GetArg("-backtoblock", "");
         LogPrintf("Rolling blocks back...\n");
         if(!strRollbackToBlock.empty()){
-            nNewHeight = GetArg("-backtoblock", (int)"");
+            nNewHeight = GetArg("-backtoblock", 0);
 
             CBlockIndex* pindex = pindexBest;
             while (pindex != NULL && pindex->nHeight > nNewHeight)

src/main.cpp

@@ -3767,7 +3767,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
 {
     // this is a snapshot node. will only sync until certain block
     if (maxBlockHeight != -1 && pindexBest->nHeight >= maxBlockHeight) {
-        return;
+        return true;
     }
     RandAddSeedPerfmon();
     LogPrint("net", "received: %s (%u bytes)\n", strCommand, vRecv.size());

src/masternode-payments.cpp

@@ -157,11 +157,8 @@ bool CMasternodePayments::GetWinningMasternode(int nBlockHeight, CScript& payee,
         return false;
     }
     // Set masternode winner to pay
-    BOOST_FOREACH(CMasternodePaymentWinner& winner, vWinning){
-        payee = winner.payee;
-        vin = winner.vin;
-    }
-    // Return true if previous checks pass
+    payee = winningNode->donationAddress;
+    vin = winningNode->vin;
     return true;
 }