DigitalNote v1.0.2.5 development merge

DigitalNote.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = DigitalNote-qt
-VERSION = 1.0.2.4
+VERSION = 1.0.2.5
 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
 QT += core gui widgets network printsupport
 DEFINES += ENABLE_WALLET
@@ -17,17 +17,17 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 }
 
 win32{
-BOOST_LIB_SUFFIX=-mgw81-mt-s-x32-1_68
-BOOST_INCLUDE_PATH=C:/deps/boost_1_68_0
-BOOST_LIB_PATH=C:/deps/boost_1_68_0/stage/lib
+BOOST_LIB_SUFFIX=-mgw81-mt-s-x32-1_72
+BOOST_INCLUDE_PATH=C:/deps/boost_1_72_0
+BOOST_LIB_PATH=C:/deps/boost_1_72_0/stage/lib
 BDB_INCLUDE_PATH=C:/deps/db-6.2.32.NC/build_unix
 BDB_LIB_PATH=C:/deps/db-6.2.32.NC/build_unix
-OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2o/include
-OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2o
+OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2u/include
+OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2u
 MINIUPNPC_INCLUDE_PATH=C:/deps/
-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
+MINIUPNPC_LIB_PATH=C:/deps/miniupnpc-2.1
+QRENCODE_INCLUDE_PATH=C:/deps/qrencode-4.0.2
+QRENCODE_LIB_PATH=C:/deps/qrencode-4.0.2/.libs
 SECP256K1_INCLUDE_PATH=C:/deps/secp256k1/include
 SECP256K1_LIB_PATH=C:/deps/secp256k1
 }

src/clientversion.h

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

src/crypto/bmw/bmw512.h

@@ -16,9 +16,10 @@
 
 GLOBAL sph_bmw512_context       z_bmw;
 
+/* Removed to kill pointless Qt warnings
 #define fillz() do { \
     sph_bmw512_init(&z_bmw); \
-} while (0) 
+} while (0)*/
 
 #define ZBMW (memcpy(&ctx_bmw, &z_bmw, sizeof(z_bmw)))
 

src/crypto/echo/echo512.h

@@ -16,9 +16,10 @@
 
 GLOBAL sph_echo512_context       z_echo;
 
+/* Removed to kill pointless Qt warnings
 #define fillz() do { \
     sph_echo512_init(&z_echo); \
-} while (0) 
+} while (0)*/
 
 template<typename T1>
 inline uint256 Hash_echo512(const T1 pbegin, const T1 pend)

src/init.cpp

@@ -300,6 +300,7 @@ std::string HelpMessage()
         "  -smsgscanchain                           " + _("Scan the block chain for public key addresses on startup.") + "\n";
     strUsage += "  -stakethreshold=<n> " + _("This will set the output size of your stakes to never be below this number (default: 100)") + "\n";
     strUsage += "  -liveforktoggle=<n> " + _("Toggle experimental features via block height testing fork, (example: -command=<fork_height>)") + "\n";
+    strUsage += "  -mnadvrelay=<n> " + _("Toggle MasterNode Advanced Relay System via 1/0, (example: -command=<true/false>)") + "\n";
 
     return strUsage;
 }
@@ -1023,6 +1024,18 @@ bool AppInit2(boost::thread_group& threadGroup)
         LogPrintf("No experimental testing feature fork toggle detected... skipping...\n");
     }
 
+    // Check toggle switch for masternode advanced relay
+    uiInterface.InitMessage(_("Checking masternode advanced relay toggle..."));
+    fMnAdvRelay = GetBoolArg("-mnadvrelay", false);
+    LogPrintf("Checking for masternode advanced relay toggle...\n");
+    if(fMnAdvRelay){
+        LogPrintf("Continuing with toggle enabled | Happy relaying!\n");
+    }
+    else {
+        fMnAdvRelay = false;
+        LogPrintf("No masternode advanced relay toggle detected... skipping...\n");
+    }
+
     uiInterface.InitMessage(_("Loading masternode cache..."));
 
     CMasternodeDB mndb;

src/main.cpp

