diff --git a/DigitalNote.pro b/DigitalNote.pro index 05e3e540..b3b3acc2 100644 --- a/DigitalNote.pro +++ b/DigitalNote.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = DigitalNote-qt -VERSION = 1.0.2.3 +VERSION = 1.0.2.4 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor QT += core gui widgets network printsupport DEFINES += ENABLE_WALLET diff --git a/src/clientversion.h b/src/clientversion.h index dbee46fa..74ad1a47 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 3 +#define CLIENT_VERSION_BUILD 4 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 9d0e673f..979ccebf 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -673,10 +673,15 @@ Value getblocktemplate(const Array& params, bool fHelp) // Set Masternode / DevOps payments int64_t masternodePayment = GetMasternodePayment(pindexPrev->nHeight+1, networkPayment); int64_t devopsPayment = GetDevOpsPayment(pindexPrev->nHeight+1, networkPayment); + std::string devpayee2 = "dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18"; + + if (pindexBest->GetBlockTime() < nPaymentUpdate_2) { + devpayee2 = Params().DevOpsAddress(); + } // Include DevOps payments CAmount devopsSplit = devopsPayment; - result.push_back(Pair("devops_payee", Params().DevOpsAddress())); + result.push_back(Pair("devops_payee", devpayee2)); result.push_back(Pair("devops_amount", (int64_t)devopsSplit)); result.push_back(Pair("devops_payments", true)); result.push_back(Pair("enforce_devops_payments", true)); @@ -691,7 +696,7 @@ Value getblocktemplate(const Array& params, bool fHelp) CBitcoinAddress address2(address1); result.push_back(Pair("masternode_payee", address2.ToString().c_str())); } else { - result.push_back(Pair("masternode_payee", Params().DevOpsAddress().c_str())); + result.push_back(Pair("masternode_payee", devpayee2.c_str())); } result.push_back(Pair("payee_amount", (int64_t)masternodeSplit)); result.push_back(Pair("masternode_payments", true));