diff --git a/DigitalNote.pro b/DigitalNote.pro index b3b3acc2..036e869a 100644 --- a/DigitalNote.pro +++ b/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 } diff --git a/src/clientversion.h b/src/clientversion.h index 74ad1a47..4614b14e 100644 --- a/src/clientversion.h +++ b/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 diff --git a/src/crypto/bmw/bmw512.h b/src/crypto/bmw/bmw512.h index 0e55d456..a1294c80 100644 --- a/src/crypto/bmw/bmw512.h +++ b/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))) diff --git a/src/crypto/echo/echo512.h b/src/crypto/echo/echo512.h index 2bf0f7fd..36db3841 100644 --- a/src/crypto/echo/echo512.h +++ b/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 inline uint256 Hash_echo512(const T1 pbegin, const T1 pend) diff --git a/src/init.cpp b/src/init.cpp index 48516fff..d6e7b2da 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -300,6 +300,7 @@ std::string HelpMessage() " -smsgscanchain " + _("Scan the block chain for public key addresses on startup.") + "\n"; strUsage += " -stakethreshold= " + _("This will set the output size of your stakes to never be below this number (default: 100)") + "\n"; strUsage += " -liveforktoggle= " + _("Toggle experimental features via block height testing fork, (example: -command=)") + "\n"; + strUsage += " -mnadvrelay= " + _("Toggle MasterNode Advanced Relay System via 1/0, (example: -command=)") + "\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; diff --git a/src/main.cpp b/src/main.cpp index 82e10e03..b3d44208 100644 --- a/src/main.cpp +++ b/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) { diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index d9c4df1b..04d19133 100644 --- a/src/qt/bitcoingui.cpp +++ b/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) { diff --git a/src/qt/forms/messagepage.ui b/src/qt/forms/messagepage.ui index 37c109f8..c58ee76e 100644 --- a/src/qt/forms/messagepage.ui +++ b/src/qt/forms/messagepage.ui @@ -14,8 +14,7 @@ Address Book - color: rgb(204, 155, 68); -background-color: rgb(16, 16, 16); + diff --git a/src/qt/forms/sendmessagesdialog.ui b/src/qt/forms/sendmessagesdialog.ui index f409ce55..9b7e1160 100644 --- a/src/qt/forms/sendmessagesdialog.ui +++ b/src/qt/forms/sendmessagesdialog.ui @@ -14,8 +14,7 @@ Send Messages - color: rgb(204, 155, 68); -background-color: rgb(16, 16, 16); + @@ -113,7 +112,7 @@ background-color: rgb(16, 16, 16); 0 0 830 - 299 + 298 diff --git a/src/qt/forms/sendmessagesentry.ui b/src/qt/forms/sendmessagesentry.ui index b3d29525..0ba8fda2 100644 --- a/src/qt/forms/sendmessagesentry.ui +++ b/src/qt/forms/sendmessagesentry.ui @@ -14,8 +14,7 @@ Form - color: rgb(204, 155, 68); -background-color: rgb(16, 16, 16); + QFrame::StyledPanel diff --git a/src/util.cpp b/src/util.cpp index 62a022cf..bd6a1ce5 100644 --- a/src/util.cpp +++ b/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; diff --git a/src/util.h b/src/util.h index df8705bd..e9e09bd7 100644 --- a/src/util.h +++ b/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(); diff --git a/src/version.h b/src/version.h index 898b9b8b..05479591 100644 --- a/src/version.h +++ b/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