From 3a7aa3f5c68d1e67ab214797b470d3b9fd5478f0 Mon Sep 17 00:00:00 2001
From: CryptoCoderz <CryptoCoderz@gmail.com>
Date: Tue, 18 Jun 2019 16:36:50 -0700
Subject: [PATCH] DigitalNote v1.0.1.5 Release 3

Changelog

- Further improvements to Devops system
---
 src/chainparams.cpp |  2 +-
 src/chainparams.h   |  4 ++--
 src/main.cpp        | 28 ++++++++++++----------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 15cc8856..3000543b 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -102,7 +102,7 @@ class CMainParams : public CChainParams {
 
         nPoolMaxTransactions = 9;
         strMNenginePoolDummyAddress = "dUnVN6zz2apaoWkb5krGoBCwwo8ZD3axue";
-        strDevOpsAddress = "dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18";
+        strDevOpsAddress = "dSCXLHTZJJqTej8ZRszZxbLrS6dDGVJhw7";
         nEndPoWBlock = 0x7fffffff;
         nStartPoSBlock = 0;
     }
diff --git a/src/chainparams.h b/src/chainparams.h
index 60b94bf7..16e3956c 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -72,9 +72,9 @@ class CChainParams
     int StartPoSBlock() const { return nStartPoSBlock; }
     int PoolMaxTransactions() const { return nPoolMaxTransactions; }
     std::string MNenginePoolDummyAddress() const { return strMNenginePoolDummyAddress; }
-    std::string DevOpsAddress() const { return strDevOpsAddress; }
+    std::string DevOpsAddress() { return strDevOpsAddress; }
 protected:
-    CChainParams() {};
+    CChainParams() {/* Do Nothing */;}
 
     uint256 hashGenesisBlock;
     MessageStartChars pchMessageStart;
diff --git a/src/main.cpp b/src/main.cpp
index c74ecad8..d896abeb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2634,6 +2634,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
         const CBlockIndex* pindexPrev = pindexBest->pprev;
         bool isProofOfStake = !IsProofOfWork();
         bool fBlockHasPayments = true;
+        std::string strVfyDevopsAddress;
         // Define primitives depending if PoW/PoS
         if (isProofOfStake) {
             nProofOfIndexMasternode = 2;
@@ -2667,6 +2668,9 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
         } else {
             nMasterNodeChecksEngageTime = nMasterNodeChecksDelayBaseTime + nMasterNodeChecksDelay;
         }
+        // Devops Address Set and Updates
+        strVfyDevopsAddress = "dHy3LZvqX5B2rAAoLiA7Y7rpvkLXKTkD18";
+        if(pindexBest->GetBlockTime() < nPaymentUpdate_2) { strVfyDevopsAddress = Params().DevOpsAddress(); }
         // Check PoW or PoS payments for current block
         for (unsigned int i=0; i < vtx[isProofOfStake].vout.size(); i++) {
             // Define values
@@ -2684,7 +2688,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                 if (i == nProofOfIndexMasternode) {
                    if (mnodeman.IsPayeeAValidMasternode(rawPayee)) {
                        LogPrintf("CheckBlock() : PoS Recipient masternode address validity succesfully verified\n");
-                   } else if (addressOut.ToString() == Params().DevOpsAddress()) {
+                   } else if (addressOut.ToString() == strVfyDevopsAddress) {
                        LogPrintf("CheckBlock() : PoS Recipient masternode address validity succesfully verified\n");
                    } else {
                        if (nMasterNodeChecksEngageTime != 0) {
@@ -2707,15 +2711,11 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                 }
                 // Check for PoS devops payment
                 if (i == nProofOfIndexDevops) {
-                   if (addressOut.ToString() == Params().DevOpsAddress()) {
+                   if (addressOut.ToString() == strVfyDevopsAddress) {
                        LogPrintf("CheckBlock() : PoS Recipient devops address validity succesfully verified\n");
                    } else {
-                       if (pindexBest->GetBlockTime() > nPaymentUpdate_2) {
-                           LogPrintf("CheckBlock() : PoS Recipient devops address validity could not be verified\n");
-                           fBlockHasPayments = false;
-                       } else {
-                           LogPrintf("CheckBlock() : PoS Recipient devops address validity skipped, pre-enforcement phase\n");
-                       }
+                       LogPrintf("CheckBlock() : PoS Recipient devops address validity could not be verified\n");
+                       fBlockHasPayments = false;
                    }
                    if (nIndexedDevopsPayment == nDevopsPayment) {
                        LogPrintf("CheckBlock() : PoS Recipient devops amount validity succesfully verified\n");
@@ -2740,7 +2740,7 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                 if (i == nProofOfIndexMasternode) {
                    if (mnodeman.IsPayeeAValidMasternode(rawPayee)) {
                       LogPrintf("CheckBlock() : PoW Recipient masternode address validity succesfully verified\n");
-                   } else if (addressOut.ToString() == Params().DevOpsAddress()) {
+                   } else if (addressOut.ToString() == strVfyDevopsAddress) {
                       LogPrintf("CheckBlock() : PoW Recipient masternode address validity succesfully verified\n");
                    } else {
                       if (nMasterNodeChecksEngageTime != 0) {
@@ -2763,15 +2763,11 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
                 }
                 // Check for PoW devops payment
                 if (i == nProofOfIndexDevops) {
-                   if (addressOut.ToString() == Params().DevOpsAddress()) {
+                   if (addressOut.ToString() == strVfyDevopsAddress) {
                       LogPrintf("CheckBlock() : PoW Recipient devops address validity succesfully verified\n");
                    } else {
-                       if (pindexBest->GetBlockTime() > nPaymentUpdate_2) {
-                           LogPrintf("CheckBlock() : PoW Recipient devops address validity could not be verified\n");
-                           fBlockHasPayments = false;
-                       } else {
-                           LogPrintf("CheckBlock() : PoW Recipient devops address validity skipped, pre-enforcement phase\n");
-                       }
+                       LogPrintf("CheckBlock() : PoW Recipient devops address validity could not be verified\n");
+                       fBlockHasPayments = false;
                    }
                    if (nAmount == nDevopsPayment) {
                       LogPrintf("CheckBlock() : PoW Recipient devops amount validity succesfully verified\n");