Merge pull request duality-solutions#373 from duality-solutions/v2.4.27-BugFix

SvenKercher · web-flow · commit 0bb114729d87 · 2019-08-12T22:12:56.000+02:00
v2.4-WIP Fixes
diff --git a/src/dynode.cpp b/src/dynode.cpp
@@ -229,7 +229,7 @@ void CDynode::Check(bool fForce)
         LogPrint("dynode", "CDynode::Check -- outpoint=%s, GetAdjustedTime()=%d, fSentinelPingExpired=%d\n",
             outpoint.ToStringShort(), GetAdjustedTime(), fSentinelPingExpired);
 
-        if (fSentinelPingExpired) {
+        if (sporkManager.IsSporkActive(SPORK_14_REQUIRE_SENTINEL_FLAG) && fSentinelPingExpired) {
             nActiveState = DYNODE_SENTINEL_PING_EXPIRED;
             if (nActiveStatePrev != nActiveState) {
                 LogPrint("dynode", "CDynode::Check -- Dynode %s is in %s state now\n", outpoint.ToStringShort(), GetStateString());
@@ -258,7 +258,7 @@ void CDynode::Check(bool fForce)
         LogPrint("dynode", "CDynode::Check -- outpoint=%s, GetAdjustedTime()=%d, fSentinelPingExpired=%d\n",
             outpoint.ToStringShort(), GetAdjustedTime(), fSentinelPingExpired);
 
-        if (fSentinelPingExpired) {
+        if (sporkManager.IsSporkActive(SPORK_14_REQUIRE_SENTINEL_FLAG) && fSentinelPingExpired) {
             nActiveState = DYNODE_SENTINEL_PING_EXPIRED;
             if (nActiveStatePrev != nActiveState) {
                 LogPrint("dynode", "CDynode::Check -- Dynode %s is in %s state now\n", outpoint.ToStringShort(), GetStateString());
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -60,6 +60,9 @@ CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, int nRoundsIn)
 
 bool CTxOut::IsBDAP() const
 {
+    if (scriptPubKey.size() < 2)
+        return false;
+
     opcodetype opcode;
     CScript::const_iterator pc = scriptPubKey.begin();
     if (!scriptPubKey.GetOp(pc, opcode))

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ CTxOut::CTxOut(const CAmount& nValueIn, CScript scriptPubKeyIn, int nRoundsIn)`
`60`	`60`
`61`	`61`	`bool CTxOut::IsBDAP() const`
`62`	`62`	`{`
	`63`	`+ if (scriptPubKey.size() < 2)`
	`64`	`+ return false;`
	`65`	`+`
`63`	`66`	`opcodetype opcode;`
`64`	`67`	`CScript::const_iterator pc = scriptPubKey.begin();`
`65`	`68`	`if (!scriptPubKey.GetOp(pc, opcode))`