Skip to content

DigitalNote v1.0.1.3 Release #7

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
May 21, 2019
Merged

DigitalNote v1.0.1.3 Release #7

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.1.2
VERSION = 1.0.1.3
INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
QT += core gui widgets network printsupport
DEFINES += ENABLE_WALLET
Expand Down
1 change: 0 additions & 1 deletion src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class CMainParams : public CChainParams {

nPoolMaxTransactions = 9;
strMNenginePoolDummyAddress = "dUnVN6zz2apaoWkb5krGoBCwwo8ZD3axue";
// TODO: Verify upgrade
strDevOpsAddress = "dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7";
strDevOpsScriptPubKey = "76a9148c2fad4e8bdfdc047ad5ad5378084de415e1538988ac";
nEndPoWBlock = 0x7fffffff;
Expand Down
2 changes: 0 additions & 2 deletions src/chainparams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class CChainParams
int StartPoSBlock() const { return nStartPoSBlock; }
int PoolMaxTransactions() const { return nPoolMaxTransactions; }
std::string MNenginePoolDummyAddress() const { return strMNenginePoolDummyAddress; }
// TODO: Verify upgrade
std::string DevOpsAddress() const { return strDevOpsAddress; }
std::string DevOpsPubKey() const { return strDevOpsScriptPubKey; }
protected:
Expand All @@ -93,7 +92,6 @@ class CChainParams
int nStartPoSBlock;
int nPoolMaxTransactions;
std::string strMNenginePoolDummyAddress;
// TODO: Verify upgrade
std::string strDevOpsAddress;
std::string strDevOpsScriptPubKey;
};
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 1
#define CLIENT_VERSION_BUILD 2
#define CLIENT_VERSION_BUILD 3

// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
12 changes: 10 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,7 +2678,11 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
LogPrintf("CheckBlock() : PoS Recipient masternode address validity succesfully verified\n");
} else {
LogPrintf("CheckBlock() : PoS Recipient masternode address validity could not be verified\n");
fBlockHasPayments = false;
if (!fIsInitialDownload) {
fBlockHasPayments = false;
} else {
LogPrintf("CheckBlock() : PoS Recipient masternode address validity skipping, syncing in progress!\n");
}
}
if (nIndexedMasternodePayment == nMasternodePayment) {
LogPrintf("CheckBlock() : PoS Recipient masternode amount validity succesfully verified\n");
Expand Down Expand Up @@ -2713,7 +2717,11 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
LogPrintf("CheckBlock() : PoW Recipient masternode address validity succesfully verified\n");
} else {
LogPrintf("CheckBlock() : PoW Recipient masternode address validity could not be verified\n");
fBlockHasPayments = false;
if (!fIsInitialDownload) {
fBlockHasPayments = false;
} else {
LogPrintf("CheckBlock() : PoW Recipient masternode address validity skipping, syncing in progress!\n");
}
}
if (nAmount == nMasternodePayment) {
LogPrintf("CheckBlock() : PoW Recipient masternode amount validity succesfully verified\n");
Expand Down
2 changes: 1 addition & 1 deletion src/rpcmining.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
result.push_back(Pair("votes", aVotes));

// TODO: Verify upgrade
// Check for payment upgrade fork
if (pindexBest->GetBlockTime() > 0)
{
if (pindexBest->GetBlockTime() > nPaymentUpdate_1) // Monday, May 20, 2019 12:00:00 AM
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70509;
//
// network protocol versioning
//
static const int PROTOCOL_VERSION = 62009;
static const int PROTOCOL_VERSION = 62010;

// intial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
Expand Down
27 changes: 14 additions & 13 deletions src/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2887,9 +2887,11 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
txNew.vin.clear();
txNew.vout.clear();

// OLD IMPLEMENTATION COMMNETED OUT
//
// Determine our payment script for devops
CScript devopsScript;
devopsScript << OP_DUP << OP_HASH160 << ParseHex(Params().DevOpsPubKey()) << OP_EQUALVERIFY << OP_CHECKSIG;
// CScript devopsScript;
// devopsScript << OP_DUP << OP_HASH160 << ParseHex(Params().DevOpsPubKey()) << OP_EQUALVERIFY << OP_CHECKSIG;

// Mark coin stake transaction
CScript scriptEmpty;
Expand Down Expand Up @@ -3048,6 +3050,15 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
CTxIn vin;
nPoSageReward = nReward;

// define address
CBitcoinAddress devopaddress;
if (Params().NetworkID() == CChainParams::MAIN)
devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7"); // TODO: nothing, already set to a valid DigitalNote address
else if (Params().NetworkID() == CChainParams::TESTNET)
devopaddress = CBitcoinAddress("");
else if (Params().NetworkID() == CChainParams::REGTEST)
devopaddress = CBitcoinAddress("");

// Masternode Payments
int payments = 1;
// start masternode payments
Expand Down Expand Up @@ -3081,7 +3092,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
if(winningNode){
payee = GetScriptForDestination(winningNode->pubkey.GetID());
} else {
payee = devopsScript;
payee = GetScriptForDestination(devopaddress.Get());
}
}
} else {
Expand Down Expand Up @@ -3132,15 +3143,6 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int

bool hasdevopsPay = true;
if(bDevOpsPayment) {
// define address
CBitcoinAddress devopaddress;
if (Params().NetworkID() == CChainParams::MAIN)
devopaddress = CBitcoinAddress("dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7"); // TODO: nothing, already set to a valid DigitalNote address
else if (Params().NetworkID() == CChainParams::TESTNET)
devopaddress = CBitcoinAddress("");
else if (Params().NetworkID() == CChainParams::REGTEST)
devopaddress = CBitcoinAddress("");

// verify address
if(devopaddress.IsValid())
{
Expand All @@ -3156,7 +3158,6 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int
{
return error("CreateCoinStake: Failed to detect dev address to pay\n");
}

}
else {
hasdevopsPay = false;
Expand Down