Skip to content

DigitalNote v1.0.2.4 Initial #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2019
Merged

DigitalNote v1.0.2.4 Initial #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitalNote.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions src/rpcmining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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));
Expand Down