@@ -2693,14 +2693,12 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                        LogPrintf("CheckBlock() : PoS Recipient masternode address validity succesfully verified\n");
                    } else {
                        if (nMasterNodeChecksEngageTime != 0) {
-                           if (nMasterNodeChecksEngageTime < GetTime()) {
+                           if (fMnAdvRelay) {
                                LogPrintf("CheckBlock() : PoS Recipient masternode address validity could not be verified\n");
                                fBlockHasPayments = false;
                            } else {
                                LogPrintf("CheckBlock() : PoS Recipient masternode address validity skipping, Checks delay still active!\n");
                            }
-                       } else {
-                           LogPrintf("CheckBlock() : PoS Recipient masternode address validity skipping, syncing in progress!\n");
                        }
                    }
                    if (nIndexedMasternodePayment == nMasternodePayment) {
@@ -2754,14 +2752,12 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                       LogPrintf("CheckBlock() : PoW Recipient masternode address validity succesfully verified\n");
                    } else {
                       if (nMasterNodeChecksEngageTime != 0) {
-                          if (nMasterNodeChecksEngageTime < GetTime()) {
+                          if (fMnAdvRelay) {
                               LogPrintf("CheckBlock() : PoW Recipient masternode address validity could not be verified\n");
                               fBlockHasPayments = false;
                           } else {
                               LogPrintf("CheckBlock() : PoW Recipient masternode address validity skipping, Checks delay still active!\n");
                           }
-                      } else {
-                          LogPrintf("CheckBlock() : PoW Recipient masternode address validity skipping, syncing in progress!\n");
                       }
                    }
                    if (nAmount == nMasternodePayment) {

src/qt/bitcoingui.cpp

@@ -1026,14 +1026,14 @@ void DigitalNoteGUI::gotoVerifyMessageTab(QString addr)
 }
 
 void DigitalNoteGUI::gotoMessagePage()
-{
+{/*
     messageAction->setChecked(true);
     centralStackedWidget->setCurrentWidget(messagePage);
 
     exportAction->setEnabled(true);
     disconnect(exportAction, SIGNAL(triggered()), 0, 0);
     connect(exportAction, SIGNAL(triggered()), messagePage, SLOT(exportClicked()));
-}
+*/}
 
 void DigitalNoteGUI::dragEnterEvent(QDragEnterEvent *event)
 {

src/qt/forms/messagepage.ui

@@ -14,8 +14,7 @@
    <string>Address Book</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">color: rgb(204, 155, 68);
-background-color: rgb(16, 16, 16);</string>
+   <string notr="true"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

src/qt/forms/sendmessagesdialog.ui

@@ -14,8 +14,7 @@
    <string>Send Messages</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">color: rgb(204, 155, 68);
-background-color: rgb(16, 16, 16);</string>
+   <string notr="true"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
    <property name="bottomMargin">
@@ -113,7 +112,7 @@ background-color: rgb(16, 16, 16);</string>
         <x>0</x>
         <y>0</y>
         <width>830</width>
-        <height>299</height>
+        <height>298</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">

src/qt/forms/sendmessagesentry.ui

@@ -14,8 +14,7 @@
    <string>Form</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">color: rgb(204, 155, 68);
-background-color: rgb(16, 16, 16);</string>
+   <string notr="true"/>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>

src/util.cpp

@@ -110,6 +110,8 @@ string strLiveForkToggle = "";
 int64_t nLiveForkToggle = 0;
 //MasterNode recipient verification delay base time
 int64_t nMasterNodeChecksDelayBaseTime = 0;
+//MasterNode peer IP advanced relay system toggle
+bool fMnAdvRelay = false;
 
 // Init OpenSSL library multithreading support
 static CCriticalSection** ppmutexOpenSSL;

src/util.h

@@ -147,6 +147,8 @@ extern std::string strLiveForkToggle;
 extern int64_t nLiveForkToggle;
 //MasterNode recipient verification delay base time
 extern int64_t nMasterNodeChecksDelayBaseTime;
+//MasterNode peer IP advanced relay system toggle
+extern bool fMnAdvRelay;
 
 void RandAddSeed();
 void RandAddSeedPerfmon();

src/version.h

@@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70509;
 //
 // network protocol versioning
 //
-static const int PROTOCOL_VERSION = 62019;
+static const int PROTOCOL_VERSION = 62020;
 
 // intial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;
@@ -68,4 +68,7 @@ static const int BIP0031_VERSION = 60000;
 // "mempool" command, enhanced "getdata" behavior starts with this version:
 static const int MEMPOOL_GD_VERSION = 60002;
 
+// MasterNode peer IP advanced relay system start (Unfinished, not used)
+static const int64_t MIN_MASTERNODE_ADV_RELAY = 9993058800; // OFF (NOT TOGGLED)
+
 #endif